odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] l10n_fr_hr_payroll: fixed design of payslip report 

Improvements were requested in Issue 626112 like splitting columns, and the second table was broken so I also fixed it
This commit is contained in:
David Monjoie 2015-02-09 11:48:57 +01:00
parent 4fd8e40ff7
commit 3babbbe393
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml
View File

@ -33,7 +33,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-4"> <div>
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<td> <td>
@ -44,16 +44,18 @@
<span>Niveau :</span><br/> <span>Niveau :</span><br/>
<span>Coef :</span><br/> <span>Coef :</span><br/>
<span>Entrée :</span><br/> <span>Entrée :</span><br/>
<span>Sortie :</span><br/>
<span>ORG. S.S :</span> <span>ORG. S.S :</span>
</td> </td>
<td> <td>
<span t-esc="o.employee_id.id or '_'"/><br/>
<span t-esc="o.employee_id.ssnid or '_'"/><br/> <span t-esc="o.employee_id.ssnid or '_'"/><br/>
<span t-esc="o.contract_id.job_id or '_'"/><br/> <span t-esc="o.contract_id.job_id.name or '_'"/><br/>
<span t-esc="o.contract_id.qualif or '_'"/><br/> <span t-esc="o.contract_id.qualif or '_'"/><br/>
<span t-esc="o.contract_id.niveau or '_'"/><br/> <span t-esc="o.contract_id.niveau or '_'"/><br/>
<span t-esc="o.contract_id.coef or '_'"/><br/> <span t-esc="o.contract_id.coef or '_'"/><br/>
<span t-esc="o.contract_id.date_start or '_'"/> Sortie :<br/> <span t-esc="o.contract_id.date_start or '_'"/><br/>
<span t-esc="o.contract_id.date_end or ''"/><br/> <span t-esc="o.contract_id.date_end or '_'"/><br/>
<span t-esc="o.employee_id.company_id.org_ss or '_'"/> <span t-esc="o.employee_id.company_id.org_ss or '_'"/>
</td> </td>
</tr> </tr>
@ -63,18 +65,22 @@
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
<th>Code</th>
<th>Désignation</th> <th>Désignation</th>
<th>Quantité / Base</th> <th>Quantité / Base</th>
<th>Taux</th> <th>Taux</th>
<th>Montant</th> <th>Montant</th>
<th colspan="2">Charges Patronales</th> <th>Taux Charges Patronales</th>
<th>Montant Charges Patronales</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr t-foreach="get_payslip_lines(o.line_ids)" t-as="p"> <tr t-foreach="get_payslip_lines(o.line_ids)" t-as="p">
<td> <td>
<span t-esc="p.code or ''"/> <span t-esc="p.code or ''"/>
<span t-esc="p.name or ''" class="col-xs-offset-1"/> </td>
<td>
<span t-esc="p.name or ''"/>
</td> </td>
<td> <td>
<t t-if="p.amount_select== 'percentage'"> <t t-if="p.amount_select== 'percentage'">
@ -94,7 +100,9 @@
</td> </td>
<td> <td>
<span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/> <span t-esc="get_employer_line(o, p) and get_employer_line(o, p).rate or ''"/>
<span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/> </td>
<td>
<span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
</td> </td>
</tr> </tr>
</tbody> </tbody>