diff options
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 2 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 8d9319466e3..4a74c9c0b3a 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -115,7 +115,7 @@ class project_phase(osv.osv): 'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'), 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, help="The ressources on the project can be computed automatically by the scheduler"), - 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, + 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'State', readonly=True, required=True, help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ \n If the phase is over, the states is set to \'Done\'.'), 'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"), diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 7e1b58745a6..9cbbfaf75f3 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -141,7 +141,19 @@ <field name="model">project.phase</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Project Phase"> + <form layout="manual"> + <div class="oe_form_topbar"> + <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/> + <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/> + <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/> + <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/> + <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> + <div class="oe_right"> + <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/> + </div> + <div class="oe_clear"/> + </div> + <sheet string="Project Phase" layout="auto"> <group colspan="6" col="6"> <group colspan="6" col="7" > <field name="name" colspan="4"/> @@ -166,15 +178,6 @@ <field name="date_end"/> </form> </field> - <separator string="" colspan="4"/> - <group col="12" colspan="4"> - <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/> - <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> - <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/> - <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/> - <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/> - <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/> - </group> </page> <page string="Tasks Details"> <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1"> @@ -211,6 +214,7 @@ </page> </notebook> <newline/> + </sheet> </form> </field> </record> |