clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00159
[Merge] lp:~dr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll into lp:openerp-costa-rica/6.1
Diana Rodríguez Martínez has proposed merging lp:~dr.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/~dr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/108474
[IMP] Filter Payroll by payment frequency
[FIX] Translation of payment frequencies
--
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/108474
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.
=== removed symlink 'l10n_cr_hr_payroll/i18n/es.po'
=== target was u'/home/ronald/Development/openerp/openerp-costa-rica/features/l10n_cr_hr_payroll/i18n/es_CR.po'
=== modified file 'l10n_cr_hr_payroll/i18n/es_CR.po' (properties changed: -x to +x)
--- l10n_cr_hr_payroll/i18n/es_CR.po 2012-04-26 21:16:29 +0000
+++ l10n_cr_hr_payroll/i18n/es_CR.po 2012-06-03 00:55:24 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-24 20:55+0000\n"
-"PO-Revision-Date: 2012-04-24 20:55+0000\n"
+"POT-Creation-Date: 2012-06-03 00:19+0000\n"
+"PO-Revision-Date: 2012-06-03 00:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,222 @@
"Plural-Forms: \n"
#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Bi-monthly"
+msgstr "Bi-mensual"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:77
+msgid "Bruto"
+msgstr "Bruto"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Monthly"
+msgstr "Mensual"
+
+#. module: l10n_cr_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Frecuencia de pago"
+msgstr "Frecuencia de pago"
+
+#. module: l10n_cr_hr_payroll
+#: model:ir.model,name:l10n_cr_hr_payroll.model_hr_job
+msgid "Job Description"
+msgstr "Descripción del trabajo"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:79
+msgid "Impuesto"
+msgstr "Impuesto"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Quarterly"
+msgstr "Trimestre"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:69
+msgid "Nombre"
+msgstr "Nombre"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Semi-annually"
+msgstr "Semestral"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:68
+msgid "Cedula"
+msgstr "Cedula"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:73
+msgid "Normal"
+msgstr "Normal"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:156
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:160
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:179
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:183
+msgid "0"
+msgstr "0"
+
+#. module: l10n_cr_hr_payroll
+#: model:ir.model,name:l10n_cr_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr "Lotes de Nóminas"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Weekly"
+msgstr "Semanal"
+
+#. 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:70
+msgid "Nor"
+msgstr "Nor"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Fortnightly"
+msgstr "Quincena"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:78
+msgid "CCSS/BP"
+msgstr "CCSS/BP"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:75
+msgid "Doble"
+msgstr "Doble"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:72
+msgid "Dob"
+msgstr "Dob"
+
+#. 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
+#: field:hr.payslip.run,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr "Frecuencia de pago"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:70
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:71
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:72
+msgid "Hrs."
+msgstr "Hrs."
+
+#. module: l10n_cr_hr_payroll
#: model:ir.model,name:l10n_cr_hr_payroll.model_hr_contract
-msgid "Fortnightly"
-msgstr "Quincenal"
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Annually"
+msgstr "Anual"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:71
+msgid "Ext"
+msgstr "Ext"
+
+#. module: l10n_cr_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "¡Error! La fecha de inicio de contrato debe ser menor que la fecha de finalización."
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:148
+msgid "Total"
+msgstr "Total"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:81
+msgid "Neto"
+msgstr "Neto"
+
+#. module: l10n_cr_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_cr_hr_payroll.hr_payslip_run_ccorp
+msgid "Reporte de Planilla"
+msgstr "Reporte de Planilla"
+
+#. module: l10n_cr_hr_payroll
+#: field:hr.job,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:73
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:74
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:75
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:76
+msgid "Ingr."
+msgstr "Ingr."
+
+#. module: l10n_cr_hr_payroll
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr "¡El nombre del puesto de trabajo debe ser único por compañía!"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:74
+msgid "Extra"
+msgstr "Extra"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:80
+msgid "Otras"
+msgstr "Otras"
+
+#. 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.mako:81
+msgid "Salario"
+msgstr "Salario"
+
+#. module: l10n_cr_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Generate Payslips"
+msgstr "Generar nómina"
+
+#. module: l10n_cr_hr_payroll
+#: selection:hr.payslip.run,schedule_pay:0
+msgid "Bi-weekly"
+msgstr "Bi-semanal"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:79
+msgid "Renta"
+msgstr "Renta"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:76
+msgid "Otros"
+msgstr "Otros"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:171
+msgid "TOTAL GENERAL"
+msgstr "TOTAL GENERAL"
+
+#. module: l10n_cr_hr_payroll
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:78
+#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:80
+msgid "Deducc."
+msgstr "Deducc."
=== modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll.py'
--- l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2012-05-15 22:01:47 +0000
+++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2012-06-03 00:55:24 +0000
@@ -60,4 +60,22 @@
hr_job()
+
+class hr_payslip_run(osv.osv):
+ _inherit = 'hr.payslip.run'
+ _columns = {
+ 'schedule_pay': fields.selection([
+ ('fortnightly', 'Fortnightly'),
+ ('monthly', 'Monthly'),
+ ('quarterly', 'Quarterly'),
+ ('semi-annually', 'Semi-annually'),
+ ('annually', 'Annually'),
+ ('weekly', 'Weekly'),
+ ('bi-weekly', 'Bi-weekly'),
+ ('bi-monthly', 'Bi-monthly'),
+ ], 'Scheduled Pay', select=True, readonly=True, states={'draft': [('readonly', False)]}),
+ }
+
+hr_payslip_run()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'l10n_cr_hr_payroll/l10n_cr_hr_payroll_view.xml'
--- l10n_cr_hr_payroll/l10n_cr_hr_payroll_view.xml 2012-05-25 22:01:53 +0000
+++ l10n_cr_hr_payroll/l10n_cr_hr_payroll_view.xml 2012-06-03 00:55:24 +0000
@@ -16,7 +16,41 @@
</data>
</field>
</record>
- <!-- End Jobs -->
-
+ <!-- End Jobs -->
+
+ <!-- Payroll_run-->
+ <record id="inherit_hr_payslip_run_form" model="ir.ui.view">
+ <field name="name">hr.payslip.run.form</field>
+ <field name="model">hr.payslip.run</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+ <field name="arch" type="xml">
+ <data>
+ <field name = "date_end" position = "after">
+ <field name="schedule_pay" required = "True" string = "Frecuencia de pago"/>
+ </field>
+ <button string = "Generate Payslips" position = "replace">
+ <button name="%(hr_payroll.action_hr_payslip_by_employees)d" context="{'schedule_pay': schedule_pay}" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
+ </button>
+ </data>
+ </field>
+ </record>
+ <!--End Payroll_run -->
+
+ <!-- Employee wizar -->
+ <record id="inherit_view_hr_payslip_by_employees" model="ir.ui.view">
+ <field name="name">hr_payroll_payslip_employees</field>
+ <field name="model">hr.payslip.employees</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_by_employees"/>
+ <field name="arch" type="xml">
+ <data>
+ <field name = "employee_ids" position = "replace">
+ <field name="employee_ids" domain="[('contract_ids.schedule_pay', '=', schedule_pay )]" nolabel="1"/>
+ </field>
+ </data>
+ </field>
+ </record>
+ <!-- End Employee wizar-->
</data>
</openerp>
Follow ups
