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/121083 Fix language and translation in l10n_cr_hr_payroll Fix licenses and author in l10n_cr_hr_payroll Remove column "other" and add 'bank account' column of the employee in l10n_cr_hr_payroll -- https://code.launchpad.net/~rr.clearcorp/openerp-costa-rica/6.1-l10n_cr_hr_payroll/+merge/121083 Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.
=== modified file 'l10n_cr_hr_payroll/__init__.py' --- l10n_cr_hr_payroll/__init__.py 2012-05-23 15:29:34 +0000 +++ l10n_cr_hr_payroll/__init__.py 2012-08-23 20:27:25 +0000 @@ -1,14 +1,14 @@ -#-*- coding:utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# d$ +# Addons modules by CLEARCORP S.A. +# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>). # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'l10n_cr_hr_payroll/__openerp__.py' --- l10n_cr_hr_payroll/__openerp__.py 2012-05-25 22:01:53 +0000 +++ l10n_cr_hr_payroll/__openerp__.py 2012-08-23 20:27:25 +0000 @@ -1,14 +1,14 @@ -#-*- coding:utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# d$ +# Addons modules by CLEARCORP S.A. +# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>). # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,8 +32,8 @@ * Fortnightly Payroll Register * Payroll Report """, - 'author':'Ronald Rubi', 'Armando Soto' - 'website':'http://www.clearcorp.co.cr', + 'author': 'CLEARCORP S.A.', + 'website': 'http://www.clearcorp.co.cr', 'depends': [ 'hr', 'hr_contract', === modified file 'l10n_cr_hr_payroll/i18n/es_CR.po' (properties changed: +x to -x) --- l10n_cr_hr_payroll/i18n/es_CR.po 2012-06-03 00:46:54 +0000 +++ l10n_cr_hr_payroll/i18n/es_CR.po 2012-08-23 20:27:25 +0000 @@ -1,19 +1,25 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * l10n_cr_hr_payroll +# * l10n_cr_hr_payroll +# Ronald Rubi <[email protected]>, 2012. # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2012-08-23 19:15+0000\n" +"PO-Revision-Date: 2012-08-23 13:16-0600\n" +"Last-Translator: Ronald Rubi <[email protected]>\n" +"Language-Team: Inglés <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:75 +msgid "Gross" +msgstr "Bruto" #. module: l10n_cr_hr_payroll #: selection:hr.payslip.run,schedule_pay:0 @@ -21,39 +27,29 @@ 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" +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:78 +msgid "Net" +msgstr "Neto" + +#. module: l10n_cr_hr_payroll +#: view:hr.payslip.run:0 +msgid "Confirm Payslips" +msgstr "Confirmar Nóminas" #. module: l10n_cr_hr_payroll #: selection:hr.payslip.run,schedule_pay:0 @@ -61,22 +57,25 @@ 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" +#: 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" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:70 +msgid "Bank account" +msgstr "Cuenta bancaria" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:68 +msgid "Id card" +msgstr "Cédula" #. module: l10n_cr_hr_payroll #: model:ir.model,name:l10n_cr_hr_payroll.model_hr_payslip_run @@ -84,44 +83,46 @@ 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 +#: view:hr.payslip.run:0 +msgid "Schedule pay" +msgstr "Plan de pago" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:159 +msgid "TOTAL" +msgstr "TOTAL GENERAL" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:71 msgid "Nor" msgstr "Nor" #. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:75 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:78 +msgid "Salary" +msgstr "Salario" + +#. 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 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:69 +msgid "Name" +msgstr "Nombre" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:76 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'." +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:140 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:160 +msgid "Employees" +msgstr "Empleados" #. module: l10n_cr_hr_payroll #: field:hr.payslip.run,schedule_pay:0 @@ -129,7 +130,6 @@ 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." @@ -146,40 +146,31 @@ msgstr "Anual" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:71 +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:45 +#: model:ir.actions.report.xml,name:l10n_cr_hr_payroll.hr_payslip_run_ccorp +msgid "Payroll Report" +msgstr "Reporte de planilla" + +#. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:72 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" +msgstr "" +"¡Error! La fecha de inicio de contrato debe ser menor que la fecha de " +"finalización." #. module: l10n_cr_hr_payroll #: field:hr.job,code:0 msgid "Code" -msgstr "Code" +msgstr "Código" #. 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." @@ -194,15 +185,9 @@ 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" +msgid "Tax" +msgstr "Impuesto" #. module: l10n_cr_hr_payroll #: view:hr.payslip.run:0 @@ -215,23 +200,21 @@ msgstr "Bi-semanal" #. module: l10n_cr_hr_payroll -#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:79 -msgid "Renta" +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:77 +msgid "Rent" msgstr "Renta" #. module: l10n_cr_hr_payroll +#: report:addons/l10n_cr_hr_payroll/report/payroll_report.mako:139 +msgid "Total" +msgstr "Total" + +#. module: l10n_cr_hr_payroll +#: selection:hr.payslip.run,schedule_pay:0 +msgid "Weekly" +msgstr "Semanal" + +#. 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-06-04 05:45:31 +0000 +++ l10n_cr_hr_payroll/l10n_cr_hr_payroll.py 2012-08-23 20:27:25 +0000 @@ -1,14 +1,14 @@ -#-*- coding:utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved -# d$ +# Addons modules by CLEARCORP S.A. +# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>). # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of === modified file 'l10n_cr_hr_payroll/payroll_report.xml' --- l10n_cr_hr_payroll/payroll_report.xml 2012-05-23 15:29:34 +0000 +++ l10n_cr_hr_payroll/payroll_report.xml 2012-08-23 20:27:25 +0000 @@ -2,6 +2,6 @@ <openerp> <data> <report auto="False" id="hr_payslip_run_ccorp" model="hr.payslip.run" - name="hr.payslip.run.layout_ccorp" file="l10n_cr_hr_payroll/report/payroll_report.mako" string="Reporte de Planilla" report_type="webkit"/> + name="hr.payslip.run.layout_ccorp" file="l10n_cr_hr_payroll/report/payroll_report.mako" string="Payroll Report" report_type="webkit"/> </data> </openerp> === modified file 'l10n_cr_hr_payroll/report/__init__.py' --- l10n_cr_hr_payroll/report/__init__.py 2012-05-23 15:29:34 +0000 +++ l10n_cr_hr_payroll/report/__init__.py 2012-08-23 20:27:25 +0000 @@ -1,35 +1,23 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# __init__.py -# payroll_report -# First author: Carlos Vásquez <[email protected]> (ClearCorp S.A.) -# Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this list of -# conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this list -# of conditions and the following disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those of the -# authors and should not be interpreted as representing official policies, either expressed -# or implied, of ClearCorp S.A.. -# +# OpenERP, Open Source Management Solution +# Addons modules by CLEARCORP S.A. +# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# ############################################################################## import payroll_report === modified file 'l10n_cr_hr_payroll/report/payroll_report.mako' --- l10n_cr_hr_payroll/report/payroll_report.mako 2012-07-02 15:40:36 +0000 +++ l10n_cr_hr_payroll/report/payroll_report.mako 2012-08-23 20:27:25 +0000 @@ -42,7 +42,7 @@ total_emp = 0 %> <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div> - <div style="font-size: 25px; font-weight: bold; text-align: center;"> Reporte de Planilla</div> + <div style="font-size: 25px; font-weight: bold; text-align: center;"> ${_('Payroll Report')}</div> <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${run.name}</div> <div style="font-size: 16px; font-weight: bold; text-align: center;">Periodo de ${run.date_start} a ${run.date_end}</div> </br></br> @@ -65,50 +65,47 @@ <div class="act_as_table list_table"> <div class="act_as_thead"> <div class="act_as_row labels" style="font-weight: bold; font-size: 11x;"> - <div class="act_as_cell first_column" style="width: 85px; vertical-align: middle">${_('Cedula')}</div> - <div class="act_as_cell" style="width: 230px; vertical-align: middle">${_('Nombre')}</div> + <div class="act_as_cell first_column" style="width: 85px; vertical-align: middle">${_('Id card')}</div> + <div class="act_as_cell" style="width: 230px; vertical-align: middle">${_('Name')}</div> + <div class="act_as_cell" style="width: 85px; vertical-align: middle">${_('Bank account')}</div> <div class="act_as_cell amount" style="width: 40px;">${_('Hrs.')}<br />${_('Nor')}</div> <div class="act_as_cell amount" style="width: 40px;">${_('Hrs.')}<br />${_('Ext')}</div> <div class="act_as_cell amount">${_('Ingr.')}<br />${_('Normal')}</div> <div class="act_as_cell amount">${_('Ingr.')}<br />${_('Extra')}</div> - <div class="act_as_cell amount">${_('Otros')}<br />${_('Ingr.')}</div> - <div class="act_as_cell amount">${_('Salario')}<br />${_('Bruto')}</div> + <div class="act_as_cell amount">${_('Salary')}<br />${_('Gross')}</div> <div class="act_as_cell amount">${_('Deducc.')}<br />${_('CCSS/BP')}</div> - <div class="act_as_cell amount">${_('Impuesto')}<br />${_('Renta')}</div> - <div class="act_as_cell amount">${_('Otras')}<br />${_('Deducc.')}</div> - <div class="act_as_cell amount">${_('Salario')}<br />${_('Neto')}</div> + <div class="act_as_cell amount">${_('Tax')}<br />${_('Rent')}</div> + <div class="act_as_cell amount">${_('Salary')}<br />${_('Net')}</div> </div> </div> <div class="act_as_tbody"> %for slip in sorted(department[1], key=lambda slip: slip.employee_id.name): <div class="act_as_row lines"> - ## cedula + ## Id card <div class="act_as_cell first_column" style="width: 85px;">${slip.employee_id.identification_id or ''}</div> - ## nombre + ## name <div class="act_as_cell">${slip.employee_id.name or '0'}</div> - ## nh + ## bank account + <div class="act_as_cell">${slip.employee_id.bank_account_id.acc_number or ' '}</div> + ## hn <div class="act_as_cell amount">${get_hn(slip.worked_days_line_ids) or '0'}</div> - ## eh + ## hr <div class="act_as_cell amount">${get_he(slip.worked_days_line_ids) or '0'}</div> ## basic <div class="act_as_cell amount">${formatLang(get_basic(slip.line_ids)) or '0'}</div> ## exs <div class="act_as_cell amount">${formatLang(get_exs(slip.line_ids)) or '0'}</div> - ## otros - <div class="act_as_cell amount">${ '0.00'}</div> ## gross <div class="act_as_cell amount ">${formatLang(get_gross(slip.line_ids)) or '0'}</div> ## ccss <div class="act_as_cell amount">${formatLang(get_ccss(slip.line_ids)) or '0'}</div> - ## RENTA + ## RENT <div class="act_as_cell amount">${formatLang(get_rent(slip.line_ids)) or '0'}</div> - ## otros - <div class="act_as_cell amount">${ '0.00'}</div> - ## NETOS + ## NET <div class="act_as_cell amount">${formatLang(get_net(slip.line_ids)) or '0'}</div> <% - ## Totales por Departamento + ## Totals by Departament total_hn_dep += get_hn(slip.worked_days_line_ids) total_he_dep += get_he(slip.worked_days_line_ids) total_fe_dep += get_fe(slip.worked_days_line_ids) @@ -121,7 +118,7 @@ total_net_dep += get_net(slip.line_ids) total_emp_dep += 1 - ## Totales Generales + ## Totals total_hn += get_hn(slip.worked_days_line_ids) total_he += get_he(slip.worked_days_line_ids) total_fe += get_fe(slip.worked_days_line_ids) @@ -140,16 +137,15 @@ <div class="act_as_tfoot"> <div class="act_as_row labels" style="font-weight: bold; font-size: 11x"> <div class="act_as_cell first_column">${_('Total')}</div> - <div class="act_as_cell">${total_emp_dep} Empleados</div> + <div class="act_as_cell">${total_emp_dep} ${_('Employees')}</div> + <div class="act_as_cell"> </div> <div class="act_as_cell amount">${total_hn_dep}</div> <div class="act_as_cell amount">${total_he_dep}</div> <div class="act_as_cell amount">${formatLang(total_basic_dep)}</div> <div class="act_as_cell amount">${formatLang(total_exs_dep)}</div> - <div class="act_as_cell amount">${_('0.00')}</div> <div class="act_as_cell amount">${formatLang(total_gross_dep)}</div> <div class="act_as_cell amount">${formatLang(total_ccss_dep)}</div> <div class="act_as_cell amount">${formatLang(total_rent_dep)}</div> - <div class="act_as_cell amount">${_('0.00')}</div> <div class="act_as_cell amount">${formatLang(total_net_dep)}</div> </div> </div> @@ -160,8 +156,9 @@ <div class="act_as_table list_table " style="margin-top: 20px;"> <div class="act_as_tfoot"> <div class="act_as_row labels" style="font-weight: bold; font-size: 11px;"> - <div class="act_as_cell first_column" style="width: 85px; font-size: 12px; text-align: left">${_('TOTAL GENERAL')}</div> - <div class="act_as_cell" style="width: 230px;">${total_emp} Empleados</div> + <div class="act_as_cell first_column" style="width: 85px; font-size: 12px; text-align: left">${_('TOTAL')}</div> + <div class="act_as_cell" style="width: 230px;">${total_emp} ${_('Employees')}</div> + <div class="act_as_cell"> </div> <div class="act_as_cell amount" style="width: 40px;">${total_hn}</div> <div class="act_as_cell amount" style="width: 40px;">${total_he}</div> <div class="act_as_cell amount">${formatLang(total_basic)}</div> @@ -179,9 +176,9 @@ <div class="act_as_table data_table" style="margin-top:30px"> <div class="act_as_tbody"> <div class="act_as_row" style="vertical-align: bottom"> - <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'HECHO POR:'}</div> - <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'REVISADO POR:'}</div> - <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'APROBADO POR:'}</div> + <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'BY:'}</div> + <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'REVIEWED BY:'}</div> + <div class="act_as_cell" style="padding-top:80px;padding-bottom:5px">${'APPROVED BY:'}</div> </div> </div> </div> === modified file 'l10n_cr_hr_payroll/report/payroll_report.py' --- l10n_cr_hr_payroll/report/payroll_report.py 2012-08-23 15:42:03 +0000 +++ l10n_cr_hr_payroll/report/payroll_report.py 2012-08-23 20:27:25 +0000 @@ -1,35 +1,23 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# -# payment_receipt -# First author: Mag Guevara <[email protected]> (ClearCorp S.A.) -# Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, are -# permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this list of -# conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this list -# of conditions and the following disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are those of the -# authors and should not be interpreted as representing official policies, either expressed -# or implied, of ClearCorp S.A.. -# +# OpenERP, Open Source Management Solution +# Addons modules by CLEARCORP S.A. +# Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# ############################################################################## import time
_______________________________________________ Mailing list: https://launchpad.net/~clearcorp Post to : [email protected] Unsubscribe : https://launchpad.net/~clearcorp More help : https://help.launchpad.net/ListHelp
