← Back to team overview

clearcorp team mailing list archive

[Merge] lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica/6.1

 

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/163356

Fix HN and HE in report l10n_cr_hr_payroll/report/payroll_report
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/163356
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.
=== modified file 'l10n_cr_hr_payroll/report/payroll_report.py'
--- l10n_cr_hr_payroll/report/payroll_report.py	2013-01-10 22:07:39 +0000
+++ l10n_cr_hr_payroll/report/payroll_report.py	2013-05-10 19:10:29 +0000
@@ -64,20 +64,22 @@
         return res
         
     def get_hn(self,line_ids):
-        code = 'HN'
-        res = 0
+        code1 = 'HN'
+        code2 = 'HNM'
+        res = 0.00
         for line in line_ids:
-            if line.code == code:
-                res += line.number_of_hours
-                
+            if line.code == code1:
+                res += line.number_of_hours
+            elif line.code == code2:
+                res += line.number_of_hours
         return res
         
     def get_he(self,line_ids):
         code = 'HE'
-        res = 0
+        res = 0.00
         for line in line_ids:
             if line.code == code:
-                res += line.number_of_hours
+                res += line.number_of_hours        
         return res
         
         


Follow ups