diff --git a/account_payment_partner/models/account_move.py b/account_payment_partner/models/account_move.py index 1f606e835..ccd2ffc7f 100644 --- a/account_payment_partner/models/account_move.py +++ b/account_payment_partner/models/account_move.py @@ -20,7 +20,7 @@ class AccountMove(models.Model): compute="_compute_payment_mode", store=True, ondelete="restrict", - states={"draft": [("readonly", False)]}, + readonly=False, ) bank_account_required = fields.Boolean( related="payment_mode_id.payment_method_id.bank_account_required", readonly=True @@ -29,7 +29,7 @@ class AccountMove(models.Model): compute="_compute_invoice_partner_bank", store=True, ondelete="restrict", - states={"draft": [("readonly", False)]}, + readonly=False, ) @api.depends("type") diff --git a/account_payment_partner/views/account_move_view.xml b/account_payment_partner/views/account_move_view.xml index e6f819fb6..36cbf3562 100644 --- a/account_payment_partner/views/account_move_view.xml +++ b/account_payment_partner/views/account_move_view.xml @@ -28,6 +28,7 @@ @@ -37,7 +38,7 @@ [('partner_id', '=', partner_bank_filter_type_domain), '|',('company_id', '=', company_id),('company_id', '=', False)] - {'required': [('bank_account_required', '=', True)]} + {'required': [('bank_account_required', '=', True)], 'readonly': [('state', '!=', 'draft')]} {'default_partner_id':commercial_partner_id} diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst new file mode 100644 index 000000000..d4e1399d0 --- /dev/null +++ b/account_payment_sale/README.rst @@ -0,0 +1,93 @@ +==================== +Account Payment Sale +==================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :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/13.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-13-0/bank-payment-13-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/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +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. + +This module is similar to the *sale_payment* module; the main difference is +that it doesn't depend on the *account_payment_extension* module (it's not the +only module to conflict with *account_payment_extension*; all the SEPA +modules in the banking addons conflict with *account_payment_extension*. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value can be changed in a draft sale order or draft invoice. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi +* Raf Ven + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py new file mode 100644 index 000000000..2c9b3790d --- /dev/null +++ b/account_payment_sale/__init__.py @@ -0,0 +1,3 @@ +from . import models +from . import wizard +from . import tests diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py new file mode 100644 index 000000000..7966b4d6c --- /dev/null +++ b/account_payment_sale/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2014-2016 Akretion (http://www.akretion.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# @author Alexis de Lattre + +{ + "name": "Account Payment Sale", + "version": "13.0.1.1.0", + "category": "Banking addons", + "license": "AGPL-3", + "summary": "Adds payment mode on sale orders", + "author": "Akretion, " "Tecnativa, " "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/bank-payment", + "depends": ["sale", "account_payment_partner"], + "data": ["views/sale_order_view.xml", "views/sale_report_templates.xml"], + "auto_install": True, +} diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot new file mode 100644 index 000000000..f2ba0905d --- /dev/null +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + diff --git a/account_payment_sale/i18n/ca.po b/account_payment_sale/i18n/ca.po new file mode 100644 index 000000000..068baed16 --- /dev/null +++ b/account_payment_sale/i18n/ca.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2019-10-07 09:24+0000\n" +"Last-Translator: Jaume Planas \n" +"Language-Team: Catalan (http://www.transifex.com/oca/OCA-bank-payment-10-0/" +"language/ca/)\n" +"Language: ca\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.8\n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Mode de pagament:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Mode de pagament" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "Comanda" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Factura d'avançament de venda" diff --git a/account_payment_sale/i18n/da_DK.po b/account_payment_sale/i18n/da_DK.po new file mode 100644 index 000000000..592e57d59 --- /dev/null +++ b/account_payment_sale/i18n/da_DK.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2016-10-19 23:47+0000\n" +"Last-Translator: <>\n" +"Language-Team: Danish (Denmark) (http://www.transifex.com/oca/OCA-bank-" +"payment-10-0/language/da_DK/)\n" +"Language: da_DK\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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Betalingsform" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" diff --git a/account_payment_sale/i18n/de.po b/account_payment_sale/i18n/de.po new file mode 100644 index 000000000..387410be8 --- /dev/null +++ b/account_payment_sale/i18n/de.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +msgid "" +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-02-02 03:43+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Zahlungsmethode:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Zahlungsmodus" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkaufsanzahlungsrechnung" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po new file mode 100644 index 000000000..e8038e6ed --- /dev/null +++ b/account_payment_sale/i18n/es.po @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +msgid "" +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" +"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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Modo de pago:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Modo de pago" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Ventas. Anticipo pago factura" + +#~ msgid "Quotation" +#~ msgstr "Presupuesto" diff --git a/account_payment_sale/i18n/fr.po b/account_payment_sale/i18n/fr.po new file mode 100644 index 000000000..797d82ef5 --- /dev/null +++ b/account_payment_sale/i18n/fr.po @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +# Quentin THEURET , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-03 02:12+0000\n" +"PO-Revision-Date: 2018-02-03 02:12+0000\n" +"Last-Translator: Quentin THEURET , 2018\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Mode de paiement :" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Mode de paiement" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Facture de paiement anticipé des ventes" + +#~ msgid "Quotation" +#~ msgstr "Devis" diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po new file mode 100644 index 000000000..9ed504117 --- /dev/null +++ b/account_payment_sale/i18n/nl.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +msgid "" +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-02-02 03:43+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"Language: nl\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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Betaalmode:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Betaalwijze" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkoop Incassofactuur" diff --git a/account_payment_sale/i18n/nl_NL.po b/account_payment_sale/i18n/nl_NL.po new file mode 100644 index 000000000..19712745b --- /dev/null +++ b/account_payment_sale/i18n/nl_NL.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2017-11-20 14:01+0000\n" +"Last-Translator: Peter Hageman \n" +"Language-Team: Dutch (Netherlands) (http://www.transifex.com/oca/OCA-bank-" +"payment-10-0/language/nl_NL/)\n" +"Language: nl_NL\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" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +#, fuzzy +msgid "Sale Order" +msgstr "Verkooporder" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po new file mode 100644 index 000000000..b0df2c64e --- /dev/null +++ b/account_payment_sale/i18n/pt_BR.po @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +msgid "" +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: 2019-09-03 03:23+0000\n" +"Last-Translator: Rodrigo Macedo \n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" +"23907/pt_BR/)\n" +"Language: pt_BR\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.8\n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Modo de Pagamento:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Modo de Pagamento" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "Ordem de Venda" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Fatura de pagamento antecipado de vendas" diff --git a/account_payment_sale/i18n/sl.po b/account_payment_sale/i18n/sl.po new file mode 100644 index 000000000..4a90e5fd8 --- /dev/null +++ b/account_payment_sale/i18n/sl.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2018 +msgid "" +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-02-02 03:43+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "Metoda plačila" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" diff --git a/account_payment_sale/i18n/zh_CN.po b/account_payment_sale/i18n/zh_CN.po new file mode 100644 index 000000000..685913871 --- /dev/null +++ b/account_payment_sale/i18n/zh_CN.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2019-09-04 04:23+0000\n" +"Last-Translator: 黎伟杰 <674416404@qq.com>\n" +"Language-Team: none\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 3.8\n" + +#. module: account_payment_sale +#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "付款方式：" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id +msgid "Payment Mode" +msgstr "付款方式" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sale Order" +msgstr "销售订单" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "销售预付款发票" diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py new file mode 100644 index 000000000..df48fd830 --- /dev/null +++ b/account_payment_sale/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_move +from . import sale_order diff --git a/account_payment_sale/models/account_move.py b/account_payment_sale/models/account_move.py new file mode 100644 index 000000000..f2bf20f88 --- /dev/null +++ b/account_payment_sale/models/account_move.py @@ -0,0 +1,19 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + @api.model + def create(self, vals_list): + if vals_list.get("payment_mode_id"): + payment_mode = self.env["account.payment.mode"].browse( + vals_list["payment_mode_id"] + ) + if payment_mode.bank_account_link == "fixed": + vals_list[ + "invoice_partner_bank_id" + ] = payment_mode.fixed_journal_id.bank_account_id.id + return super().create(vals_list) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py new file mode 100644 index 000000000..cea5f06f3 --- /dev/null +++ b/account_payment_sale/models/sale_order.py @@ -0,0 +1,38 @@ +# Copyright 2014-2016 Akretion - Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + payment_mode_id = fields.Many2one( + comodel_name="account.payment.mode", + compute="_compute_payment_mode", + store=True, + readonly=False, + domain=[("payment_type", "=", "inbound")], + ) + + @api.depends("partner_id") + def _compute_payment_mode(self): + for order in self: + if order.partner_id: + order.payment_mode_id = order.partner_id.customer_payment_mode_id + else: + order.payment_mode_id = False + + def _get_payment_mode_vals(self, vals): + if self.payment_mode_id: + vals["payment_mode_id"] = self.payment_mode_id.id + if self.payment_mode_id.bank_account_link == "fixed": + vals[ + "invoice_partner_bank_id" + ] = self.payment_mode_id.fixed_journal_id.bank_account_id.id + return vals + + def _prepare_invoice(self): + """Copy bank partner from sale order to invoice""" + vals = super()._prepare_invoice() + return self._get_payment_mode_vals(vals) diff --git a/account_payment_sale/readme/CONTRIBUTORS.rst b/account_payment_sale/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..66e1e8090 --- /dev/null +++ b/account_payment_sale/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi +* Raf Ven diff --git a/account_payment_sale/readme/DESCRIPTION.rst b/account_payment_sale/readme/DESCRIPTION.rst new file mode 100644 index 000000000..3f30200f3 --- /dev/null +++ b/account_payment_sale/readme/DESCRIPTION.rst @@ -0,0 +1,8 @@ +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. + +This module is similar to the *sale_payment* module; the main difference is +that it doesn't depend on the *account_payment_extension* module (it's not the +only module to conflict with *account_payment_extension*; all the SEPA +modules in the banking addons conflict with *account_payment_extension*. diff --git a/account_payment_sale/readme/USAGE.rst b/account_payment_sale/readme/USAGE.rst new file mode 100644 index 000000000..59244604c --- /dev/null +++ b/account_payment_sale/readme/USAGE.rst @@ -0,0 +1,3 @@ +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value can be changed in a draft sale order or draft invoice. diff --git a/account_payment_sale/static/description/icon.png b/account_payment_sale/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_payment_sale/static/description/icon.png differ diff --git a/account_payment_sale/static/description/index.html b/account_payment_sale/static/description/index.html new file mode 100644 index 000000000..e7e5a9709 --- /dev/null +++ b/account_payment_sale/static/description/index.html @@ -0,0 +1,438 @@ + + + + + + +Account Payment Sale + + + +
+

Account Payment Sale

+ + +

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.

+

This module is similar to the sale_payment module; the main difference is +that it doesn’t depend on the account_payment_extension module (it’s not the +only module to conflict with account_payment_extension; all the SEPA +modules in the banking addons conflict with account_payment_extension.

+

Table of contents

+ +
+

Usage

+

You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value can be changed in a draft sale order or draft invoice.

+
+
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

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

+
+
+
+ + diff --git a/account_payment_sale/tests/__init__.py b/account_payment_sale/tests/__init__.py new file mode 100644 index 000000000..55d111022 --- /dev/null +++ b/account_payment_sale/tests/__init__.py @@ -0,0 +1,2 @@ +from . import common +from . import test_sale_order diff --git a/account_payment_sale/tests/common.py b/account_payment_sale/tests/common.py new file mode 100644 index 000000000..3164e8b06 --- /dev/null +++ b/account_payment_sale/tests/common.py @@ -0,0 +1,70 @@ +# Copyright 2018 Camptocamp +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import SavepointCase + + +class CommonTestCase(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + + cls.bank = cls.env["res.partner.bank"].create( + {"acc_number": "test", "partner_id": cls.env.user.company_id.partner_id.id} + ) + cls.journal = cls.env["account.journal"].create( + { + "name": "test journal", + "code": "123", + "type": "bank", + "company_id": cls.env.ref("base.main_company").id, + "bank_account_id": cls.bank.id, + } + ) + cls.payment_mode = cls.env["account.payment.mode"].create( + { + "name": "test_mode", + "active": True, + "payment_method_id": cls.env.ref( + "account.account_payment_method_manual_in" + ).id, + "bank_account_link": "fixed", + "fixed_journal_id": cls.journal.id, + } + ) + cls.payment_mode_2 = cls.env["account.payment.mode"].create( + { + "name": "test_mode_2", + "active": True, + "payment_method_id": cls.env.ref( + "account.account_payment_method_manual_in" + ).id, + "bank_account_link": "fixed", + "fixed_journal_id": cls.journal.id, + } + ) + cls.base_partner = cls.env["res.partner"].create( + { + "name": "Dummy", + "email": "dummy@example.com", + "customer_payment_mode_id": cls.payment_mode.id, + } + ) + cls.products = { + "prod_order": cls.env.ref("product.product_order_01"), + "prod_del": cls.env.ref("product.product_delivery_01"), + "serv_order": cls.env["product.product"].create( + { + "name": "Test service product order", + "type": "service", + "invoice_policy": "order", + } + ), + "serv_del": cls.env["product.product"].create( + { + "name": "Test service product delivery", + "type": "service", + "invoice_policy": "delivery", + } + ), + } diff --git a/account_payment_sale/tests/test_sale_order.py b/account_payment_sale/tests/test_sale_order.py new file mode 100644 index 000000000..b6c60dbcb --- /dev/null +++ b/account_payment_sale/tests/test_sale_order.py @@ -0,0 +1,98 @@ +# Copyright 2018 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import Form + +from .common import CommonTestCase + + +class TestSaleOrder(CommonTestCase): + def create_sale_order(self, payment_mode=None): + with Form(self.env["sale.order"]) as sale_form: + sale_form.partner_id = self.base_partner + sale_form.partner_invoice_id = self.base_partner + sale_form.partner_shipping_id = self.base_partner + sale_form.pricelist_id = self.env.ref("product.list0") + for (_, p) in self.products.items(): + with sale_form.order_line.new() as order_line: + order_line.product_id = p + order_line.name = p.name + order_line.product_uom_qty = 2 + order_line.product_uom = p.uom_id + order_line.price_unit = p.list_price + sale = sale_form.save() + self.assertEqual( + sale.payment_mode_id, self.base_partner.customer_payment_mode_id + ) + sale_form = Form(sale) + + # force payment mode + if payment_mode: + sale_form.payment_mode_id = payment_mode + return sale_form.save() + + def create_invoice_and_check( + self, order, expected_payment_mode, expected_partner_bank + ): + order.action_confirm() + order._create_invoices() + invoice = order.invoice_ids + self.assertEqual(len(invoice), 1) + self.assertEqual(invoice.payment_mode_id, expected_payment_mode) + self.assertEqual(invoice.invoice_partner_bank_id, expected_partner_bank) + + def test_sale_to_invoice_payment_mode(self): + """ + Data: + A partner with a specific payment_mode + A sale order created with the payment_mode of the partner + Test case: + Create the invoice from the sale order + Expected result: + The invoice must be created with the payment_mode of the partner + """ + order = self.create_sale_order() + self.create_invoice_and_check(order, self.payment_mode, self.bank) + + def test_sale_to_invoice_payment_mode_2(self): + """ + Data: + A partner with a specific payment_mode + A sale order created with an other payment_mode + Test case: + Create the invoice from the sale order + Expected result: + The invoice must be created with the specific payment_mode + """ + order = self.create_sale_order(payment_mode=self.payment_mode_2) + self.create_invoice_and_check(order, self.payment_mode_2, self.bank) + + def test_sale_to_invoice_payment_mode_via_payment(self): + """ + Data: + A partner with a specific payment_mode + A sale order created with an other payment_mode + Test case: + Create the invoice from sale.advance.payment.inv + Expected result: + The invoice must be created with the specific payment_mode + """ + order = self.create_sale_order(payment_mode=self.payment_mode_2) + context = { + "active_model": "sale.order", + "active_ids": [order.id], + "active_id": order.id, + } + order.action_confirm() + payment = self.env["sale.advance.payment.inv"].create( + { + "advance_payment_method": "fixed", + "fixed_amount": 5, + "product_id": self.env.ref("sale.advance_product_0").id, + } + ) + payment.with_context(context).create_invoices() + invoice = order.invoice_ids + self.assertEqual(len(invoice), 1) + self.assertEqual(invoice.payment_mode_id, self.payment_mode_2) + self.assertEqual(invoice.invoice_partner_bank_id, self.bank) diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml new file mode 100644 index 000000000..8861e724a --- /dev/null +++ b/account_payment_sale/views/sale_order_view.xml @@ -0,0 +1,21 @@ + + + + + + account_payment_sale.sale_order.form + sale.order + + + + + + + + + diff --git a/account_payment_sale/views/sale_report_templates.xml b/account_payment_sale/views/sale_report_templates.xml new file mode 100644 index 000000000..183d06e93 --- /dev/null +++ b/account_payment_sale/views/sale_report_templates.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/account_payment_sale/wizard/__init__.py b/account_payment_sale/wizard/__init__.py new file mode 100644 index 000000000..fca48c3d0 --- /dev/null +++ b/account_payment_sale/wizard/__init__.py @@ -0,0 +1 @@ +from . import sale_make_invoice_advance diff --git a/account_payment_sale/wizard/sale_make_invoice_advance.py b/account_payment_sale/wizard/sale_make_invoice_advance.py new file mode 100644 index 000000000..6aed7c2f9 --- /dev/null +++ b/account_payment_sale/wizard/sale_make_invoice_advance.py @@ -0,0 +1,16 @@ +# Copyright 2016 Akretion - Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models + + +class SaleAdvancePaymentInv(models.TransientModel): + _inherit = "sale.advance.payment.inv" + + def _create_invoice(self, order, so_line, amount): + """Copy payment mode from sale order to invoice""" + inv = super()._create_invoice(order, so_line, amount) + vals = order._get_payment_mode_vals({}) + if vals: + inv.write(vals) + return inv