Merge lp:~openerp-dev/openobject-addons/trunk-bug-788297-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

hr_timesheet: fixed employee and employees timesheet report, shows correct quantity(without using unit_factor)" --fixes=lp:788297

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

your patch is not consistent with different UOM categories.
I replied on the bug for that.

Thanks,
mra

review: Needs Fixing

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have made changes as mentioned above.

Thanks,
mtr

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== 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-09-16 05:34:24 +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 / 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 "\

=== 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-09-16 05:34:24 +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 / 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 "\