From 36ffa5bc691cd44c32d5c5fc877c6b810c561fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 13 Aug 2015 12:30:23 +0200
Subject: [PATCH] [IMP] res_partner_title: simplify model

Titles are now just for contacts (people), not for companies
anymore. For that purpose directly adding the suffix (Ltd, ...)
in the name is sufficient.

The domain field is therefore removed.

Updated data, demo, views, code and res.partner model accordingly.
---
 addons/crm/crm_lead_view.xml                  |  4 +-
 addons/crm_partner_assign/crm_portal_view.xml |  2 +-
 addons/l10n_cr/l10n_cr_base_data.xml          | 44 -------------------
 addons/l10n_do/data/l10n_do_base_data.xml     |  6 ---
 openerp/addons/base/res/res_partner.py        |  9 +---
 openerp/addons/base/res/res_partner_data.xml  | 18 --------
 openerp/addons/base/res/res_partner_view.xml  | 30 ++-----------
 openerp/addons/base/tests/test_base.py        |  4 +-
 8 files changed, 10 insertions(+), 107 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e61b4478383..d5ab3c8afa9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -158,7 +158,7 @@
                             <label for="contact_name"/>
                             <div class="o_row">
                                 <field name="contact_name"/>
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}'/>
+                                <field name="title" placeholder="Title" domain="[]" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function"/>
@@ -548,7 +548,7 @@
                                     <label for="contact_name"/>
                                     <div>
                                         <field name="contact_name"/>
-                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}'/>
+                                        <field name="title" placeholder="Title" domain="[]" options='{"no_open": True}'/>
                                     </div>
                                     <field name="function"/>
                                     <field name="mobile"/>
diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index 362b2023752..0614286aaa9 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -117,7 +117,7 @@
                             string="Customer"
                             colspan="2" readonly="1"/>
                           <field name="partner_name" string="Customer Name" readonly="1"/>
-                          <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
+                          <field domain="[]" name="title" widget="selection" readonly="1"/>
                           <field name="function" readonly="1"/>
                           <field name="street" readonly="1"/>
                           <field name="street2" readonly="1"/>
diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml
index 0a9573c19f2..22884e3c7f0 100644
--- a/addons/l10n_cr/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/l10n_cr_base_data.xml
@@ -44,85 +44,41 @@
         Resource: res.partner.title
         Update partner titles
         -->
-        <record id="base.res_partner_title_pvt_ltd" model="res.partner.title">
-            <field name="name">Corporation</field>
-            <field name="shortcut">Corp.</field>
-            <field name="domain">partner</field>
-        </record>
-        <record id="base.res_partner_title_ltd" model="res.partner.title">
-            <field name="name">Limited Company</field>
-            <field name="shortcut">Ltd.</field>
-            <field name="domain">partner</field>
-        </record>
         <record id="base.res_partner_title_miss" model="res.partner.title">
             <field name="name">Miss</field>
             <field name="shortcut">Mss.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_madam" model="res.partner.title">
             <field name="name">Madam</field>
             <field name="shortcut">Ms.</field>
-            <field name="domain">contact</field>
-        </record>
-        <record id="res_partner_title_sal" model="res.partner.title">
-            <field name="name">Sociedad An&#243;nima Laboral</field>
-            <field name="shortcut">S.A.L.</field>
-            <field name="domain">partner</field>
-        </record>
-        <record id="res_partner_title_asoc" model="res.partner.title">
-            <field name="name">Asociation</field>
-            <field name="shortcut">Asoc.</field>
-            <field name="domain">partner</field>
-        </record>
-        <record id="res_partner_title_gov" model="res.partner.title">
-            <field name="name">Government</field>
-            <field name="shortcut">Gov.</field>
-            <field name="domain">partner</field>
-        </record>
-        <record id="res_partner_title_edu" model="res.partner.title">
-            <field name="name">Educational Institution</field>
-            <field name="shortcut">Edu.</field>
-            <field name="domain">partner</field>
         </record>
         <record id="base.res_partner_title_prof" model="res.partner.title">
             <field name="name">Professor</field>
             <field name="shortcut">Prof.</field>
-            <field name="domain">contact</field>
-        </record>
-        <record id="res_partner_title_indprof" model="res.partner.title">
-            <field name="name">Independant Professional</field>
-            <field name="shortcut">Ind. Prof.</field>
-            <field name="domain">partner</field>
         </record>
         <record id="base.res_partner_title_dra" model="res.partner.title">
             <field name="name">Doctora</field>
             <field name="shortcut">Dra.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_msc" model="res.partner.title">
             <field name="name">Msc.</field>
             <field name="shortcut">Msc.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_mba" model="res.partner.title">
             <field name="name">MBA</field>
             <field name="shortcut">MBA</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_lic" model="res.partner.title">
             <field name="name">Licenciado</field>
             <field name="shortcut">Lic.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_licda" model="res.partner.title">
             <field name="name">Licenciada</field>
             <field name="shortcut">Licda.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_ing" model="res.partner.title">
             <field name="name">Ingeniero/a</field>
             <field name="shortcut">Ing.</field>
-            <field name="domain">contact</field>
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_do/data/l10n_do_base_data.xml b/addons/l10n_do/data/l10n_do_base_data.xml
index b00bfa5c9e2..80364b1a209 100644
--- a/addons/l10n_do/data/l10n_do_base_data.xml
+++ b/addons/l10n_do/data/l10n_do_base_data.xml
@@ -173,32 +173,26 @@
         <record id="base.res_partner_title_dra" model="res.partner.title">
             <field name="name">Doctora</field>
             <field name="shortcut">Dra.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_msc" model="res.partner.title">
             <field name="name">Msc.</field>
             <field name="shortcut">Msc.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_mba" model="res.partner.title">
             <field name="name">MBA</field>
             <field name="shortcut">MBA</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_lic" model="res.partner.title">
             <field name="name">Licenciado</field>
             <field name="shortcut">Lic.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_licda" model="res.partner.title">
             <field name="name">Licenciada</field>
             <field name="shortcut">Licda.</field>
