Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report into lp:openerp-ccorp-addons.
Requested reviews: CLEARCORP drivers (clearcorp-drivers) For more details, see: https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report/+merge/133274 [FIX] Fix report for landscape to portrait [FIX] Fix diferents styles and information for the report -- https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report/+merge/133274 Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== modified file 'hr_payroll_report/__init__.py' --- hr_payroll_report/__init__.py 2012-10-26 21:07:11 +0000 +++ hr_payroll_report/__init__.py 2012-11-07 15:20:37 +0000 @@ -20,4 +20,5 @@ # ############################################################################## -import report \ No newline at end of file +import report +import hr_payroll_report \ No newline at end of file === added file 'hr_payroll_report/hr_payroll_report.py' --- hr_payroll_report/hr_payroll_report.py 1970-01-01 00:00:00 +0000 +++ hr_payroll_report/hr_payroll_report.py 2012-11-07 15:20:37 +0000 @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# 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/>. +# +############################################################################## + +from osv import fields,osv + +class res_company(osv.osv): + _name = 'res.company' + _inherit = 'res.company' + + _columns = { + 'payslip_footer':fields.text('Payslip footer'), + } +res_company() + + + \ No newline at end of file === modified file 'hr_payroll_report/hr_payroll_report_report.xml' --- hr_payroll_report/hr_payroll_report_report.xml 2012-10-29 20:29:43 +0000 +++ hr_payroll_report/hr_payroll_report_report.xml 2012-11-07 15:20:37 +0000 @@ -8,8 +8,23 @@ name="hr_payroll_payslip_inherit" file="hr_payroll_report/report/hr_payroll_report.mako" string="Employee PaySlip" - report_type="webkit" - /> - + report_type="webkit" /> + + <record id="view_company_form_inherit" model="ir.ui.view"> + <field name="name">res.company.form.inherit</field> + <field name="model">res.company</field> + <field name="type">form</field> + <field name="inherit_id" ref="base.view_company_form"/> + <field name="arch" type="xml"> + <data> + <page string="Internal Header/Footer" position="after"> + <page string="Configuration Report" groups="base.group_extended"> + <field colspan="2" name="payslip_footer"/> + </page> + </page> + </data> + </field> + </record> </data> </openerp> + === modified file 'hr_payroll_report/report/hr_payroll_report.mako' --- hr_payroll_report/report/hr_payroll_report.mako 2012-10-29 17:41:24 +0000 +++ hr_payroll_report/report/hr_payroll_report.mako 2012-11-07 15:20:37 +0000 @@ -38,33 +38,43 @@ <body class = "data"> %for payslip in objects : <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;"> Comprobante pago de salario</div> + <div style="font-size: 25px; font-weight: bold; text-align: center;"> Comprobante de Pago de Salario</div> <%setLang(user.context_lang)%> <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${payslip.name or payslip.employee_id.name}</div> <br></br> - <div class="act_as_table list_table"> + <div class="act_as_table data_table" style="width: 500px;"> <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="vertical-align: middle">${_('Name')}</div> - <div class="act_as_cell">${_('ID card')}</div> - <div class="act_as_cell">${_('Bank account')}</div> - <div class="act_as_cell">${_('Job')}</div> - <div class="act_as_cell">${_('Reference')}</div> - <div class="act_as_cell">${_('Date from')}</div> - <div class="act_as_cell">${_('Date to')}</div> - <div class="act_as_cell">${_('Salary structure')}</div> - </div> - </div> - <div class="act_as_tbody"> <div class="act_as_row lines"> - <div class="act_as_cell">${payslip.employee_id.name or '-'}</div> - <div class="act_as_cell">${payslip.employee_id.ssnid or '-'}</div> - <div class="act_as_cell">${payslip.employee_id.bank_account_id.name or '-'}</div> - <div class="act_as_cell">${payslip.contract_id.job_id.name or '-'}</div> - <div class="act_as_cell">${payslip.number or '-'}</div> - <div class="act_as_cell">${payslip.date_from or '-'}</div> - <div class="act_as_cell">${payslip.date_to or '-'}</div> - <div class="act_as_cell">${payslip.struct_id.name or '-'}</div> + <div class="act_as_cell" style="text-align:left;"><b>${_('Name')}</b></div> + <div class="act_as_cell" style="text-align:left;">${payslip.employee_id.name or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('ID card')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.ssnid or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Bank account')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.employee_id.bank_account_id.name or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Job')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.contract_id.job_id.name or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Reference')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.number or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Date from')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.date_from or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Date to')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.date_to or '-'}</div> + </div> + <div class="act_as_row lines"> + <div class="act_as_cell"style="text-align:left;"><b>${_('Salary structure')}</b></div> + <div class="act_as_cell"style="text-align:left;">${payslip.struct_id.name or '-'}</div> </div> </div> </div> @@ -119,8 +129,7 @@ <div class="act_as_cell first_column" style="vertical-align: middle">${_('Name')}</div> <div class="act_as_cell">${_('Code')}</div> <div class="act_as_cell">${_('Category')}</div> - <div class="act_as_cell amount">${_('Quantity')}</div> - <div class="act_as_cell amount">${_('Rate')}</div> + <div class="act_as_cell amount">${_('Base')}</div> <div class="act_as_cell amount">${_('Amount')}</div> <div class="act_as_cell amount">${_('Total')}</div> </div> @@ -133,16 +142,15 @@ <div class="act_as_cell">${line.code or '-'}</div> <div class="act_as_cell">${line.category_id.name or '-'}</div> <div class="act_as_cell amount">${line.quantity or '-'}</div> - <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(line.rate) or '-'}</div> <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(line.amount) or '-'}</div> <div class="act_as_cell amount">${company.currency_id.symbol}${formatLang(line.total) or '-'}</div> </div> %endfor </div> </div> - <br></br> <br></br> <br></br> <br></br> <br></br> + <br></br> <br></br> <br></br> <br></br> <br></br><br></br><br></br> <div class="act_as_table data_table" style="margin-top:30px"> - <div class="act_as_tbody"> + <div class="act_as_tbody"> <div class="act_as_row" style="vertical-align: bottom"> <div style="padding-bottom:5px">___________________________________________________________</div> </div> @@ -152,9 +160,13 @@ <div class="act_as_row" style="vertical-align: bottom"> <div style="padding-bottom:5px">${_('ID card: ')}${payslip.employee_id.ssnid}</div> </div> + <br></br> <br></br><br></br><br></br> + <div class="act_as_row" style="text-align:justify;text-justify:inter-word;"> + <div style="padding-bottom:5px">${company.payslip_footer}</div> + </div> </div> </div> - %endfor + %endfor </div> <p style="page-break-after:always"></p> </body>
_______________________________________________ Mailing list: https://launchpad.net/~clearcorp Post to : [email protected] Unsubscribe : https://launchpad.net/~clearcorp More help : https://help.launchpad.net/ListHelp
