[FIX] account_payment_sale: Propagate payment_mode to invoices created from a call to sale.action_invoice_create

Into the normal process of the invoice creation from a sale order by odoo, the onchange_partner is called. In some case, this call will reset the specific payment_mode and/or partner_bank_id set on the sale_order.
To fix this issue, we must override the _finalize_invoices method, take a snapshot of these values before the call to super and restore these values if these are changed.
fixes #536

account_payment_sale/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     'name': 'Account Payment Sale',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.1.0',
     'category': 'Banking addons',
     'license': 'AGPL-3',
     'summary': "Adds payment mode on sale orders",

account_payment_sale/i18n/ca.po

@@ -8,15 +8,16 @@ 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"
+"PO-Revision-Date: 2019-10-07 09:24+0000\n"
+"Last-Translator: Jaume Planas <jaume.planas@minorisa.net>\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"
+"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
@@ -31,9 +32,9 @@ msgstr "Mode de pagament"
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Comanda"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Factura d'avançament de venda"

account_payment_sale/models/sale_order.py

@@ -33,3 +33,31 @@ class SaleOrder(models.Model):
         """Copy bank partner from sale order to invoice"""
         vals = super()._prepare_invoice()
         return self._get_payment_mode_vals(vals)
+
+    def _finalize_invoices(self, invoices, references):
+        """
+        Invoked after creating invoices at the end of action_invoice_create.
+
+        We must override this method since the onchange on partner is called by
+        the base method and therefore will change the specific payment_mode set
+        on the SO if one is defined on the partner..
+
+        :param invoices: {group_key: invoice}
+        :param references: {invoice: order}
+        """
+        payment_vals_by_invoice = {}
+        for invoice in invoices.values():
+            payment_vals_by_invoice[invoice] = {
+                'payment_mode_id': invoice.payment_mode_id.id,
+                'partner_bank_id': invoice.partner_bank_id.id
+            }
+        res = super()._finalize_invoices(invoices, references)
+        for invoice in invoices.values():
+            payment_vals = payment_vals_by_invoice[invoice]
+            if invoice.payment_mode_id.id == payment_vals['payment_mode_id']:
+                payment_vals.pop("payment_mode_id")
+            if invoice.partner_bank_id.id == payment_vals["partner_bank_id"]:
+                payment_vals.pop("partner_bank_id")
+            if payment_vals:
+                invoice.write(payment_vals)
+        return res

account_payment_sale/tests/common.py

@@ -30,6 +30,15 @@ class CommonTestCase(SavepointCase):
             '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',

account_payment_sale/tests/test_sale_order.py

@@ -5,57 +5,102 @@ 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,
-        })
+    def create_sale_order(self, payment_mode=None):
+        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
+            so.payment_mode_id, self.base_partner.customer_payment_mode_id
         )
+        # force payment mode
+        if payment_mode:
+            so.payment_mode_id = payment_mode.id
         return so
 
+    def create_invoice_and_check(
+        self, order, expected_payment_mode, expected_partner_bank
+    ):
+        order.action_confirm()
+        order.action_invoice_create()
+        invoice = order.invoice_ids
+        self.assertEqual(len(invoice), 1)
+        self.assertEqual(invoice.payment_mode_id, expected_payment_mode)
+        self.assertEqual(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_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)
+        order.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,
+            }
+        )
         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"]
-        )
+        self.assertEqual(invoice.payment_mode_id, self.payment_mode_2)
+        self.assertEqual(invoice.partner_bank_id, self.bank)