From b4945ac8fffcb6e46eba4493a7fc1b2531086f1f Mon Sep 17 00:00:00 2001 From: mtr Date: Mon, 13 Jun 2011 11:53:21 +0530 Subject: [PATCH] [FIX] hr_timesheet: fixed employee and employees timesheet report, shows correct values(without using unit_factor) lp bug: https://launchpad.net/bugs/788297 fixed bzr revid: mtr@mtr-20110613062321-z23jvc1z5my3q08b --- addons/hr_timesheet/report/user_timesheet.py | 2 +- addons/hr_timesheet/report/users_timesheet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index 737652fbccd..3cc7618ff77 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -67,7 +67,7 @@ class report_custom(report_rml): if user_id: # Computing the attendence by analytical account cr.execute( - "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\ + "select line.date, (unit_amount) as amount, account_id, account.name "\ "from account_analytic_line as line, hr_analytic_timesheet as hr, "\ "account_analytic_account as account, product_uom as unit "\ "where hr.line_id=line.id and line.account_id=account.id "\ diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index fac92d6a322..db24f4a83e3 100644 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -37,7 +37,7 @@ def lengthmonth(year, month): def emp_create_xml(cr, id, som, eom, emp): # Computing the attendence by analytical account cr.execute( - "select line.date, (unit_amount * unit.factor) as amount "\ + "select line.date, (unit_amount) as amount "\ "from account_analytic_line as line, hr_analytic_timesheet as hr, "\ "product_uom as unit "\ "where hr.line_id=line.id "\