fix: renamed fields as some data were lost due to this change

i18n/es_CO.po

@@ -253,7 +253,7 @@ msgid "Enter the Identification Number"
 msgstr "Ingrese el numero de identificación"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_name1
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name1
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "First Name"
 msgstr "Primer Nombre"
@@ -334,7 +334,7 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_lastname1
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname1
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Last Name"
 msgstr "Primer Apellido"
@@ -418,13 +418,13 @@ msgid "Point of Sales Name or Direction"
 msgstr "Nombre del Punto de Venta o dirección"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_lastname2
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname2
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Last Name"
 msgstr "Segundo Apellido"
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_name2
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name2
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Name"
 msgstr "Segundo Nombre"

i18n/l10n_co_res_partner.pot

@@ -115,12 +115,12 @@ msgid "Code and Description"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Common"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Common Autorretenedor"
 msgstr ""
 
@@ -243,18 +243,18 @@ msgid "Error! Please select a person type"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_name1
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name1
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "First Name"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Great Contributor"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Great Taxpayer Autorretenedor"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgid "Identification number must be unique!"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "International"
 msgstr ""
 
@@ -329,7 +329,7 @@ msgid "Last Modified on"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_lastname1
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname1
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Last Name"
 msgstr ""
@@ -378,7 +378,7 @@ msgid "Natural"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Natural Person"
 msgstr ""
 
@@ -408,13 +408,13 @@ msgid "Point of Sales Name or Direction"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_lastname2
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_lastname2
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Last Name"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_name2
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_name2
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Second Name"
 msgstr ""
@@ -425,7 +425,7 @@ msgid "Section"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: selection:res.partner,pn_retri:0
+#: selection:res.partner,x_pn_retri:0
 msgid "Simplified"
 msgstr ""
 
@@ -435,7 +435,7 @@ msgid "State"
 msgstr ""
 
 #. module: l10n_co_res_partner
-#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_pn_retri
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_x_pn_retri
 msgid "Tax Regime"
 msgstr ""
 

models/l10n_co_res_partner.py

@@ -49,10 +49,10 @@ class PartnerInfoExtended(models.Model):
     companyType = fields.Selection(related='company_type')
 
     # Adding new name fields
-    name1 = fields.Char("First Name")
-    name2 = fields.Char("Second Name")
-    lastname1 = fields.Char("Last Name")
-    lastname2 = fields.Char("Second Last Name")
+    x_name1 = fields.Char("First Name")
+    x_name2 = fields.Char("Second Name")
+    x_lastname1 = fields.Char("Last Name")
+    x_lastname2 = fields.Char("Second Last Name")
 
     # Document information
     doctype = fields.Selection(
@@ -80,7 +80,7 @@ class PartnerInfoExtended(models.Model):
     )
 
     # Tributate regime
