summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term.py
diff options
context:
space:
mode:
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>2011-12-21 18:07:24 +0530
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>2011-12-21 18:07:24 +0530
commit357f3fca2feed21d1ef639bee53b5d7a2d70b71e (patch)
tree911b21d5e5226c09f8d96b33161d290e452ffa8d /addons/project_long_term/project_long_term.py
parentcd8a031e926f6e511b4edfe961b36b8fef0ce6b0 (diff)
parentcb5339c3d92a90bce430bfe637e2ed408ebf6c55 (diff)
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20111221123724-buifqfz9zvmu9s8n
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
-rw-r--r--addons/project_long_term/project_long_term.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index ac0ad4b150a..1be274bc4f6 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():