diff options
| author | Jigar Amin <jam@tinyerp.com> | 2010-10-07 09:59:11 +0530 |
|---|---|---|
| committer | Jigar Amin <jam@tinyerp.com> | 2010-10-07 09:59:11 +0530 |
| commit | d47e64b0302399ea85e50beec1551fa2fc76907c (patch) | |
| tree | bf37854d73ba6c8d4b28b1bf4d9144c44ca9339e /addons/project_long_term | |
| parent | dca6b9b2589b086fc6eb64783910d42a0d1764d4 (diff) | |
| parent | 209c2f59c88aaf9271a9834c7e1e31f6b83bd102 (diff) | |
[MERGE]
bzr revid: jam@tinyerp.com-20101007042911-maoy3qt9x8xprgz8
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 6 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 25 |
2 files changed, 15 insertions, 16 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 2caf36766b0..0c31c485753 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -92,7 +92,7 @@ class project_phase(osv.osv): 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(self, cr, uid, ids, context=None): + def _compute(self, cr, uid, ids,field_name, arg, context=None): res = {} if not ids: return res @@ -100,9 +100,7 @@ class project_phase(osv.osv): tot = 0.0 for task in phase.task_ids: tot += task.planned_hours - res[phase.id] = { - 'total_hours' : tot - } + res[phase.id] = tot return res _columns = { diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 3412ba7ca08..fa645af4127 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -110,22 +110,23 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Project Phase"> - <group colspan="6" col="6"> - <group colspan="2" col="2"> + <group colspan="8" col="7"> + <group colspan="8"> <field name="name" select="1"/> - <field name="date_start"/> + <field name="total_hours"/> + <field name="project_id" on_change="onchange_project(project_id)" colspan="2"/> + <field name="responsible_id" colspan="2"/> </group> - <group colspan="2" col="4"> - <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/> - <newline/> - <field name="duration" colspan="1" on_change="onchange_days(project_id)" /> + <newline/> + <group colspan="2"> + <field name="date_start"/> + <field name="date_end"/> + </group> + <group colspan="2"> + <field name="duration" on_change="onchange_days(project_id)"/> <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/> - </group> - <group colspan="2" col="2"> - <field name="responsible_id"/> - <field name="date_end"/> </group> - </group> + </group> <notebook colspan="4"> <page string="Resource Allocation"> <field colspan="4" name="resource_ids" nolabel="1"> |