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/124741 Change the description in hr_payslip and titles of payslip batches in worked_days_line -- https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/124741 Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_hr_payroll/i18n/es_CR.po' --- l10n_cr_hr_payroll/i18n/es_CR.po 2012-09-01 00:22:31 +0000 +++ l10n_cr_hr_payroll/i18n/es_CR.po 2012-09-17 16:48:20 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-31 19:56+0000\n" -"PO-Revision-Date: 2012-08-31 17:14-0600\n" +"POT-Creation-Date: 2012-09-14 22:22+0000\n" +"PO-Revision-Date: 2012-09-14 16:22-0600\n" "Last-Translator: Ronald Rubi <[email protected]>\n" "Language-Team: Inglés <[email protected]>\n" "MIME-Version: 1.0\n" @@ -23,6 +23,12 @@ msgstr "Bruto" #. module: l10n_cr_hr_payroll +#: code:addons/l10n_cr_hr_payroll/l10n_cr_hr_payroll.py:119 +#, python-format +msgid "weekly" +msgstr "semanal" + +#. module: l10n_cr_hr_payroll #: selection:hr.payslip.run,schedule_pay:0 msgid "Bi-monthly" msgstr "Bi-mensual" @@ -53,6 +59,12 @@ "un mes especial" #. module: l10n_cr_hr_payroll +#: code:addons/l10n_cr_hr_payroll/l10n_cr_hr_payroll.py:121 +#, python-format +msgid "monthly" +msgstr "mensual" + +#. module: l10n_cr_hr_payroll #: view:hr.payslip.run:0 msgid "Generate Payslips" msgstr "Generar nómina" @@ -87,7 +99,7 @@ msgstr "Confirmar Nóminas" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:180 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:178 #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:186 msgid "REVIEWED BY:" msgstr "REVISADO POR:" @@ -108,12 +120,13 @@ msgstr "Filtro en cuentas" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:43 -msgid "Payslips of:" -msgstr "Nóminas del:" +#: code:addons/l10n_cr_hr_payroll/l10n_cr_hr_payroll.py:125 +#, python-format +msgid "%s payroll of %s from %s to %s" +msgstr "planilla %s de %s del %s al %s" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:179 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:177 #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:185 msgid "BY:" msgstr "HECHO POR:" @@ -143,10 +156,9 @@ "misma compañía." #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:166 -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:170 -msgid "0.00" -msgstr "0.00" +#: field:payroll.report.for.month,company_id:0 +msgid "Company" +msgstr "Compañía" #. module: l10n_cr_hr_payroll #: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:70 @@ -187,9 +199,9 @@ msgstr "Fecha" #. module: l10n_cr_hr_payroll -#: view:hr.payslip.run:0 -msgid "Schedule pay" -msgstr "Plan de pago" +#: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:43 +msgid "Payslips of:" +msgstr "Nóminas del:" #. module: l10n_cr_hr_payroll #: field:payroll.report.for.month,chart_account_id:0 @@ -273,6 +285,11 @@ msgstr "Todas las entradas publicadas" #. module: l10n_cr_hr_payroll +#: constraint:hr.payslip:0 +msgid "Payslip 'Date From' must be before 'Date To'." +msgstr "Boleta ' Fecha Desde' pago debe ser antes de 'Fecha a'." + +#. module: l10n_cr_hr_payroll #: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:140 #: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:160 #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:151 @@ -332,19 +349,24 @@ #. module: l10n_cr_hr_payroll #: help:payroll.report.for.month,fiscalyear_id:0 msgid "Keep empty for all open fiscal year" -msgstr "Keep empty for all open fiscal year" +msgstr "Mantenga vacío para todo el año fiscal abierto" #. module: l10n_cr_hr_payroll #: field:payroll.report.for.month,display_account:0 msgid "Display Accounts" -msgstr "Display Accounts" +msgstr "Mostrar cuentas" + +#. module: l10n_cr_hr_payroll +#: view:hr.payslip.run:0 +msgid "Schedule pay" +msgstr "Plan de pago" #. module: l10n_cr_hr_payroll #: selection:payroll.report.for.month,comp0_filter:0 #: selection:payroll.report.for.month,comp1_filter:0 #: selection:payroll.report.for.month,comp2_filter:0 msgid "No Comparison" -msgstr "No Comparison" +msgstr "No comparar" #. module: l10n_cr_hr_payroll #: selection:payroll.report.for.month,comp0_filter:0 @@ -352,7 +374,7 @@ #: selection:payroll.report.for.month,comp2_filter:0 #: selection:payroll.report.for.month,filter:0 msgid "Opening Only" -msgstr "Opening Only" +msgstr "Solo apertura" #. module: l10n_cr_hr_payroll #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:42 @@ -383,7 +405,7 @@ #. module: l10n_cr_hr_payroll #: selection:payroll.report.for.month,display_account:0 msgid "With movements" -msgstr "With movements" +msgstr "Con movimientos" #. module: l10n_cr_hr_payroll #: field:payroll.report.for.month,comp0_period_to:0 @@ -391,12 +413,12 @@ #: field:payroll.report.for.month,comp2_period_to:0 #: field:payroll.report.for.month,period_to:0 msgid "End Period" -msgstr "End Period" +msgstr "Periodo de fin" #. module: l10n_cr_hr_payroll #: selection:payroll.report.for.month,display_account:0 msgid "All" -msgstr "All" +msgstr "Todo" #. module: l10n_cr_hr_payroll #: field:hr.job,code:0 @@ -423,6 +445,11 @@ msgstr "Extra" #. module: l10n_cr_hr_payroll +#: model:ir.model,name:l10n_cr_hr_payroll.model_hr_payslip +msgid "Pay Slip" +msgstr "Nómina" + +#. module: l10n_cr_hr_payroll #: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:77 #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:87 msgid "Tax" @@ -437,7 +464,7 @@ #: field:payroll.report.for.month,comp2_fiscalyear_id:0 #: field:payroll.report.for.month,fiscalyear_id:0 msgid "Fiscal Year" -msgstr "Fiscal Year" +msgstr "Año fiscal" #. module: l10n_cr_hr_payroll #: selection:hr.payslip.run,schedule_pay:0 @@ -465,7 +492,7 @@ msgstr "Filtros" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:181 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:179 #: report:addons/l10n_cr_hr_payroll/report/payroll_report_for_month.mako:187 msgid "APPROVED BY:" msgstr "APROBADO POR:" @@ -473,7 +500,7 @@ #. module: l10n_cr_hr_payroll #: help:payroll.report.for.month,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "Select Charts of Accounts" +msgstr "Seleccione Gráficos de Cuentas" #. module: l10n_cr_hr_payroll #: field:payroll.report.for.month,filter:0 @@ -481,16 +508,11 @@ msgstr "Filtrar por" #. module: l10n_cr_hr_payroll -#: field:payroll.report.for.month,company_id:0 -msgid "Company" -msgstr "Compañía" - -#. module: l10n_cr_hr_payroll #: field:payroll.report.for.month,comp0_filter:0 #: field:payroll.report.for.month,comp1_filter:0 #: field:payroll.report.for.month,comp2_filter:0 msgid "Compare By" -msgstr "Compare By" +msgstr "Comparar por" #. module: l10n_cr_hr_payroll #: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:76 === modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll.py' --- l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2012-08-23 20:23:22 +0000 +++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2012-09-17 16:48:20 +0000 @@ -86,4 +86,52 @@ hr_payslip_run() +class HrPayslip(osv.osv): + _inherit = 'hr.payslip' + + _columns = { + 'name': fields.char('Description', size=256, required=False, readonly=True, states={'draft': [('readonly', False)]}), + } + + def onchange_employee_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None): + res = super(HrPayslip, self).onchange_employee_id(cr, uid, ids, date_from, date_to, employee_id=employee_id, contract_id=contract_id, context=context) + + if (not employee_id) or (not date_from) or (not date_to): + return res + + employee_obj = self.pool.get('hr.employee') + contract_obj = self.pool.get('hr.contract') + + employee = employee_obj.browse(cr, uid, employee_id, context=context) + + if (not contract_id): + contract_id = contract_obj.search(cr, uid, [('employee_id', '=', employee_id)], context=context) + else: + contract_id = [contract_id] + + contract = contract_obj.browse(cr, uid, contract_id, context=context)[0] + schedule_pay = '' + if contract.schedule_pay: + #This is to translate the terms + if contract.schedule_pay == 'weekly': + 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) + name = name.upper() + worked_days_line_list = [] + if res['value']['worked_days_line_ids']: + worked_days_line = res['value']['worked_days_line_ids'][0] + worked_days_line['code'] = 'HN' + worked_days_line['name'] = name + worked_days_line_list = [worked_days_line] + + res['value'].update({ + 'name': name, + 'worked_days_line_ids' : worked_days_line_list, + }) + + return res + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
_______________________________________________ Mailing list: https://launchpad.net/~clearcorp Post to : [email protected] Unsubscribe : https://launchpad.net/~clearcorp More help : https://help.launchpad.net/ListHelp
