diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2011-09-24 11:10:37 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2011-09-24 11:10:37 +0200 |
| commit | c3a79fbc365489d854e5d6ad0a2e8f92bc5f194a (patch) | |
| tree | e1005dc1fc02912e42560dd9ce26323520245bee /addons/project_long_term | |
| parent | e4416c18e6056e239f6a2ac14500b5aab9e8aef4 (diff) | |
| parent | 0e861ae34aa073dedb1df70000af8d1d25d085ee (diff) | |
merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
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 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 6c5ef7890bf..7cd6697b67a 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -117,7 +117,7 @@ class project_phase(osv.osv): 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'responsible_id': fields.many2one('res.users', 'Responsible', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), - 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, + 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('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\'.'), 'total_hours': fields.function(_compute, string='Total Hours'), diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index dd83b162997..49b306ebfd5 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -140,7 +140,7 @@ </field> <separator string="" colspan="4"/> <group col="12" colspan="4"> - <field name="state" select="1"/> + <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"/> |