diff options
| author | Jagdish Panchal (Open ERP) <jap@tinyerp.com> | 2011-12-21 12:25:53 +0530 |
|---|---|---|
| committer | Jagdish Panchal (Open ERP) <jap@tinyerp.com> | 2011-12-21 12:25:53 +0530 |
| commit | c028b3050d84cebf33fdadaf205b24e39b27d2e7 (patch) | |
| tree | fe426c13b249bd1da2381777710e17e59a3f76a3 /addons/project_long_term/project_long_term.py | |
| parent | 22c4f560b3b0622d1465b257f842c0766b65c635 (diff) | |
| parent | bf47bea6f7b886384176c0dbb59860f72677e69e (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20111221065553-k0h0ksnnr29mklna
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f7e23c29a58..d402f16991a 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -73,11 +73,6 @@ class project_phase(osv.osv): return False return True - def _get_default_uom_id(self, cr, uid): - model_data_obj = self.pool.get('ir.model.data') - model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour') - return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id'] - def _compute_progress(self, cr, uid, ids, field_name, arg, context=None): res = {} if not ids: @@ -179,7 +174,7 @@ class project_phase(osv.osv): 'months': 'm', 'month':'month', 'm':'m', 'weeks': 'w', 'week': 'w', 'w':'w', 'hours': 'H', 'hour': 'H', 'h':'H', - }.get(phase.product_uom.name.lower(), "h") + }.get(phase.product_uom.name.lower(), "H") duration = str(phase.duration) + duration_uom result += ''' def Phase_%s(): @@ -270,3 +265,5 @@ class project_task(osv.osv): 'phase_id': fields.many2one('project.phase', 'Project Phase'), } project_task() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |