odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] deom and some user values 

bzr revid: jam@tinyerp.com-20120626124952-dj2t0vasmfhsp9go
This commit is contained in:
Jigar Amin - OpenERP 2012-06-26 18:19:52 +05:30
parent ed885f2e01
commit e6ce5efbbd
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/__openerp__.py
View File

@ -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,

2
addons/mail/mail_alias.py
View File

@ -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:

2
addons/mail/user_mail_alias_demo.xml
View File

@ -14,4 +14,4 @@
</record>
</data>
</openerp>
</openerp>

5
addons/project/project_demo.xml
View File

@ -66,6 +66,7 @@
ref('base.user_vad')])]" name="members"/>
<field name="user_id" ref="base.user_al"/>
<field name="name">Integrate a Sale and Warehouse Management.</field>
<field name="alias_model">model_project_task</field>
</record>
<!-- Tasks -->
@ -291,6 +292,7 @@
<field name="parent_id" ref="all_projects_account"/>
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
<field name="alias_model">model_project_task</field>
</record>
<record id="project_project_21" model="project.project">
<field name="warn_manager">1</field>
@ -300,6 +302,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development')])]" name="type_ids"/>
<field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
<field name="alias_model">model_project_task</field>
</record>
<record id="project_project_22" model="project.project">
<field name="priority">20</field>
@ -308,6 +311,7 @@
<field name="user_id" ref="base.user_root"/>
<field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
<field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
<field name="alias_model">model_project_task</field>
</record>
<record id="project_project_23" model="project.project">
<field name="priority">30</field>
@ -315,6 +319,7 @@
<field name="name">Install, data import, configuration</field>
<field eval="[(6, 0, [ref('project_tt_development')])]" name="type_ids"/>
<field eval="[(6, 0, [ref('base.user_root'),ref('base.user_demo')])]" name="members"/>
<field name="alias_model">model_project_task</field>
</record>
<!-- Tasks -->