Meera Trambadia (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-788297-mtr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #788297 in OpenERP Addons: "[6.0] Employee Timesheet report misuse unit
factor"
https://bugs.launchpad.net/openobject-addons/+bug/788297
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-788297-mtr/+merge/64364
hr_timesheet: fixed employee and employees timesheet report, shows correct
quantity(without using unit_factor)" --fixes=lp:788297
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-788297-mtr/+merge/64364
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-788297-mtr.
=== modified file 'hr_timesheet/report/user_timesheet.py'
--- hr_timesheet/report/user_timesheet.py 2011-02-07 11:38:37 +0000
+++ hr_timesheet/report/user_timesheet.py 2011-06-13 07:01:19 +0000
@@ -67,7 +67,7 @@
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 "\
=== modified file 'hr_timesheet/report/users_timesheet.py'
--- hr_timesheet/report/users_timesheet.py 2011-01-17 11:35:21 +0000
+++ hr_timesheet/report/users_timesheet.py 2011-06-13 07:01:19 +0000
@@ -37,7 +37,7 @@
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 "\
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
