|
|
@@ -216,14 +216,14 @@
|
|
|
width: 6.5cm;
|
|
|
float: left;
|
|
|
padding-top: 0.6cm;
|
|
|
- padding-left: 4.7cm;
|
|
|
+ padding-left: 4.3cm;
|
|
|
min-height: 0.25cm;
|
|
|
}
|
|
|
.iva_10_data{
|
|
|
width: 6.5cm;
|
|
|
float: left;
|
|
|
padding-top: 0.6cm;
|
|
|
- padding-left: 2.5cm;
|
|
|
+ padding-left: 2.8cm;
|
|
|
min-height: 0.25cm;
|
|
|
}
|
|
|
.iva_total_data{
|
|
|
@@ -285,39 +285,37 @@
|
|
|
<span t-if="'IVA 5% Venta' in [ilt.name for ilt in l.invoice_line_tax_id] and 'IVA 10% Venta' not in [ilt.name for ilt in l.invoice_line_tax_id]">
|
|
|
<span t-esc="l.quantity * l.price_unit">
|
|
|
<span t-value="valor_5+(l.quantity * l.price_unit)"/></span>
|
|
|
+ <t t-set="valor_5" t-value="valor_5+(l.quantity * l.price_unit)"/>
|
|
|
</span>
|
|
|
</td>
|
|
|
<td class="art-col6">
|
|
|
<span t-if="'IVA 10% Venta' in [ilt.name for ilt in l.invoice_line_tax_id]">
|
|
|
<span t-esc="l.quantity * l.price_unit" >
|
|
|
<span t-value="valor_10+(l.quantity * l.price_unit)"/></span>
|
|
|
+ <t t-set="valor_10" t-value="valor_10+(l.quantity * l.price_unit)"/>
|
|
|
</span>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
- <t t-set="total_5" t-value="0"/>
|
|
|
- <t t-set="total_10" t-value="0"/>
|
|
|
+ <t t-set="iva_5" t-value="0"/>
|
|
|
+ <t t-set="iva_10" t-value="0"/>
|
|
|
<div class="subtotal_data"> </div>
|
|
|
<div class="subtotal_excentas"> </div>
|
|
|
<div class="subtotal_5">
|
|
|
- <span t-if="'IVA 5% Venta' in [ilt.name for ilt in o.tax_line]">
|
|
|
- <span t-esc="o.amount_total">
|
|
|
- <span t-value="total_5+(o.amount_total)"/></span>
|
|
|
- </span>
|
|
|
+ <span t-esc="valor_5"></span>
|
|
|
+ <t t-set="iva_5" t-value="valor_5/21" />
|
|
|
</div>
|
|
|
<div class="subtotal_10">
|
|
|
- <span t-if="'IVA 10% Venta' in [ilt.name for ilt in o.tax_line]">
|
|
|
- <span t-esc="o.amount_total">
|
|
|
- <span t-value="total_10+(o.amount_total)"/></span>
|
|
|
- </span>
|
|
|
+ <span t-esc="valor_10"></span>
|
|
|
+ <t t-set="iva_10" t-value="valor_10/11" />
|
|
|
</div>
|
|
|
|
|
|
<div class="total_pagar_data"><span t-esc="convertir(o.amount_total,o.currency_id.en_letras)"/></div>
|
|
|
- <div class="total_pagar"><span t-field="o.amount_total"/></div>
|
|
|
+ <div class="total_pagar"><span t-esc="o.amount_total"/></div>
|
|
|
|
|
|
- <div class="iva_5_data"> </div>
|
|
|
- <div class="iva_10_data"><span t-field="o.amount_tax"/></div>
|
|
|
+ <div class="iva_5_data"><span t-esc="'%.2f'%iva_5"></span></div>
|
|
|
+ <div class="iva_10_data"><span t-esc="'%.2f'%iva_10"></span></div>
|
|
|
<div class="iva_total_data"><span t-field="o.amount_tax"/></div>
|
|
|
</div>
|
|
|
<div class="logo1"> </div>
|
Sebas