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

[CLEAN] Before merging: removed an added file not used; cleaned some debugging data; improved user form view to better separate email/login and messaging alias. 

bzr revid: tde@openerp.com-20130621110344-zx2kxan47uctctka
This commit is contained in:
Thibault Delavallée 2013-06-21 13:03:44 +02:00
parent 19f934e81e
commit f9bc6be1ac
7 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/hr_view.xml
View File

@ -348,7 +348,7 @@
<h1><field name="name" class="oe_inline"/></h1> <h1><field name="name" class="oe_inline"/></h1>
</div> </div>
<group> <group>
<group name="left"> <group name="job_data">
<field name="no_of_employee" groups="base.group_user"/> <field name="no_of_employee" groups="base.group_user"/>
<field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/> <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
<field name="expected_employees" groups="base.group_user"/> <field name="expected_employees" groups="base.group_user"/>

2
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -316,7 +316,7 @@
attrs="{'invisible':[('survey_id','=',False)]}"/> attrs="{'invisible':[('survey_id','=',False)]}"/>
</div> </div>
</field> </field>
<xpath expr="//group[@name='left']" position="after"> <xpath expr="//group[@name='job_data']" position="after">
<group name="group_alias" <group name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}"> attrs="{'invisible': [('alias_domain', '=', False)]}">
<label for="alias_name" string="Email Alias"/> <label for="alias_name" string="Email Alias"/>

4
addons/mail/mail_alias_view.xml
View File

@ -38,6 +38,7 @@
<field name="alias_model_id"/> <field name="alias_model_id"/>
<field name="alias_user_id"/> <field name="alias_user_id"/>
<field name="alias_defaults"/> <field name="alias_defaults"/>
<field name="alias_contact"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -50,6 +51,9 @@
<search string="Search Alias"> <search string="Search Alias">
<field name="alias_name"/> <field name="alias_name"/>
<field name="alias_model_id"/> <field name="alias_model_id"/>
<field name="alias_force_thread_id"/>
<field name="alias_parent_model_id"/>
<field name="alias_parent_thread_id"/>
<separator/> <separator/>
<filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/> <filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">

31
addons/mail/res_users_view.xml
View File

@ -27,22 +27,31 @@
<field name="notification_email_send"/> <field name="notification_email_send"/>
</field> </field>
<field name="email" position="after"> <field name="email" position="after">
<label for="alias_id" string="Alias"/> <!-- <label for="alias_id" string="Alias" -->
<!-- attrs="{'invisible': [('alias_domain', '=', False)]}"/> -->
<div name="group_alias" <div name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}"> attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> <!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> -->
<div name="edit_alias" class="oe_edit_only"> <div name="edit_alias" class="oe_edit_only">
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> <!-- <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/> -->
</div> </div>
<!-- <field name="alias_contact" string="Accept Emails From"/> -->
</div> </div>
<field name="alias_contact" string="Accept Emails From"/>
</field> </field>
<group string="Email preferences" position="after"> <field name="signature" position="before">
<group name="misc" string="Miscellaneous" <label for="alias_id" string="Messaging Alias" class="oe_read_only"
groups="base.group_no_one"> attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<field name="display_groups_suggestions"/> <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
</group> attrs="{'invisible': [('alias_domain', '=', False)]}"/>
</group> <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
</div>
<field name="alias_contact" string="Alias Accepts Emails From"
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<field name="display_groups_suggestions" groups="base.group_no_one"/>
</field>
</data> </data>
</field> </field>
</record> </record>

4
addons/portal_project/__openerp__.py
View File

@ -36,9 +36,7 @@ This module adds project menu and features (tasks) to your portal if project and
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'portal_project_view.xml', 'portal_project_view.xml',
], ],
'demo': [ 'demo': [],
'project_demo.xml',
],
'installable': True, 'installable': True,
'auto_install': True, 'auto_install': True,
'category': 'Hidden', 'category': 'Hidden',

7
addons/portal_project/project_demo.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<!-- <data noupdate="1"> -->
<data>
</data>
</openerp>

3
addons/project/project_demo.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<!-- <data noupdate="1"> --> <data noupdate="1">
<data>
<!-- Users --> <!-- Users -->
<record id="base.user_demo" model="res.users"> <record id="base.user_demo" model="res.users">