-            <field name="domain">contact</field>
         </record>
         <record id="base.res_partner_title_ing" model="res.partner.title">
             <field name="name">Ingeniero/a</field>
             <field name="shortcut">Ing.</field>
-            <field name="domain">contact</field>
         </record>
 
     </data>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6aa950d559f..6551eb3db30 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -137,10 +137,6 @@ class res_partner_title(osv.osv):
     _columns = {
         'name': fields.char('Title', required=True, translate=True),
         'shortcut': fields.char('Abbreviation', translate=True),
-        'domain': fields.selection([('partner', 'Partner'), ('contact', 'Contact')], 'Domain', required=True)
-    }
-    _defaults = {
-        'domain': 'contact',
     }
 
 
@@ -343,10 +339,7 @@ class res_partner(osv.Model, format_address):
         value = {'title': False}
         if is_company:
             value['use_parent_address'] = False
-            domain = {'title': [('domain', '=', 'partner')]}
-        else:
-            domain = {'title': [('domain', '=', 'contact')]}
-        return {'value': value, 'domain': domain}
+        return {'value': value}
 
     def onchange_address(self, cr, uid, ids, use_parent_address, parent_id, context=None):
         def value_or_id(val):
diff --git a/openerp/addons/base/res/res_partner_data.xml b/openerp/addons/base/res/res_partner_data.xml
index 6c640197577..841a66d316d 100644
--- a/openerp/addons/base/res/res_partner_data.xml
+++ b/openerp/addons/base/res/res_partner_data.xml
@@ -5,45 +5,27 @@
         <!--
         Resource: res.partner.title
         -->
-        <record id="res_partner_title_pvt_ltd" model="res.partner.title">
-            <field name="domain">partner</field>
-            <field name="name">Corp.</field>
-            <field name="shortcut">Corp.</field>
-        </record>
-
-        <record id="res_partner_title_ltd" model="res.partner.title">
-            <field name="domain">partner</field>
-            <field name="name">Ltd</field>
-            <field name="shortcut">ltd</field>
-        </record>
-
         <record id="res_partner_title_madam" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Madam</field>
             <field name="shortcut">Mrs.</field>
         </record>
         <record id="res_partner_title_miss" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Miss</field>
             <field name="shortcut">Miss</field>
         </record>
         <record id="res_partner_title_sir" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Sir</field>
             <field name="shortcut">Sr.</field>
         </record>
         <record id="res_partner_title_mister" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Mister</field>
             <field name="shortcut">Mr.</field>
         </record>
         <record id="res_partner_title_doctor" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Doctor</field>
             <field name="shortcut">Dr.</field>
         </record>
         <record id="res_partner_title_prof" model="res.partner.title">
-            <field name="domain">contact</field>
             <field name="name">Professor</field>
             <field name="shortcut">Prof.</field>
         </record>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 3ae8c2903ab..209d389189b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -37,35 +37,13 @@
             </field>
         </record>
 
-        <!--
-        <record id="action_partner_title" model="ir.actions.act_window">
-            <field name="name">Titles</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner.title</field>
-            <field name="view_type">form</field>
-        </record>
-        <menuitem action="action_partner_title" id="menu_partner_title" parent="base.menu_base_config"/>
-        -->
-
-        <record id="action_partner_title_partner" model="ir.actions.act_window">
-            <field name="name">Company Titles</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner.title</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('domain','=','partner')]</field>
-            <field name="context">{'default_domain': 'partner'}</field>
-            <field name="help">Manage the partner titles you want to have available in your system. The partner titles is the legal status of the company: Private Limited, SA, etc.</field>
-        </record>
-
-        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" parent="menu_config_address_book" sequence="2" groups="base.group_no_one"/>
-
         <record id="action_partner_title_contact" model="ir.actions.act_window">
             <field name="name">Contact Titles</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.title</field>
             <field name="view_type">form</field>
-            <field name="domain">[('domain','=','contact')]</field>
-            <field name="context">{'default_domain': 'contact'}</field>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
             <field name="help">Manage the contact titles you want to have available in your system and the way you want to print them in letters and other documents. Some example: Mr., Mrs. </field>
         </record>
 
@@ -99,7 +77,7 @@
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/> (
-                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
+                            <field name="is_company" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
                         </div>
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
@@ -133,7 +111,7 @@
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/>
-                            <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/><label for="is_company" string="Is a Company?"/>
+                            <field name="is_company" class="oe_inline"/><label for="is_company" string="Is a Company?"/>
                         </div>
                         <h1>
                             <field name="name" default_focus="1" placeholder="Name" />
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 47923ead732..7439631765d 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -293,8 +293,8 @@ class test_base(common.TransactionCase):
 
     def test_60_read_group(self):
         cr, uid = self.cr, self.uid
-        title_sir = self.res_partner_title.create(cr, uid, {'name': 'Sir', 'domain': 'contact'})
-        title_lady = self.res_partner_title.create(cr, uid, {'name': 'Lady', 'domain': 'contact'})
+        title_sir = self.res_partner_title.create(cr, uid, {'name': 'Sir'})
+        title_lady = self.res_partner_title.create(cr, uid, {'name': 'Lady'})
         test_users = [
             {'name': 'Alice', 'login': 'alice', 'color': 1, 'function': 'Friend', 'date': '2015-03-28', 'title': title_lady},
             {'name': 'Alice', 'login': 'alice2', 'color': 0, 'function': 'Friend',  'date': '2015-01-28', 'title': title_lady},