Merge cf14435 into d382a48

OCA · Sep 30, 2019 · b8c9cc7 · b8c9cc7
2 parents d382a48 + cf14435
commit b8c9cc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/l10n_ch_dta/wizard/create_dta.py b/l10n_ch_dta/wizard/create_dta.py
@@ -171,7 +171,10 @@ def validate_global_context_dict(self):
                 _('Error'),
                 _('Wrong postal number format.\n'
                   'It must be 12-123456-9 or 12345 format \n'
-                  'on line %s' % (self.pline.name))
+                  'on line %s for partner %s') % (
+                      self.pline.name,
+                      self.pline.partner_id.name
+                )
             )
 
 

diff --git a/l10n_ch_pain_base/models/account_payment_order.py b/l10n_ch_pain_base/models/account_payment_order.py
@@ -40,7 +40,7 @@ def generate_pain_attrib(self):
                 "{http://www.w3.org/2001/XMLSchema-instance}schemaLocation":
                 "http://www.six-interbank-clearing.com/de/"
                 "%s.xsd  %s.xsd" % (pain_flavor, pain_flavor)
-                }
+            }
             return attrib
         else:
             return super(AccountPaymentOrder, self).generate_pain_attrib()
@@ -72,9 +72,10 @@ def generate_party_agent(
                 raise UserError(_(
                     "For pain.001.001.03.ch.02, for non-BVR payments, "
                     "the BIC is required on the bank '%s' related to the "
-                    "bank account '%s'") % (
+                    "bank account '%s', payment line '%s'") % (
                         partner_bank.bank_id.name,
-                        partner_bank.acc_number))
+                        partner_bank.acc_number,
+                        bank_line.name))
         return super(AccountPaymentOrder, self).generate_party_agent(
             parent_node, party_type, order, partner_bank, gen_args,
             bank_line=bank_line)