Merge branch '5.4' into 043029

issue10500.diff

@@ -0,0 +1,22 @@
+diff --git a/invoice.py b/invoice.py
+index 582265d..1093bb3 100644
+--- a/trytond/trytond/modules/account_invoice/invoice.py
++++ b/trytond/trytond/modules/account_invoice/invoice.py
+@@ -1202,7 +1202,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
+                     gettext('account_invoice.msg_invoice_same_account_line',
+                         account=self.account.rec_name,
+                         invoice=self.rec_name,
+-                        line=line.rec_name))
++                        lines=line.rec_name))
+ 
+     def check_payment_lines(self):
+         amount = sum(l.debit - l.credit for l in self.lines_to_pay)
+@@ -2121,7 +2121,7 @@ class InvoiceLine(sequence_ordered(), ModelSQL, ModelView, TaxableMixin):
+                     gettext('account_invoice.msg_invoice_same_account_line',
+                         account=self.account.rec_name,
+                         invoice=self.invoice.rec_name,
+-                        line=self.rec_name))
++                        lines=self.rec_name))
+ 
+     def _compute_taxes(self):
+         pool = Pool()

series

@@ -99,5 +99,6 @@ issue10338.diff # [bank] Search on rec_name of other model in search_rec_name
 issue9146.diff # [account_stock_landed_cost] Use field digits on secondary unit
 
 stock_lot_sled_ca_locale.diff # [stock_lot_sled] Fix wrong translation [#044921]
-
 issue9122.diff # [stock_supply] Add cron job to supply stock
+
+issue10500.diff # [account_invoice] Fix msg_invoice_same_account_line variables name