From 494acb39555fff2f18a3ff4669a41b68ab97c258 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 29 Jun 2012 14:16:21 +0530 Subject: [PATCH] [FIX] remove domain do nto store the domian bzr revid: jam@tinyerp.com-20120629084621-bkt7d22ajtyqkb3g --- addons/crm/crm_data.xml | 2 +- addons/crm/crm_demo.xml | 2 +- addons/hr_recruitment/hr_recruitment_data.xml | 2 +- addons/hr_recruitment/hr_recruitment_demo.yml | 16 ++++++++-------- addons/mail/mail_alias.py | 23 ++--------------------- addons/mail/mail_data.xml | 2 +- addons/mail/res_users.py | 4 +--- addons/mail/user_mail_alias_demo.xml | 2 +- 8 files changed, 16 insertions(+), 37 deletions(-) diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index f4d4d8b..9192b52 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -14,7 +14,7 @@ email - sales@openerp.my.openerp.com + sales {'type':'lead'} diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml index 1e5d837..a5d6953 100644 --- a/addons/crm/crm_demo.xml +++ b/addons/crm/crm_demo.xml @@ -13,7 +13,7 @@ - info@openerp.my.openerp.com + info {'type':'lead'} diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml index edb769c..aed3fe1 100644 --- a/addons/hr_recruitment/hr_recruitment_data.xml +++ b/addons/hr_recruitment/hr_recruitment_data.xml @@ -451,7 +451,7 @@ - Jobs@openerp.my.openerp.com + Jobs {} diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml index fd59c77..c616e9e 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.yml +++ b/addons/hr_recruitment/hr_recruitment_demo.yml @@ -1,6 +1,6 @@ - !record {model: mail.alias, id: alias_job_devloper, view: False}: - alias_name: 'developer@openerp.my.openerp.com' + alias_name: 'job-developer' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -12,7 +12,7 @@ alias_id: alias_job_devloper - !record {model: mail.alias, id: alias_job_ceo, view: False}: - alias_name: 'ceo@openerp.my.openerp.com' + alias_name: 'job-ceo' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -24,7 +24,7 @@ alias_id: alias_job_ceo - !record {model: mail.alias, id: alias_job_cto, view: False}: - alias_name: 'cto@openerp.my.openerp.com' + alias_name: 'job-cto' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -36,7 +36,7 @@ alias_id: alias_job_cto - !record {model: mail.alias, id: alias_job_hr_manager, view: False}: - alias_name: 'hr-manager@openerp.my.openerp.com' + alias_name: 'job-hr-manager' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -48,7 +48,7 @@ alias_id: alias_job_hr_manager - !record {model: mail.alias, id: alias_job_consultant, view: False}: - alias_name: 'consultant@openerp.my.openerp.com' + alias_name: 'job-consultant' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -60,7 +60,7 @@ alias_id: alias_job_consultant - !record {model: mail.alias, id: alias_job_hrm, view: False}: - alias_name: 'hrm@openerp.my.openerp.com' + alias_name: 'job-hrm' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -72,7 +72,7 @@ alias_id: alias_job_hrm - !record {model: mail.alias, id: alias_job_marketing, view: False}: - alias_name: 'marketing@openerp.my.openerp.com' + alias_name: 'job-marketing' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' @@ -84,7 +84,7 @@ alias_id: alias_job_marketing - !record {model: mail.alias, id: alias_job_trainee, view: False}: - alias_name: 'trainee@openerp.my.openerp.com' + alias_name: 'job-trainees' alias_model_id: model_hr_applicant alias_user_id: base.user_root alias_defaults: '{}' diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index bd2425d..a7bc82e 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -74,10 +74,8 @@ class mail_alias(osv.Model): ] def create_unique_alias(self, cr, uid, values, sequence=1 ,context=None): - config_parameter_pool = self.pool.get("ir.config_parameter") - domain = config_parameter_pool.get_param(cr, uid, "mail.catchall.domain", context=context) if sequence: - prob_alias = "%s%s@%s"%(values['alias_name'], sequence, domain) + prob_alias = "%s%s"%(values['alias_name'], sequence) search_alias = self.search(cr, uid, [('alias_name', '=', prob_alias)]) if search_alias: values = self.create_unique_alias(cr, uid, values, sequence+1, context) @@ -85,22 +83,5 @@ class mail_alias(osv.Model): values.update({'alias_name': prob_alias}) return values else: - return values.update({'alias_name': "%s@%s"%(values['alias_name'],domain)}) - - def write(self, cr, uid, ids, vals, context=None): - config_parameter_pool = self.pool.get("ir.config_parameter") - #TODO: Do we need to check specail charactor like email address parsing - # Like allowing . and _ only. - if 'alias_name' in vals.keys(): - domain = config_parameter_pool.get_param(cr, uid, "mail.catchall.domain", context=context) - #check the new alias, If only alias then concat the domain - #if we have alias_name with random domain we will concat our domain. - if vals.get('alias_name').count("@") == 0: - vals.update({'alias_name': "%s@%s"%(vals.get('alias_name'), domain)}) - elif vals.get('alias_name').count("@") == 1: - name = "%s@%s"%(vals.get('alias_name').split("@")[0], domain) - vals.update({'alias_name': name}) - else: - raise osv.except_osv(_("Warning !"), _("Invalid mail alias name.\n It should be e.g. 'alias@mail.domain.com' or only alias name 'alias'.")) - return super(mail_alias, self).write(cr, uid, ids, vals, context=context) + return values.update({'alias_name': "%s"%(values['alias_name'])}) diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml index 38e3b6a..2448b89 100644 --- a/addons/mail/mail_data.xml +++ b/addons/mail/mail_data.xml @@ -14,7 +14,7 @@ - admin@openerp.my.openerp.com + admin diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 100f73e..a4f560e 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -94,9 +94,7 @@ class res_users(osv.osv): # if login of user have been changed then change alias of user also. if 'login' in vals.keys(): for user in self.browse(cr, uid, ids, context=context): - domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context) - name = "%s@%s"%(vals['login'], domain) - self.pool.get('mail.alias').write(cr, uid, [user.alias_id.id], {'alias_name': name}, context=context) + self.pool.get('mail.alias').write(cr, uid, [user.alias_id.id], {'alias_name': vals['login']}, context=context) return super(res_users, self).write(cr, uid, ids, vals, context=context) diff --git a/addons/mail/user_mail_alias_demo.xml b/addons/mail/user_mail_alias_demo.xml index 30e8a76..eea7d52 100644 --- a/addons/mail/user_mail_alias_demo.xml +++ b/addons/mail/user_mail_alias_demo.xml @@ -2,7 +2,7 @@ - demo@openerp.my.openerp.com + demo -- 1.7.10.4