clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00283
[Merge] lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica
Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica.
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/122591
Add retrieve in payroll report for month
--
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/122591
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_hr_payroll/report/payroll_report_for_month.py'
--- l10n_cr_hr_payroll/report/payroll_report_for_month.py 2012-09-01 00:22:31 +0000
+++ l10n_cr_hr_payroll/report/payroll_report_for_month.py 2012-09-03 21:54:20 +0000
@@ -52,6 +52,9 @@
'get_ccss': self.get_ccss,
'get_rent': self.get_rent,
'get_net': self.get_net,
+ 'get_RETM':self.get_RETM,
+ 'get_RETS':self.get_RETS,
+ 'get_retroactive':self.get_retroactive,
})
def set_context(self, objects, data, ids, report_type=None):
@@ -167,6 +170,8 @@
for line in payslip.line_ids:
if line.code == code:
res += line.total
+
+ res = res + self.get_retroactive(payslip.line_ids)
return res
def get_gross(self, cr, uid, payslips):
@@ -209,6 +214,27 @@
if line.code == code:
res += line.total
return res
+
+ def get_RETM(self,line_ids):
+ code = 'RET-MENS'
+ res = 0
+ for line in line_ids:
+ if line.code == code:
+ res += line.total
+ return res
+
+ def get_RETS(self,line_ids):
+ code = 'RET-SEM'
+ res = 0
+ for line in line_ids:
+ if line.code == code:
+ res += line.total
+ return res
+
+ def get_retroactive(self, line_ids):
+ res = 0
+ res = self.get_RETS(line_ids) + self.get_RETM(line_ids)
+ return res
HeaderFooterTextWebKitParser(
'report.l10n_cr_hr_payroll.account.payroll_report_for_month',
Follow ups