clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00823
[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/167152
[ADD] Add exception in close_payslip_run
--
https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/167152
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.
=== modified file 'l10n_cr_hr_payroll/i18n/es_CR.po'
--- l10n_cr_hr_payroll/i18n/es_CR.po 2012-10-23 19:20:52 +0000
+++ l10n_cr_hr_payroll/i18n/es_CR.po 2013-06-03 21:29:43 +0000
@@ -260,6 +260,12 @@
msgstr "CCSS/BP"
#. module: l10n_cr_hr_payroll
+#: code:addons/l10n_cr_hr_payroll/l10n_cr_hr_payroll.py:91
+#, python-format
+msgid "You did not confirm some of the payroll"
+msgstr "Usted no confirmó algunas de las nóminas"
+
+#. module: l10n_cr_hr_payroll
#: selection:payroll.report.for.month,target_move:0
msgid "All Posted Entries"
msgstr "Todas las entradas publicadas"
=== modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll.py'
--- l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2013-05-21 20:17:47 +0000
+++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2013-06-03 21:29:43 +0000
@@ -80,6 +80,17 @@
'period_id': fields.many2one('account.period', 'Force Period', readonly=True, states={'draft': [('readonly', False)]}),
}
+
+ def close_payslip_run(self, cr, uid, ids, context=None):
+ result = self.write(cr, uid, ids, {'state': 'close'}, context=context)
+ payslip_obj = self.pool.get('hr.payslip')
+ for batches in self.browse(cr, uid, ids, context=context):
+ payslip_ids = map(lambda x: x.id, batches.slip_ids)
+ for payslip in payslip_obj.browse(cr, uid, payslip_ids):
+ if payslip.state == 'draft':
+ raise osv.except_osv(_('Warning !'), _('You did not confirm some of the payroll'))
+ break
+ return result
def confirm_payslips(self, cr, uid, ids, context=None):
payslip_obj = self.pool.get('hr.payslip')
Follow ups