diff options
| author | Xavier Morel <xmo@tinyerp.com> | 2010-02-15 17:20:33 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@tinyerp.com> | 2010-02-15 17:20:33 +0100 |
| commit | 9c77a058d9ff7306f879b3b78c9cb6d36d298baf (patch) | |
| tree | 6252e4430f87471f8f980ffab6e76c8937afff78 /addons/analytic_user_function | |
| parent | f038dd87f300a843e5455222482070d0d6f093b0 (diff) | |
| parent | 8da75403886ec23ed71b8f97269f1b5eca8b9167 (diff) | |
[merge] CampToCamp's multi company cost price branch
bzr revid: xmo@tinyerp.com-20100215162033-j3st3yq2rz8a2gwx
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 852d0750a42..c5c2af729a0 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -99,8 +99,11 @@ class hr_analytic_timesheet(osv.osv): _('There is no expense account define ' \ 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) - amount = unit_amount * self.pool.get('product.uom')._compute_price(cr, uid, - r.product_id.uom_id.id, r.product_id.standard_price, False) + # Compute based on pricetype + amount_unit=self.on_change_unit_amount(cr, uid, ids, + r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + + amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) res ['value']['general_account_id']= a return res @@ -132,8 +135,11 @@ class hr_analytic_timesheet(osv.osv): _('There is no expense account define ' \ 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) - amount = unit_amount * r.product_id.uom_id._compute_price(cr, uid, - r.product_id.uom_id.id, r.product_id.standard_price, False) + # Compute based on pricetype + amount_unit=self.on_change_unit_amount(cr, uid, ids, + r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + + amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) res ['value']['general_account_id']= a return res |