diff options
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index cc8edd4084e..b9a8cb1a452 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -31,11 +31,11 @@ </header> <sheet string="Project" layout="auto"> <field name="analytic_account_id" invisible="1" required="0"/> - <label for="name" class="oe_form_readonly_hidden" string="Project Name"/> + <label for="name" class="oe_edit_only" string="Project Name"/> <h1> <field name="name"/> </h1> - <label for="parent_id" class="oe_form_readonly_hidden" string="Parent Project"/> + <label for="parent_id" class="oe_edit_only" string="Parent Project"/> <h2> <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> </h2> @@ -204,12 +204,14 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click"> - <a class="oe_kanban_menuaction oe_i">B</a> - <ul class="oe_kanban_menu"> - <li><a type="edit">Edit...</a></li> - <li><a type="delete">Delete</a></li> - <li><ul class="oe_kanban_colorpicker" data-field="color"/></li> - </ul> + <div class="oe_dropdown_toggle oe_dropdown_kanban"> + <span class="oe_e">i</span> + <ul class="oe_dropdown_menu"> + <li><a type="edit">Edit...</a></li> + <li><a type="delete">Delete</a></li> + <li><ul class="oe_kanban_colorpicker" data-field="color"/></li> + </ul> + </div> <div class="oe_kanban_content"> <h3 class="oe_kanban_ellipsis"><field name="name"/></h3> @@ -322,16 +324,18 @@ <field name="arch" type="xml"> <form string="Project" version="7.0"> <header> + <!-- <button name="do_open" string="Start Task" type="object" states="draft,pending"/> + <button name="do_draft" string="Draft" type="object" + states="cancel,done"/> + --> <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action" states="done,cancelled" context="{'button_reactivate':True}"/> - <button name="do_pending" string="Pending" type="object" - states="open"/> <button name="action_close" string="Done" type="object" states="draft,open,pending"/> - <button name="do_draft" string="Draft" type="object" - states="cancel,done"/> + <button name="do_pending" string="Pending" type="object" + states="open"/> <button name="%(action_project_task_delegate)d" string="Delegate" type="action" states="pending,open,draft" groups="project.group_delegate_task"/> <button name="do_cancel" string="Cancel" type="object" @@ -343,20 +347,17 @@ <field name="stage_id" widget="statusbar"/> </header> <sheet string="Task"> - <label for="name" class="oe_form_readonly_hidden"/> + <label for="name" class="oe_edit_only"/> <h1> <field name="name"/> </h1> - <label for="project_id" class="oe_form_readonly_hidden"/> + <label for="project_id" class="oe_edit_only"/> <h2> <field name="project_id" on_change="onchange_project(project_id)"/> </h2> <group> <group> - <field name="effective_hours" - widget="float_time" invisible="1" groups="project.group_tasks_work_on_tasks"/> <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/> - <field name="partner_id" /> <field name="company_id" groups="base.group_multi_company" widget="selection"/> </group> <group> @@ -364,30 +365,32 @@ <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks" on_change="onchange_planned(planned_hours, effective_hours)"/> - - <label for="remaining_hours" string="+ Remaining"/> - <div> - <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/> - <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/> - </div> - <field name="total_hours" widget="float_time" groups="project.group_tasks_work_on_tasks" - string="= Total"/> - - <field name="progress" widget="progressbar" groups="project.group_tasks_work_on_tasks"/> + <field name="progress" widget="progressbar" + groups="project.group_time_work_estimation_tasks" + invisible="1"/> </group> </group> <notebook> <page string="Description"> <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..." /> - <separator string="Task Works" /> - <field name="work_ids" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks"> + <field name="work_ids" groups="project.group_tasks_work_on_tasks"> <tree string="Task Work" editable="top"> - <field name="name" /> + <field name="date"/> + <field name="name"/> + <field name="user_id"/> <field name="hours" widget="float_time" sum="Spent Hours"/> - <field name="user_id" /> - <field name="date" /> </tree> </field> + <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks"> + <field name="effective_hours" widget="float_time"/> + <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/> + <div> + <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/> + <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/> + </div> + <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/> + </group> + <div class="oe_clear"/> </page> <page string="Delegations History" groups="project.group_delegate_task"> <separator string="Parent Tasks"/> @@ -410,6 +413,7 @@ <group col="4"> <field name="priority"/> <field name="sequence"/> + <field name="partner_id" /> <field name="state" groups="base.group_no_one"/> </group> </page> |