diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst new file mode 100644 index 000000000..7832cea6c --- /dev/null +++ b/account_payment_sale/README.rst @@ -0,0 +1,74 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +==================== +Account Payment Sale +==================== + +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*. + +Installation +============ + +This module depends on : + +* sale +* account_payment_partner + +This module is part of the OCA/bank-payment suite. + +Configuration +============= + +There is nothing to configure. + +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. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/173/11.0 + +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. + +Credits +======= + +Contributors +------------ + +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit http://odoo-community.org. 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..bc8340864 --- /dev/null +++ b/account_payment_sale/__manifest__.py @@ -0,0 +1,24 @@ +# 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': '11.0.1.0.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/ca.po b/account_payment_sale/i18n/ca.po new file mode 100644 index 000000000..1e5167262 --- /dev/null +++ b/account_payment_sale/i18n/ca.po @@ -0,0 +1,38 @@ +# 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: Catalan (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/da_DK.po b/account_payment_sale/i18n/da_DK.po new file mode 100644 index 000000000..061573839 --- /dev/null +++ b/account_payment_sale/i18n/da_DK.po @@ -0,0 +1,38 @@ +# 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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: da_DK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/de.po b/account_payment_sale/i18n/de.po new file mode 100644 index 000000000..e1c1ee956 --- /dev/null +++ b/account_payment_sale/i18n/de.po @@ -0,0 +1,38 @@ +# 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-12-08 01:38+0000\n" +"PO-Revision-Date: 2017-12-19 18:19+0200\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkaufsanzahlungsrechnung" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Kundenauftrag" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po new file mode 100644 index 000000000..914dff763 --- /dev/null +++ b/account_payment_sale/i18n/es.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-30 16:09+0000\n" +"PO-Revision-Date: 2016-12-27 12:50+0000\n" +"Last-Translator: Pedro M. Baeza \n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-10-0/" +"language/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" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Ventas. Anticipo pago factura" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" diff --git a/account_payment_sale/i18n/fr.po b/account_payment_sale/i18n/fr.po new file mode 100644 index 000000000..616d09fa3 --- /dev/null +++ b/account_payment_sale/i18n/fr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_sale +#: model: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 "Mode de paiement" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po new file mode 100644 index 000000000..7dc82d0e3 --- /dev/null +++ b/account_payment_sale/i18n/nl.po @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# Erwin van der Ploeg , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-08 01:38+0000\n" +"PO-Revision-Date: 2017-12-19 18:17+0200\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: Dutch (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkoop Incassofactuur" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" diff --git a/account_payment_sale/i18n/nl_NL.po b/account_payment_sale/i18n/nl_NL.po new file mode 100644 index 000000000..e176fe415 --- /dev/null +++ b/account_payment_sale/i18n/nl_NL.po @@ -0,0 +1,39 @@ +# 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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po new file mode 100644 index 000000000..9d012c1d1 --- /dev/null +++ b/account_payment_sale/i18n/pt_BR.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_sale +#: model: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 "Modo de Pagamento" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de Venda" diff --git a/account_payment_sale/i18n/sl.po b/account_payment_sale/i18n/sl.po new file mode 100644 index 000000000..4fdac894b --- /dev/null +++ b/account_payment_sale/i18n/sl.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\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: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_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Plačilni nalog" diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py new file mode 100644 index 000000000..6aacb7531 --- /dev/null +++ b/account_payment_sale/models/__init__.py @@ -0,0 +1 @@ +from . import sale_order diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py new file mode 100644 index 000000000..900c3f302 --- /dev/null +++ b/account_payment_sale/models/sale_order.py @@ -0,0 +1,35 @@ +# Copyright 2014-2016 Akretion - Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, fields, api + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + payment_mode_id = fields.Many2one( + 'account.payment.mode', string='Payment Mode', + domain=[('payment_type', '=', 'inbound')]) + + 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['partner_bank_id'] =\ + self.payment_mode_id.fixed_journal_id.bank_account_id.id + return vals + + @api.onchange('partner_id') + def onchange_partner_id(self): + res = super().onchange_partner_id() + if self.partner_id: + self.payment_mode_id = self.partner_id.customer_payment_mode_id + else: + self.payment_mode_id = False + return res + + @api.multi + 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/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/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..51dc47e34 --- /dev/null +++ b/account_payment_sale/tests/common.py @@ -0,0 +1,42 @@ +# 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', + }) + 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.base_partner = cls.env["res.partner"].create({ + 'name': 'Dummy', + 'mail': '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.ref('product.service_order_01'), + 'serv_del': cls.env.ref('product.service_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..4e35f911c --- /dev/null +++ b/account_payment_sale/tests/test_sale_order.py @@ -0,0 +1,61 @@ +# Copyright 2018 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from .common import CommonTestCase + + +class TestSaleOrder(CommonTestCase): + + def create_sale_order(self): + so_lines = [(0, 0, { + 'name': p.name, + 'product_id': p.id, + 'product_uom_qty': 2, + 'product_uom': p.uom_id.id, + 'price_unit': p.list_price, + }) for (_, p) in self.products.items()] + so = self.env['sale.order'].create({ + 'partner_id': self.base_partner.id, + 'partner_invoice_id': self.base_partner.id, + 'partner_shipping_id': self.base_partner.id, + 'order_line': so_lines, + 'pricelist_id': self.env.ref('product.list0').id, + }) + self.assertFalse(so.payment_mode_id) + so.onchange_partner_id() + self.assertEqual( + so.payment_mode_id, + self.base_partner.customer_payment_mode_id + ) + return so + + def test_sale_to_invoice_payment_mode(self): + order = self.create_sale_order() + context = { + "active_model": 'sale.order', + "active_ids": [order.id], + "active_id": order.id, + } + order.with_context(context).action_confirm() + payment = self.env['sale.advance.payment.inv'].create({ + 'advance_payment_method': 'fixed', + 'amount': 5, + 'product_id': self.env.ref('sale.advance_product_0').id, + }) + vals = order._get_payment_mode_vals({}) + expected_vals = { + 'payment_mode_id': self.payment_mode.id, + 'partner_bank_id': self.bank.id, + } + self.assertEqual(vals, expected_vals) + payment.with_context(context).create_invoices() + invoice = order.invoice_ids + self.assertEqual(len(invoice), 1) + self.assertEqual( + invoice.payment_mode_id.id, + expected_vals["payment_mode_id"] + ) + self.assertEqual( + invoice.partner_bank_id.id, + expected_vals["partner_bank_id"] + ) 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..005849e83 --- /dev/null +++ b/account_payment_sale/views/sale_order_view.xml @@ -0,0 +1,24 @@ + + + + + + + + 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..36366cfc6 --- /dev/null +++ b/account_payment_sale/wizard/sale_make_invoice_advance.py @@ -0,0 +1,17 @@ +# Copyright 2016 Akretion - Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, api + + +class SaleAdvancePaymentInv(models.TransientModel): + _inherit = 'sale.advance.payment.inv' + + @api.multi + 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