summaryrefslogtreecommitdiff
path: root/addons/project
diff options
context:
space:
mode:
Diffstat (limited to 'addons/project')
-rw-r--r--addons/project/board_project_view.xml2
-rw-r--r--addons/project/project_view.xml74
-rw-r--r--addons/project/res_config_view.xml33
3 files changed, 59 insertions, 50 deletions
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f4a855283ba..8fef3c1470e 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -80,7 +80,7 @@
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="My Board">
+ <form string="My Board" layout="manual">
<board style="2-1">
<column>
<action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8633c61a07b..b7f174733db 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,8 +18,21 @@
<field name="model">project.project</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Project">
- <group colspan="4" col="6">
+ <form string="Project" layout="manual">
+ <div class="oe_form_topbar">
+ <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+ <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
+ <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+ <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+ <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
+ <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
+ <button string="New Project Based on Template" name="duplicate_template" type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
+ <div class="oe_right">
+ <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
+ </div>
+ </div>
+ <sheet string="Project" layout="auto">
+ <group colspan="6" col="6">
<field name="name" string="Project Name" select="1"/>
<field name="analytic_account_id" invisible="1" required="0"/>
<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
@@ -48,21 +61,6 @@
<field name="priority"/>
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
</group>
- <newline/>
- <separator colspan="4"/>
- <group col="9" colspan="8">
- <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
- <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
- <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
- <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
- <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
- <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
- <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
- <button
- string="New Project Based on Template"
- name="duplicate_template" type="object"
- states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
- </group>
</page>
<page string="Members">
<field colspan="4" name="members" nolabel="1">
@@ -101,7 +99,10 @@
</page>
</notebook>
<newline/>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
@@ -144,8 +145,9 @@
<field name="type">tree</field>
<field name="field_parent">child_ids</field>
<field name="arch" type="xml">
- <tree colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+ <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
<field name="sequence" invisible="1"/>
+ <field name="needaction_pending" invisible="1"/>
<field name="date" invisible="1"/>
<field name="name" string="Project Name"/>
<field name="user_id" string="Project Manager"/>
@@ -300,7 +302,20 @@
<field name="type">form</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <form string="Task edition">
+ <form string="Project" layout="manual">
+ <div class="oe_form_topbar">
+ <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+ <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+ <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
+ <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
+ <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+ <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
+ <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
+ <div class="oe_right">
+ <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+ </div>
+ </div>
+ <sheet string="Task edition" layout="auto">
<group colspan="6" col="6">
<field name="name" select="1"/>
<field name="project_id" select="1" on_change="onchange_project(project_id)"/>
@@ -326,7 +341,7 @@
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group>
- <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+ <field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
<field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
<tree string="Task Work" editable="top">
<field name="name" />
@@ -335,17 +350,6 @@
<field name="date" />
</tree>
</field>
- <newline/>
- <group col="11" colspan="4">
- <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
- <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
- <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
- <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
- <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
- <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
- <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
- <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
- </group>
</page>
<page groups="base.group_extended" string="Delegations History">
<separator string="Parent Tasks" colspan="4"/>
@@ -383,7 +387,10 @@
<field colspan="4" name="notes" nolabel="1"/>
</page>
</notebook>
- <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </sheet>
+ <div class="oe_form_sheet_width">
+ <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
@@ -487,7 +494,8 @@
<field name="type">tree</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+ <tree fonts="bold:needaction_pending==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+ <field name="needaction_pending" invisible="1"/>
<field name="sequence" invisible="not context.get('seq_visible', False)"/>
<field name="name"/>
<field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index daa5bc10d8e..021bab3962c 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,24 +7,25 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
- <form string="Configure Project">
- <separator string="Project" colspan="4"/>
- <field name="module_project_mrp"/>
- <field name="module_project_timesheet"/>
- <field name="module_pad"/>
+ <form string="Configure Project" layout="manual">
+ <div class="oe_form_topbar">
+ <button string="Apply" type="object" name="execute"/>
+ <button string="Cancel" special="cancel"/>
+ </div>
+ <sheet layout="auto">
+ <separator string="Project" colspan="4"/>
+ <field name="module_project_mrp"/>
+ <field name="module_project_timesheet"/>
+ <field name="module_pad"/>
- <separator string="Planning" colspan="4"/>
- <field name="module_project_long_term"/>
+ <separator string="Planning" colspan="4"/>
+ <field name="module_project_long_term"/>
- <separator string="Helpdesk and support" colspan="4"/>
- <field name="module_project_issue"/>
- <field name="module_project_issue_sheet"/>
- <group name="support" colspan="4"/>
-
- <newline/>
- <label colspan="2"/>
- <button string="Cancel" icon="gtk-cancel" special="cancel"/>
- <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+ <separator string="Helpdesk and support" colspan="4"/>
+ <field name="module_project_issue"/>
+ <field name="module_project_issue_sheet"/>
+ <group name="support" colspan="4"/>
+ </sheet>
</form>
</field>
</record>
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-24 09:49:48 +0000