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 @@
-
+
@@ -548,7 +548,7 @@
-
+
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"/>
-
+
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
-->
-
- Corporation
- Corp.
- partner
-
-
- Limited Company
- Ltd.
- partner
-
Miss
Mss.
- contact
Madam
Ms.
- contact
-
-
- Sociedad Anónima Laboral
- S.A.L.
- partner
-
-
- Asociation
- Asoc.
- partner
-
-
- Government
- Gov.
- partner
-
-
- Educational Institution
- Edu.
- partner
Professor
Prof.
- contact
-
-
- Independant Professional
- Ind. Prof.
- partner
Doctora
Dra.
- contact
Msc.
Msc.
- contact
MBA
MBA
- contact
Licenciado
Lic.
- contact
Licenciada
Licda.
- contact
Ingeniero/a
Ing.
- contact
\ 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 @@
Doctora
Dra.
- contact
Msc.
Msc.
- contact
MBA
MBA
- contact
Licenciado
Lic.
- contact
Licenciada
Licda.
- contact
Ingeniero/a
Ing.
- contact
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 @@
-
- partner
- Corp.
- Corp.
-
-
-
- partner
- Ltd
- ltd
-
-
- contact
Madam
Mrs.
- contact
Miss
Miss
- contact
Sir
Sr.
- contact
Mister
Mr.
- contact
Doctor
Dr.
- contact
Professor
Prof.
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 @@
-
-
-
- Company Titles
- ir.actions.act_window
- res.partner.title
- form
- [('domain','=','partner')]
- {'default_domain': 'partner'}
- 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.
-
-
-
-
Contact Titles
ir.actions.act_window
res.partner.title
form
- [('domain','=','contact')]
- {'default_domain': 'contact'}
+ []
+ {}
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.
@@ -99,7 +77,7 @@
(
- )
+ )
@@ -133,7 +111,7 @@
-
+
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},