diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-07-09 14:27:23 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-07-09 14:27:23 +0530 |
| commit | 5e003a77ba49061cb8cd0517f98cd13a3af893c2 (patch) | |
| tree | f7ab5f6936386cbc792e7eb1a99fe19b86e0d7bc /addons/project_long_term/wizard | |
| parent | 6e736144ae5d1a846f3b32785058a647917c6b34 (diff) | |
| parent | 89a315717d6a603f64b8b0ef69572f19a3c11499 (diff) | |
[MERGE] merge with main branch
bzr revid: mra@mra-laptop-20100708130753-vxc42yz1mo7m7rmu
bzr revid: mra@mra-laptop-20100708132932-ya7tdavf9txsql8a
bzr revid: mra@mra-laptop-20100709041926-tkmtidwpoja79itv
bzr revid: mra@mra-laptop-20100709064651-vdhxmb0zq6g5rkak
bzr revid: mra@mra-laptop-20100709082503-ms442r9nmui00z37
bzr revid: mra@mra-laptop-20100709085723-1ac0vou72xu0afba
Diffstat (limited to 'addons/project_long_term/wizard')
| -rw-r--r-- | addons/project_long_term/wizard/project_compute_phases.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 3ee15bc6c5a..f4c5fbae443 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -60,7 +60,6 @@ class project_compute_phases(osv.osv_memory): phase_obj = self.pool.get('project.phase') resource_obj = self.pool.get('resource.resource') uom_obj = self.pool.get('product.uom') - model_data_obj = self.pool.get('ir.model.data') phase_resource_obj = False if context is None: @@ -82,7 +81,7 @@ class project_compute_phases(osv.osv_memory): 'vacation': tuple(leaves), 'efficiency': time_efficiency }) - default_uom_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour') + default_uom_id = phase_obj._get_default_uom_id(cr, uid) avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id) duration = str(avg_hours) + 'H' # Create a new project for each phase |