diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-10-01 14:47:30 +0530 |
| commit | d2b51d4e149e8542f77fd2a171d0a4498352be2d (patch) | |
| tree | 0e10ae6b0e694692df4260a65f2b7ac88c9573ca /addons/project/project_view.xml | |
| parent | 826e2b8fdbb267efab4feff67e373e0e0c1c1568 (diff) | |
| parent | 3686a01df372b01dcec9a5438ba9b16256895c5e (diff) | |
[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121001091730-q6sbcvj7nu53t91h
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 4ce02f5a437..e302199a65c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -92,12 +92,12 @@ </div> <group> <group> + <field name="privacy_visibility"/> <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/> - <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/> </group> <group> - <field name="privacy_visibility"/> - <field name="analytic_account_id" readonly="1" required="0"/> + <field name="partner_id" on_change="onchange_partner_id(partner_id)"/> + <field name="analytic_account_id" readonly="1" required="0" attrs="{'invisible': [('analytic_account_id','=',False)]}"/> </group> </group> <notebook> @@ -121,14 +121,14 @@ </field> </page> <page string="Other Info"> - <group string="Email Interface" colspan="2"> - <div attrs="{'invisible': [('alias_domain', '=', False)]}"> - <field name="alias_id" invisible="1" required="0"/> - <label for="alias_name" class="oe_edit_only "/> - <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/> - </div> - </group> <group> + <group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}"> + <div> + <field name="alias_id" invisible="1" required="0"/> + <label for="alias_name" class="oe_edit_only "/> + <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/> + </div> + </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"/> @@ -136,8 +136,7 @@ </group> <group string="Miscellaneous" name="misc"> <field name="date"/> - <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> - <field name="priority"/> + <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"/> @@ -151,6 +150,7 @@ </notebook> </sheet> <div class="oe_chatter"> + <field name="message_is_follower" invisible="1"/> <field name="message_ids" widget="mail_thread"/> <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/> </div> @@ -240,7 +240,7 @@ <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a> </div> <div class="oe_kanban_footer_left"> - <span> + <span groups="project.group_time_work_estimation_tasks"> <span class="oe_e">R</span> <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/> </span> @@ -468,6 +468,7 @@ </notebook> </sheet> <div class="oe_chatter"> + <field name="message_is_follower" invisible="1"/> <field name="message_ids" widget="mail_thread"/> <field name="message_follower_ids" widget="mail_followers"/> </div> @@ -519,7 +520,7 @@ <div class="oe_kanban_content"> <div><b><field name="name"/></b></div> <div> - <field name="project_id"/> + <field name="project_id"/><br/> <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/> <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t> <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span> @@ -713,7 +714,7 @@ </record> <record id="ir_project_task_open" model="ir.values"> - <field eval=" 'tree_but_open'" name="key2"/> + <field eval="'tree_but_open'" name="key2"/> <field eval="'project.project'" name="model"/> <field name="name">View project's tasks</field> <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/> @@ -757,7 +758,7 @@ <field name="model">project.task.type</field> <field name="arch" type="xml"> <tree string="Task Stage"> - <field name="sequence"/> + <field name="sequence" widget="handle"/> <field name="name"/> <field name="state"/> </tree> |