From 3fa1e69ffd6284d0fa32ba68d3d1911cc36d1153 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Mon, 17 May 2010 18:47:13 +0530 Subject: [REF] bzr revid: jvo@tinyerp.com-20100517131713-kh7s2n85elr52xjf --- addons/analytic_user_function/analytic_user_function.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index c5c2af729a0..fe238d373be 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -100,7 +100,7 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit=self.on_change_unit_amount(cr, uid, ids, + 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 @@ -136,7 +136,7 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit=self.on_change_unit_amount(cr, uid, ids, + 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 -- cgit v1.2.3 From e277449755c7bb400859631cf4b9f6b43bda54a2 Mon Sep 17 00:00:00 2001 From: "JMA (OpenERP)" Date: Fri, 21 May 2010 18:28:31 +0530 Subject: [REF] bzr revid: jma@tinyerp.com-20100521125831-rqe512penoei0kqz --- addons/analytic_user_function/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index a6149cabb7c..072d6cfc4f9 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -26,7 +26,7 @@ 'category': 'Generic Modules/Others', 'description': """ - This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available. + This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available. Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. -- cgit v1.2.3