← 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

 

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

[IMP] Dates with different format in l10n_cr_hr_payroll/l10n_cr_hr_payroll.py, to generate paylips.
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/124799
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll.py'
--- l10n_cr_hr_payroll/l10n_cr_hr_payroll.py	2012-09-17 16:45:11 +0000
+++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py	2012-09-17 21:12:25 +0000
@@ -23,6 +23,7 @@
 import netsvc
 from osv import fields, osv
 import tools
+from datetime import datetime
 from tools.translate import _
 
 class hr_contract(osv.osv):
@@ -117,8 +118,14 @@
                 schedule_pay = _('weekly')
             elif contract.schedule_pay == 'monthly':
                 schedule_pay = _('monthly')
-
-        name = _('%s payroll of %s from %s to %s') % (schedule_pay, employee.name, date_from, date_to)
+        
+        #Format dates
+        date_from_payslip = datetime.strptime(date_from, "%Y-%m-%d")
+        date_from_payslip = date_from_payslip.strftime('%d-%m-%Y')
+        date_to_payslip = datetime.strptime(date_to, "%Y-%m-%d")
+        date_to_payslip = date_to_payslip.strftime('%d-%m-%Y')
+        
+        name = _('%s payroll of %s from %s to %s') % (schedule_pay, employee.name, date_from_payslip, date_to_payslip)
         name = name.upper()
         worked_days_line_list = []
         if res['value']['worked_days_line_ids']:


Follow ups