diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-05-28 10:54:57 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-05-28 10:54:57 +0530 |
| commit | 1a6c12256e88c1ed5d5f0420e674fcceb7b54faa (patch) | |
| tree | 099da9568d776786ca341eb9cd61d53960126829 /addons/project_long_term/project_long_term.py | |
| parent | 9d3c2457c767039c97da2b109c175cc416a3a7ac (diff) | |
| parent | 6efd32d8e5de775c7ca222b7cac9ea367524d3be (diff) | |
[Merge] Merge with trunk addons
bzr revid: vir@tinyerp.com-20100528052457-d9wgzb3sd2q4jyyw
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -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 d6456ca1d2a..77a764f27cc 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -33,7 +33,7 @@ class project_phase(osv.osv): data_phase = self.browse(cr, uid, ids[0], context=context) prev_ids = data_phase.previous_phase_ids next_ids = data_phase.next_phase_ids - # it should nither be in prev_ids nor in next_ids + # it should neither be in prev_ids nor in next_ids if (data_phase in prev_ids) or (data_phase in next_ids): return False ids = [id for id in prev_ids if id in next_ids] @@ -234,7 +234,7 @@ class project_resource_allocation(osv.osv): _columns = { 'resource_id': fields.many2one('resource.resource', 'Resource', required=True), 'phase_id': fields.many2one('project.phase', 'Project Phase', required=True), - 'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"), + 'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"), } _defaults = { 'useability': 100, |