clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00776
[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/162624
Fix payroll_report_for_month when has ccss-emp-pen
--
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/162624
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 2012-12-12 20:16:29 +0000
+++ l10n_cr_hr_payroll/report/payroll_report_for_month.py 2013-05-06 15:46:23 +0000
@@ -192,7 +192,8 @@
def get_ccss(self, cr, uid, payslips):
code = 'CCSS-EMP'
- code2 = 'Banco Popular-EMP'
+ code2 = 'CCSS-EMP-PEN'
+ code3 = 'Banco Popular-EMP'
res = 0.00
for payslip in payslips:
for line in payslip.line_ids:
@@ -200,6 +201,8 @@
res += line.total
elif line.code == code2:
res += line.total
+ elif line.code == code3:
+ res += line.total
return res
Follow ups