diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-09-21 18:59:21 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-09-21 18:59:21 +0530 |
| commit | 01551b9fd6e0bf2b7600f06e2989e83b5cf0d16b (patch) | |
| tree | 4ab9b841ebe3d730f7d4300d92cebbcc2b9d97cf /addons/project_long_term | |
| parent | 8eb4f30d90a013fc3930daaa380dcece25b1ba05 (diff) | |
| parent | 7286960d7aca809d991b1cff2b9b5e2280202689 (diff) | |
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-statusbar-add-widget-aag
bzr revid: rpa@tinyerp.com-20110921132921-emisu1fa3wzl680f
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 8d976517a34..a05465f81d8 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"/> |