From b1862a36058f47dbd2eef6ba3a25a7603ef33a31 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 13 Dec 2022 09:10:03 +0100 Subject: [PATCH] account_payment_sale: payment_mode_id in sale.report --- account_payment_sale/README.rst | 11 ++--- .../i18n/account_payment_sale.pot | 8 +++- account_payment_sale/i18n/es.po | 10 ++--- account_payment_sale/i18n/hr.po | 44 +++++++++++++++++++ account_payment_sale/i18n/it.po | 10 ++--- account_payment_sale/models/__init__.py | 1 + account_payment_sale/models/sale_report.py | 20 +++++++++ .../static/description/index.html | 7 +-- 8 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 account_payment_sale/i18n/hr.po create mode 100644 account_payment_sale/models/sale_report.py diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 3371c898c..ea832dd43 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -14,13 +14,13 @@ Account Payment Sale :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/15.0/account_payment_sale + :target: https://github.com/OCA/bank-payment/tree/16.0/account_payment_sale :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-15-0/bank-payment-15-0-account_payment_sale + :target: https://translation.odoo-community.org/projects/bank-payment-16-0/bank-payment-16-0-account_payment_sale :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/15.0 + :target: https://runbot.odoo-community.org/runbot/173/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -47,7 +47,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -70,6 +70,7 @@ Contributors * Raphaël Valyi * Raf Ven * Manuel Regidor +* Sodexis Maintainers ~~~~~~~~~~~ @@ -84,6 +85,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot index b6bc3c59b..7b7327f6c 100644 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 15.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -20,6 +20,7 @@ msgstr "" #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_report__payment_mode_id msgid "Payment Mode" msgstr "" @@ -28,6 +29,11 @@ msgstr "" msgid "Sales Advance Payment Invoice" msgstr "" +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po index 09df33aae..6e6220cd5 100644 --- a/account_payment_sale/i18n/es.po +++ b/account_payment_sale/i18n/es.po @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-02 03:43+0000\n" -"PO-Revision-Date: 2018-07-13 09:23+0000\n" -"Last-Translator: Enric Tobella \n" +"PO-Revision-Date: 2023-04-17 18:33+0000\n" +"Last-Translator: gelo joga Rodríguez \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.0.1\n" +"X-Generator: Weblate 4.14.1\n" #. module: account_payment_sale #: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode @@ -27,7 +27,7 @@ msgstr "Modo de pago:" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_account_move msgid "Journal Entries" -msgstr "" +msgstr "Asientos contables" #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id @@ -42,7 +42,7 @@ msgstr "Ventas. Anticipo pago factura" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Pedidos de Venta" #~ msgid "Quotation" #~ msgstr "Presupuesto" diff --git a/account_payment_sale/i18n/hr.po b/account_payment_sale/i18n/hr.po new file mode 100644 index 000000000..dbe1ee39a --- /dev/null +++ b/account_payment_sale/i18n/hr.po @@ -0,0 +1,44 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-01-04 13:44+0000\n" +"Last-Translator: Bole \n" +"Language-Team: none\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.14.1\n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Metoda plaćanja:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_report__payment_mode_id +msgid "Payment Mode" +msgstr "Metoda plaćanja" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Izrada računa za avans iz ponude" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_report +msgid "Sales Analysis Report" +msgstr "Izvještaj analize prodaje" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Ponuda" diff --git a/account_payment_sale/i18n/it.po b/account_payment_sale/i18n/it.po index 14fdc000f..f89f79980 100644 --- a/account_payment_sale/i18n/it.po +++ b/account_payment_sale/i18n/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2021-12-03 12:36+0000\n" +"PO-Revision-Date: 2023-04-07 13:22+0000\n" "Last-Translator: Francesco Foresti \n" "Language-Team: none\n" "Language: it\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.3.2\n" +"X-Generator: Weblate 4.14.1\n" #. module: account_payment_sale #: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode @@ -25,7 +25,7 @@ msgstr "Modo di Pagamento:" #: model:ir.model.fields,field_description:account_payment_sale.field_sale_advance_payment_inv__display_name #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__display_name msgid "Display Name" -msgstr "Nome da visualizzare" +msgstr "Nome visualizzato" #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_advance_payment_inv__id @@ -47,9 +47,9 @@ msgstr "Modo di pagamento" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv msgid "Sales Advance Payment Invoice" -msgstr "Fattura Pagamento Anticipo Vendite" +msgstr "Fattura di vendita con pagamento anticipato" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" -msgstr "Ordine di Vendita" +msgstr "Ordine di vendita" diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py index 6aacb7531..6b9bbd7b5 100644 --- a/account_payment_sale/models/__init__.py +++ b/account_payment_sale/models/__init__.py @@ -1 +1,2 @@ from . import sale_order +from . import sale_report diff --git a/account_payment_sale/models/sale_report.py b/account_payment_sale/models/sale_report.py new file mode 100644 index 000000000..4f80ff456 --- /dev/null +++ b/account_payment_sale/models/sale_report.py @@ -0,0 +1,20 @@ +# Copyright 2021-2022 Akretion France (http://www.akretion.com) +# @author Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class SaleReport(models.Model): + _inherit = "sale.report" + + payment_mode_id = fields.Many2one( + "account.payment.mode", + string="Payment Mode", + readonly=True, + ) + + def _select_additional_fields(self): + res = super()._select_additional_fields() + res["payment_mode_id"] = "s.payment_mode_id" + return res diff --git a/account_payment_sale/static/description/index.html b/account_payment_sale/static/description/index.html index 80157fc74..21a27ffdb 100644 --- a/account_payment_sale/static/description/index.html +++ b/account_payment_sale/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

This modules adds one field on sale orders: Payment Mode. This field is copied from customer to sale order and then from sale order to customer invoice.

@@ -395,7 +395,7 @@ This default value can be changed sale orders or on draft invoices.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -417,6 +417,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Raphaël Valyi
  • Raf Ven <raf.ven@dynapps.be>
  • Manuel Regidor <manuel.regidor@sygel.es>
    • +
  • Sodexis <dev@sodexis.com>
    • @@ -426,7 +427,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

    -

    This module is part of the OCA/bank-payment project on GitHub.

    +

    This module is part of the OCA/bank-payment project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.