diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 7165b61a2be..5c0afc27ec1 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -71,7 +71,7 @@ The main features are: 'mail_alias_view.xml', ], 'demo_xml': [ - 'mail_demo.xml', + 'user_mail_alias_demo.xml', ], 'installable': True, 'auto_install': False, diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index bdb52ba1f7e..e466bbffb47 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -92,10 +92,8 @@ class mail_alias(osv.Model): #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: - print "0" vals.update({'alias_name': "%s@%s"%(vals.get('alias_name'), domain)}) elif vals.get('alias_name').count("@") == 1: - print "1" name = "%s@%s"%(vals.get('alias_name').split("@")[0], domain) vals.update({'alias_name': name}) else: diff --git a/addons/mail/user_mail_alias_demo.xml b/addons/mail/user_mail_alias_demo.xml index 739c4491a37..30e8a76d0ae 100644 --- a/addons/mail/user_mail_alias_demo.xml +++ b/addons/mail/user_mail_alias_demo.xml @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index f685f14c85b..5a276378df1 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -66,6 +66,7 @@ ref('base.user_vad')])]" name="members"/> Integrate a Sale and Warehouse Management. + model_project_task @@ -291,6 +292,7 @@ + model_project_task 1 @@ -300,6 +302,7 @@ + model_project_task 20 @@ -308,6 +311,7 @@ + model_project_task 30 @@ -315,6 +319,7 @@ Install, data import, configuration + model_project_task