Merge pull request #3 from dkrimmer84/dev

Dev
odooloco · Jul 1, 2016 · 8d3239c · 8d3239c
2 parents b61084c + 88a5754
commit 8d3239c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -67,3 +67,4 @@ This is how you can reach the contributors:
 
 Dominic Krimmer: dominic@plastinorte.com
 Hector Ivan Valencia Muñoz: quipus.total@gmail.com
+test
diff --git a/i18n/es_CO.po b/i18n/es_CO.po
@@ -70,6 +70,16 @@ msgstr "<b>¡Datos incompletos!</b><br/> Por favor, actualice pronto."
 msgid "Birthday"
 msgstr "Fecha de Nacimiento"
 
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyBrandName
+msgid "Brand"
+msgstr "Marca"
+
+#. module: l10n_co_res_partner
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
+msgid "Brand Name of the Company?"
+msgstr "Nombre de la Marca"
+
 #. module: l10n_co_res_partner
 #: model:ir.actions.act_window,help:l10n_co_res_partner.action_ciiu_transaction
 #: model:ir.actions.act_window,name:l10n_co_res_partner.action_ciiu_transaction
@@ -375,7 +385,7 @@ msgstr "NIT Formateado"
 #: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyName
 #: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
 msgid "Name of the Company"
-msgstr "Nombre de la compañia"
+msgstr "Nombre de la Compañia"
 
 #. module: l10n_co_res_partner
 #: selection:res.partner,personType:0

diff --git a/i18n/l10n_co_res_partner.pot b/i18n/l10n_co_res_partner.pot
@@ -70,6 +70,16 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
+#. module: l10n_co_res_partner
+#: model:ir.model.fields,field_description:l10n_co_res_partner.field_res_partner_companyBrandName
+msgid "Brand"
+msgstr ""
+
+#. module: l10n_co_res_partner
+#: model:ir.ui.view,arch_db:l10n_co_res_partner.view_partner_form
+msgid "Brand Name of the Company?"
+msgstr ""
+
 #. module: l10n_co_res_partner
 #: model:ir.actions.act_window,help:l10n_co_res_partner.action_ciiu_transaction
 #: model:ir.actions.act_window,name:l10n_co_res_partner.action_ciiu_transaction

diff --git a/models/l10n_co_res_partner.py b/models/l10n_co_res_partner.py
@@ -42,9 +42,12 @@ class PartnerInfoExtended(models.Model):
     _name = 'res.partner'
     _inherit = 'res.partner'
 
-    # Company Name
+    # Company Name (legal name)
     companyName = fields.Char("Name of the Company")
 
+    # Brand Name (e.j. Claro Móvil = Brand, COMCEL SA = legal name)
+    companyBrandName = fields.Char("Brand")
+
     # companyType
     companyType = fields.Selection(related='company_type')
 
@@ -184,7 +187,7 @@ def _compute_concat_nit(self):
                     self.dv = nitList[1]
 
     @api.onchange('x_name1', 'x_name2', 'x_lastname1', 'x_lastname2', 'companyName',
-                  'pos_name')
+                  'pos_name', 'companyBrandName')
     def _concat_name(self):
         """
         This function concatenates the four name fields in order to be able to
@@ -229,7 +232,14 @@ def _concat_name(self):
                         formatedList.append(item)
                 self.name = ' ' .join(formatedList)
         else:
-            self.name = self.companyName
+            # Some Companies are know for their Brand, which could conflict from the users point of view while
+            # searching the company (e.j. o2 = brand, Telefonica = Company)
+            if self.companyBrandName is not False:
+                delimiter = ', '
+                company_list = (self.companyBrandName, self.companyName)
+                self.name = delimiter.join(company_list)
+            else:
+                self.name = self.companyName
 
     @api.onchange('name')
     def onChangeName(self):
@@ -265,6 +275,7 @@ def onChangePersonType(self):
             self.x_pn_retri = 7
         elif self.personType is 1:
             self.companyName = False
+            self.companyBrandName = False
             self.x_pn_retri = False
 
     @api.onchange('doctype')

diff --git a/views/l10n_co_res_partner.xml b/views/l10n_co_res_partner.xml
@@ -114,6 +114,9 @@
                     <field name="companyName"
                            placeholder="Name of the Company"
                            attrs="{'invisible':['|',('personType', '=', 1),('company_type', '=', 'person')], 'required': [('personType', '=', 2)]}" />
+                    <field name="companyBrandName"
+                           placeholder="Brand Name of the Company?"
+                           attrs="{'invisible':['|',('personType', '=', 1),('company_type', '=', 'person')]}" />
                     <field name="pos_name" placeholder="Point of Sales Name or Direction" attrs="{'invisible':['|',('type', '!=', 'delivery')], 'required': [('type', '=', 'delivery')]}" />
                     <field name="x_name1"
                            placeholder="First Name"