clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/163352

Fix HN and HE in report l10n_cr_hr_payroll/report/payroll_report_for_month
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/163352
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.

=== modified file 'l10n_cr_hr_payroll/report/payroll_report_for_month.py'
--- l10n_cr_hr_payroll/report/payroll_report_for_month.py	2013-05-06 15:43:07 +0000
+++ l10n_cr_hr_payroll/report/payroll_report_for_month.py	2013-05-10 17:58:26 +0000
@@ -144,11 +144,14 @@
             return res
         
     def get_hn(self, cr, uid, payslips):
-        code = 'HN'
+        code1 = 'HN'
+        code2 = 'HNM'
         res = 0.00
         for payslip in payslips:
-            for line in payslip.line_ids:
-                if line.code == code:
+            for line in payslip.worked_days_line_ids:
+                if line.code == code1:
+                    res += line.number_of_hours
+                elif line.code == code2:
                     res += line.number_of_hours
         return res
         
@@ -156,7 +159,7 @@
         code = 'HE'
         res = 0.00
         for payslip in payslips:
-            for line in payslip.line_ids:
+            for line in payslip.worked_days_line_ids:
                 if line.code == code:
                     res += line.number_of_hours        
         return res