[IMP] project, hr, crm: improved form views about email aliases... another iteration of improvement.
bzr revid: tde@openerp.com-20130510102147-fq98n6qf88a45ti0
This commit is contained in:
Thibault Delavallée
parent
0dd63979dd
commit
6d06f75efc
|
|
@ -153,19 +153,6 @@
|
|||
<h1>
|
||||
<field name="name" string="Project Name"/>
|
||||
</h1>
|
||||
<div name="group_alias"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<span name="read_alias" class="oe_read_only" attrs="{'invisible': [('alias_name', '=', False)]}">
|
||||
<span class="oe_e oe_e_alias">%%</span>
|
||||
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
|
||||
</span>
|
||||
<span name="edit_alias" class="oe_edit_only">
|
||||
<span class="oe_e oe_e_alias">%%</span>
|
||||
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
</span>
|
||||
<span class="oe_e oe_e_alias">V</span>
|
||||
<field name="alias_contact" class="oe_inline"/>
|
||||
</div>
|
||||
<div name="options_active">
|
||||
<field name="use_leads" class="oe_inline"/><label for="use_leads"/>
|
||||
</div>
|
||||
|
|
@ -177,6 +164,19 @@
|
|||
<field name="active"/>
|
||||
</group>
|
||||
<group>
|
||||
<label for="alias_name" string="Email Alias"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||
<div name="alias_def"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<field name="alias_id" class="oe_read_only oe_inline"
|
||||
string="Email Alias" required="0"/>
|
||||
<div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
|
||||
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
</div>
|
||||
</div>
|
||||
<field name="alias_contact" class="oe_inline"
|
||||
string="Accept Emails From"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||
<field name="user_id"/>
|
||||
<field name="code"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -334,12 +334,10 @@
|
|||
<h1><field name="name" class="oe_inline"/></h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<group name="left">
|
||||
<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"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
<field name="department_id"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -312,8 +312,8 @@
|
|||
attrs="{'invisible':[('survey_id','=',False)]}"/>
|
||||
</div>
|
||||
</field>
|
||||
<xpath expr="//div[@class='oe_title']//h1" position="after">
|
||||
<group colspan="2" name="group_alias"
|
||||
<xpath expr="//group[@name='left']" position="after">
|
||||
<group name="group_alias"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<label for="alias_name" string="Email Alias"/>
|
||||
<div name="alias_def">
|
||||
|
|
@ -322,7 +322,7 @@
|
|||
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
</div>
|
||||
</div>
|
||||
<field name="alias_contact" class="oe_inline"/>
|
||||
<field name="alias_contact" class="oe_inline" string="Accept Emails From"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
</div>
|
||||
</div>
|
||||
<field name="alias_contact"/>
|
||||
<field name="alias_contact" string="Accept Emails From"/>
|
||||
</field>
|
||||
</data>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -99,26 +99,32 @@
|
|||
<button name="attachment_tree_view" string="Documents" type="object"/>
|
||||
</div>
|
||||
<group>
|
||||
<group colspan="2" name="group_alias"
|
||||
<group>
|
||||
<field name="user_id" string="Project Manager"
|
||||
attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"
|
||||
context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||
<span></span>
|
||||
<p attrs="{'invisible': [('analytic_account_id','=',False)]}">
|
||||
To invoice or setup invoicing and renewal options, go to the related contract:
|
||||
<field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
|
||||
</p>
|
||||
</group>
|
||||
<group name="group_alias"
|
||||
attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<field name="privacy_visibility" widget="radio"/>
|
||||
<label for="alias_name" string="Email Alias"/>
|
||||
<div name="alias_def">
|
||||
<field name="alias_id" class="oe_read_only oe_inline" string="Email Alias"/>
|
||||
<field name="alias_id" class="oe_read_only oe_inline"
|
||||
string="Email Alias" required="0"/>
|
||||
<div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
|
||||
<field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
</div>
|
||||
</div>
|
||||
<label for="alias_model" string="Incoming Emails create"/>
|
||||
<field name="alias_model" class="oe_inline" nolabel="1"/>
|
||||
<field name="alias_contact" class="oe_inline"
|
||||
attrs="{'invisible': [('alias_name', '=', False)]}"/>
|
||||
string="Accept Emails From"/>
|
||||
</group>
|
||||
<field name="user_id" string="Project Manager"
|
||||
attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"
|
||||
context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||
<p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
|
||||
To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
|
||||
</p>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Team" name="team">
|
||||
|
|
@ -141,20 +147,22 @@
|
|||
</field>
|
||||
</page>
|
||||
<page string="Other Info">
|
||||
<group>
|
||||
<group string="Administration" groups="project.group_time_work_estimation_tasks">
|
||||
<field name="planned_hours" widget="float_time"/>
|
||||
<field name="effective_hours" widget="float_time"/>
|
||||
<field name="resource_calendar_id"/>
|
||||
</group>
|
||||
<group string="Miscellaneous" name="misc">
|
||||
<field name="date_start"/>
|
||||
<field name="date" string="End Date"/>
|
||||
<field name="priority" groups="base.group_no_one"/>
|
||||
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
|
||||
<field name="currency_id" groups="base.group_multi_currency" required="1"/>
|
||||
<field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
|
||||
</group>
|
||||
<group string="Administration">
|
||||
<field name="privacy_visibility" widget="radio"/>
|
||||
<field name="planned_hours" widget="float_time"
|
||||
groups="project.group_time_work_estimation_tasks"/>
|
||||
<field name="effective_hours" widget="float_time"
|
||||
groups="project.group_time_work_estimation_tasks"/>
|
||||
<field name="resource_calendar_id"
|
||||
groups="project.group_time_work_estimation_tasks"/>
|
||||
</group>
|
||||
<group string="Miscellaneous" name="misc">
|
||||
<field name="date_start"/>
|
||||
<field name="date" string="End Date"/>
|
||||
<field name="priority" groups="base.group_no_one"/>
|
||||
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
|
||||
<field name="currency_id" groups="base.group_multi_currency" required="1"/>
|
||||
<field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
|
||||
</group>
|
||||
</page>
|
||||
<page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages">
|
||||
|
|
|
|||
|
|
@ -336,12 +336,6 @@
|
|||
<field name="priority" position="before">
|
||||
<field name="project_escalation_id"/>
|
||||
</field>
|
||||
<xpath expr='//div[@name="edit_alias"]' position='after'>
|
||||
<label for="alias_model" string="creates" style="vertical-align: middle;"
|
||||
attrs="{'invisible': [('alias_name', '=', False)]}"/>
|
||||
<field name="alias_model" class="oe_inline"
|
||||
attrs="{'invisible': [('alias_name', '=', False)]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue