odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20110917150141-mp36jj3tqb9ure6y
This commit is contained in:
Fabien Pinckaers 2011-09-17 17:01:41 +02:00
parent 78f60c63f2 670621875e
commit 14b6faf57e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_timesheet/report/user_timesheet.py
View File

@ -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 / 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 "\

2
addons/hr_timesheet/report/users_timesheet.py
View File

@ -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 / 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 "\