[FIX] hr_timesheet:Employee Timesheet report now uses unit factor correctly
lp bug: https://launchpad.net/bugs/788297 fixed bzr revid: mtr@mtr-20110621095117-69bkgohrkkwv5n01
This commit is contained in:
parent
b4945ac8ff
commit
f3bc8f3324
|
@ -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) as amount, account_id, account.name "\
|
||||
"select line.date, (unit_amount / unit.factor) 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 "\
|
||||
|
|
|
@ -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) as amount "\
|
||||
"select line.date, (unit_amount / unit.factor) as amount "\
|
||||
"from account_analytic_line as line, hr_analytic_timesheet as hr, "\
|
||||
"product_uom as unit "\
|
||||
"where hr.line_id=line.id "\
|
||||
|
|
Loading…
Reference in New Issue