-    pn_retri = fields.Selection(
+    x_pn_retri = fields.Selection(
         [
             (6, "Simplified"),
             (23, "Natural Person"),
@@ -183,7 +183,7 @@ def _compute_concat_nit(self):
                     # Saving Verification digit in a proper field
                     self.dv = nitList[1]
 
-    @api.onchange('name1', 'name2', 'lastname1', 'lastname2', 'companyName',
+    @api.onchange('x_name1', 'x_name2', 'x_lastname1', 'x_lastname2', 'companyName',
                   'pos_name')
     def _concat_name(self):
         """
@@ -194,34 +194,34 @@ def _concat_name(self):
         @return: void
         """
         # Avoiding that "False" will be written into the name field
-        if self.name1 is False:
-            self.name1 = ''
+        if self.x_name1 is False:
+            self.x_name1 = ''
 
-        if self.name2 is False:
-            self.name2 = ''
+        if self.x_name2 is False:
+            self.x_name2 = ''
 
-        if self.lastname1 is False:
-            self.lastname1 = ''
+        if self.x_lastname1 is False:
+            self.x_lastname1 = ''
 
-        if self.lastname2 is False:
-            self.lastname2 = ''
+        if self.x_lastname2 is False:
+            self.x_lastname2 = ''
 
         # Collecting all names in a field that will be concatenated
         nameList = [
-            self.name1.encode(encoding='utf-8').strip(),
-            self.name2.encode(encoding='utf-8').strip(),
-            self.lastname1.encode(encoding='utf-8').strip(),
-            self.lastname2.encode(encoding='utf-8').strip()
+            self.x_name1.encode(encoding='utf-8').strip(),
+            self.x_name2.encode(encoding='utf-8').strip(),
+            self.x_lastname1.encode(encoding='utf-8').strip(),
+            self.x_lastname2.encode(encoding='utf-8').strip()
         ]
 
         formatedList = []
         if self.companyName is False:
             if self.type == 'delivery':
                 self.name = self.pos_name
-                self.name1 = False
-                self.name2 = False
-                self.lastname1 = False
-                self.lastname2 = False
+                self.x_name1 = False
+                self.x_name2 = False
+                self.x_lastname1 = False
+                self.x_lastname2 = False
                 self.doctype = 1
             else:
                 for item in nameList:
@@ -242,8 +242,8 @@ def onChangeName(self):
         fields.
         @return: void
         """
-        if self.name1 is not False:
-            if len(self.name1) > 0:
+        if self.x_name1 is not False:
+            if len(self.x_name1) > 0:
                 self._concat_name()
         if self.companyName is not False:
             if len(self.companyName) > 0:
@@ -258,14 +258,14 @@ def onChangePersonType(self):
         @return: void
         """
         if self.personType is 2:
-            self.name1 = ''
-            self.name2 = ''
-            self.lastname1 = ''
-            self.lastname2 = ''
-            self.pn_retri = 7
+            self.x_name1 = ''
+            self.x_name2 = ''
+            self.x_lastname1 = ''
+            self.x_lastname2 = ''
+            self.x_pn_retri = 7
         elif self.personType is 1:
             self.companyName = False
-            self.pn_retri = False
+            self.x_pn_retri = False
 
     @api.onchange('doctype')
     def onChangeDocumentType(self):
@@ -424,15 +424,15 @@ def _checkDocType(self):
                 msg = _('Error! Identification number is mandatory')
                 raise exceptions.ValidationError(msg)
 
-    @api.constrains('name1', 'name2', 'companyName')
+    @api.constrains('x_name1', 'x_name2', 'companyName')
     def _check_names(self):
         """
         Double check: Although validation is checked within the frontend (xml)
         we check it again to get sure
         """
         if self.is_company is True:
             if self.personType is 1:
-                if self.name1 is False or self.name1 == '':
+                if self.x_name1 is False or self.x_name1 == '':
                     msg = _('Error! Please enter the persons name')
                     raise exceptions.ValidationError(msg)
             elif self.personType is 2:
@@ -444,7 +444,7 @@ def _check_names(self):
                 msg = _('Error! Please enter the persons name')
                 raise exceptions.ValidationError(msg)
         else:
-            if self.name1 is False or self.name1 == '':
+            if self.x_name1 is False or self.x_name1 == '':
                 msg = _('Error! Please enter the name of the person')
                 raise exceptions.ValidationError(msg)
 

views/l10n_co_res_partner.xml

@@ -56,13 +56,13 @@
 
                 <xpath expr="(//field[@name='name'])[4]" position="before">
                     <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
-                    <field name="name1"
+                    <field name="x_name1"
                            placeholder="First Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
-                    <field name="name2"
+                    <field name="x_name2"
                            placeholder="Second Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
-                    <field name="lastname1"
+                    <field name="x_lastname1"
                            placeholder="Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')], 'required': [('type', '!=', 'delivery')]}" />
-                    <field name="lastname2"
+                    <field name="x_lastname2"
                            placeholder="Second Last Name" attrs="{'invisible':['|',('type', '=', 'delivery')]}" />
                     <field name="xbirthday" attrs="{'invisible':[('type', '=', 'delivery')]}" />
 
@@ -74,7 +74,7 @@
                            attrs="{'invisible':[('doctype', '!=', 31)]}"
                            readonly="1" />
                     <field name="dv" invisible="1" />
-                    <field name="pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+                    <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
                     <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}" domain="[('type', '=', 'other')]" />
 
                 </xpath>
@@ -95,7 +95,7 @@
                     <h3>
                         <field
                                 name="name"
-                                attrs="{'invisible':[('name1', '=', ''),('companyName', '=', False)]}"
+                                attrs="{'invisible':[('x_name1', '=', ''),('companyName', '=', False)]}"
                                 placeholder="Don't touch! Field will be filled up automatically!" />
                     </h3>
                 </field>
@@ -115,21 +115,21 @@
                            placeholder="Name of the Company"
                            attrs="{'invisible':['|',('personType', '=', 1),('company_type', '=', 'person')], 'required': [('personType', '=', 2)]}" />
                     <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
-                    <field name="name1"
+                    <field name="x_name1"
                            placeholder="First Name"
                            default_focus="1"
                            attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')], 'required': [('personType', '=', 1), ('type', '!=', 'delivery')]}" />
-                    <field name="name2"
+                    <field name="x_name2"
                            placeholder="Second Name"
                            attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')]}" />
-                    <field name="lastname1"
+                    <field name="x_lastname1"
                            placeholder="Last Name"
                            attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')], 'required': [('personType', '=', 1), ('type', '!=', 'delivery')]}" />
-                    <field name="lastname2"
+                    <field name="x_lastname2"
                            placeholder="Second Last Name"
                            attrs="{'invisible':['|',('personType', '=', 2), ('type', '=', 'delivery')]}"  />
                     <field name="xbirthday" attrs="{'invisible':[('is_company', '=', True)]}" />
-                    <field name="pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
+                    <field name="x_pn_retri" attrs="{'invisible':[('type', '=', 'delivery')]}" />
                     <field name="ciiu" attrs="{'invisible':[('type', '=', 'delivery')]}"  domain="[('type', '=', 'other')]" />
 
                 </field>
@@ -211,4 +211,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>