[MERGE]

bzr revid: hmo@tinyerp.com-20100219102848-x6au29iuxc3e0dm0

1 files changed, 11 insertions, 5 deletions

diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index e2279bb891e..c5c2af729a0 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -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