[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:
parent
19f934e81e
commit
f9bc6be1ac
|
@ -348,7 +348,7 @@
|
|||
<h1><field name="name" class="oe_inline"/></h1>
|
||||
</div>
|
||||
<group>
|
||||
<group name="left">
|
||||
<group name="job_data">
|
||||
<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="expected_employees" groups="base.group_user"/>
|
||||
|
|
|
@ -316,7 +316,7 @@
|
|||
attrs="{'invisible':[('survey_id','=',False)]}"/>
|
||||
</div>
|
||||
</field>
|
||||
<xpath expr="//group[@name='left']" position="after">
|
||||
<xpath expr="//group[@name='job_data']" position="after">
|
||||
<group name="group_alias"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<label for="alias_name" string="Email Alias"/>
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
<field name="alias_model_id"/>
|
||||
<field name="alias_user_id"/>
|
||||
<field name="alias_defaults"/>
|
||||
<field name="alias_contact"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -50,6 +51,9 @@
|
|||
<search string="Search Alias">
|
||||
<field name="alias_name"/>
|
||||
<field name="alias_model_id"/>
|
||||
<field name="alias_force_thread_id"/>
|
||||
<field name="alias_parent_model_id"/>
|
||||
<field name="alias_parent_thread_id"/>
|
||||
<separator/>
|
||||
<filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
|
|
@ -27,22 +27,31 @@
|
|||
<field name="notification_email_send"/>
|
||||
</field>
|
||||
<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"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<!-- <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/> -->
|
||||
<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>
|
||||
<!-- <field name="alias_contact" string="Accept Emails From"/> -->
|
||||
</div>
|
||||
<field name="alias_contact" string="Accept Emails From"/>
|
||||
</field>
|
||||
<group string="Email preferences" position="after">
|
||||
<group name="misc" string="Miscellaneous"
|
||||
groups="base.group_no_one">
|
||||
<field name="display_groups_suggestions"/>
|
||||
</group>
|
||||
</group>
|
||||
<field name="signature" position="before">
|
||||
<label for="alias_id" string="Messaging Alias" class="oe_read_only"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||
<field name="alias_id" class="oe_read_only" required="0" nolabel="1"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||
<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>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -36,9 +36,7 @@ This module adds project menu and features (tasks) to your portal if project and
|
|||
'security/ir.model.access.csv',
|
||||
'portal_project_view.xml',
|
||||
],
|
||||
'demo': [
|
||||
'project_demo.xml',
|
||||
],
|
||||
'demo': [],
|
||||
'installable': True,
|
||||
'auto_install': True,
|
||||
'category': 'Hidden',
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<!-- <data noupdate="1"> -->
|
||||
<data>
|
||||
|
||||
</data>
|
||||
</openerp>
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<!-- <data noupdate="1"> -->
|
||||
<data>
|
||||
<data noupdate="1">
|
||||
|
||||
<!-- Users -->
|
||||
<record id="base.user_demo" model="res.users">
|
||||
|
|
Loading…
Reference in New Issue