[FIX] Rearrange the order of partner block to fit the XML schema of p…

…ain.001.001.02
OCA · May 11, 2017 · f3ed305 · f3ed305
1 parent 38e4da3
commit f3ed305
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/account_banking_pain_base/models/account_payment_order.py b/account_banking_pain_base/models/account_payment_order.py
@@ -357,6 +357,14 @@ def generate_party_acc_number(
             party_account_other_id.text = partner_bank.sanitized_acc_number
         return True
 
+    @api.model
+    def generate_coutry_block(self, parent_node, partner, gen_args):
+        country = etree.SubElement(parent_node, 'Ctry')
+        country.text = self._prepare_field(
+            'Country', 'partner.country_id.code',
+            {'partner': partner}, 2, gen_args=gen_args)
+        return country
+
     @api.model
     def generate_party_block(
             self, parent_node, party_type, order, partner_bank, gen_args,
@@ -387,10 +395,8 @@ def generate_party_block(
         partner = partner_bank.partner_id
         if partner.country_id:
             postal_address = etree.SubElement(party, 'PstlAdr')
-            country = etree.SubElement(postal_address, 'Ctry')
-            country.text = self._prepare_field(
-                'Country', 'partner.country_id.code',
-                {'partner': partner}, 2, gen_args=gen_args)
+            if not gen_args['pain_flavor'].startswith('pain.001.001.02'):
+                self.generate_coutry_block(postal_address,partner,gen_args)
             if partner.street:
                 adrline1 = etree.SubElement(postal_address, 'AdrLine')
                 adrline1.text = self._prepare_field(
@@ -401,6 +407,8 @@ def generate_party_block(
                 adrline2.text = self._prepare_field(
                     'Address Line2', "partner.zip + ' ' + partner.city",
                     {'partner': partner}, 70, gen_args=gen_args)
+            if gen_args['pain_flavor'].startswith('pain.001.001.02'):
+                self.generate_coutry_block(postal_address, partner, gen_args)
 
         self.generate_party_acc_number(
             parent_node, party_type, order, partner_bank, gen_args,