From a3de5c872f7c26ec085dc62b95cfc62382ab970a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 9 Apr 2013 13:11:58 +0200 Subject: [REF] [IMP] mail_alias improvement alias_name is not required anymore crm, hr_job, project, mail_group, res_users: alias creation is now different and done more like other inherits, except an alias_model_name that is given to the context to find the alias alias_model_id. crm, jr_job, project, mail_group, res_users: updated form views using aliases mail_alias: added a filter on 'inactive' aliases (alias_name False) and added a button to redirect to the related document if any bzr revid: tde@openerp.com-20130409111158-bv04n5o01z9l3c17 --- addons/crm/crm.py | 18 +++++++----------- addons/crm/crm_case_section_view.xml | 16 ++++++++-------- 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'addons/crm') diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 7b6fe02afa8..2b8004e3923 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -175,17 +175,13 @@ class crm_case_section(osv.osv): return res def create(self, cr, uid, vals, context=None): - mail_alias = self.pool.get('mail.alias') - if not vals.get('alias_id'): - alias_name = vals.pop('alias_name', None) or vals.get('name') # prevent errors during copy() - alias_id = mail_alias.create_unique_alias(cr, uid, - {'alias_name': alias_name}, - model_name="crm.lead", - context=context) - vals['alias_id'] = alias_id - res = super(crm_case_section, self).create(cr, uid, vals, context) - mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type': 'lead'}}, context) - return res + if context is None: + context = {} + create_context = dict(context, alias_model_name=self._name) + section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context) + section = self.browse(cr, uid, section_id, context=context) + self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context) + return section_id def unlink(self, cr, uid, ids, context=None): # Cascade-delete mail aliases as well, as they should not exist without the sales team. diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml index c788872b47e..35b868f0518 100644 --- a/addons/crm/crm_case_section_view.xml +++ b/addons/crm/crm_case_section_view.xml @@ -94,8 +94,8 @@

-
- %% +
+ %%
@@ -155,13 +155,13 @@
-
-- cgit v1.2.3 From a91274c18c4a30c8191b8af72636dd2ad6d9b345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 16 Apr 2013 16:29:01 +0200 Subject: [IMP] project, mail_group, hr_job, sales team: added alias_contact parameter in form view. Also fixed a typo in project form view about visilibity -> privacy_visibility. bzr revid: tde@openerp.com-20130416142901-c6wbc82yp2kwj1dt --- addons/crm/crm_case_section_view.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/crm') diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml index 35b868f0518..7c88a6889df 100644 --- a/addons/crm/crm_case_section_view.xml +++ b/addons/crm/crm_case_section_view.xml @@ -163,6 +163,8 @@ %% @ + V +