[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:
parent
4fd8e40ff7
commit
3babbbe393
|
@ -33,7 +33,7 @@
|
|||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<div>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<td>
|
||||
|
@ -44,16 +44,18 @@
|
|||
<span>Niveau :</span><br/>
|
||||
<span>Coef :</span><br/>
|
||||
<span>Entrée :</span><br/>
|
||||
<span>Sortie :</span><br/>
|
||||
<span>ORG. S.S :</span>
|
||||
</td>
|
||||
<td>
|
||||
<span t-esc="o.employee_id.id 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.niveau 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_end or ''"/><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.employee_id.company_id.org_ss or '_'"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
@ -63,18 +65,22 @@
|
|||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Code</th>
|
||||
<th>Désignation</th>
|
||||
<th>Quantité / Base</th>
|
||||
<th>Taux</th>
|
||||
<th>Montant</th>
|
||||
<th colspan="2">Charges Patronales</th>
|
||||
<th>Taux Charges Patronales</th>
|
||||
<th>Montant Charges Patronales</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr t-foreach="get_payslip_lines(o.line_ids)" t-as="p">
|
||||
<td>
|
||||
<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>
|
||||
<t t-if="p.amount_select== 'percentage'">
|
||||
|
@ -94,7 +100,9 @@
|
|||
</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).total or ''"/>
|
||||
</td>
|
||||
<td>
|
||||
<span t-esc="get_employer_line(o,p) and get_employer_line(o,p).total or ''"/>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
Loading…
Reference in New Issue