diff options
| author | Bharat Devnani (OpenERP) <bde@tinyerp.com> | 2012-10-25 16:38:04 +0530 |
|---|---|---|
| committer | Bharat Devnani (OpenERP) <bde@tinyerp.com> | 2012-10-25 16:38:04 +0530 |
| commit | 2fcc40b100ce941fabcfecce36bbd1ac70118ad2 (patch) | |
| tree | 9dfb088d9b910f89b09ebf9c74122c5c34fdf17a /addons/project_long_term | |
| parent | ac3100b4d06bc62c3ef5ee0be781e67c63366027 (diff) | |
| parent | 013f14931bdc13c63fa6e169cf7fff364d5dda5a (diff) | |
[MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20121025110804-glj200f3hz4ublmn
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 4 |
1 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 b19238200e5..db6c532d503 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -116,8 +116,8 @@ class project_phase(osv.osv): 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, help="The resources on the project can be computed automatically by the scheduler."), 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', 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\'.'), + help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\ + \n If the phase is over, the status is set to \'Done\'.'), 'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"), } _defaults = { |