|
@@ -2,12 +2,12 @@
|
|
<openerp>
|
|
<openerp>
|
|
<data>
|
|
<data>
|
|
|
|
|
|
- <report id="report_saleorder_document1"
|
|
|
|
- model="sale.order"
|
|
|
|
- string="Presupuesto de Venta"
|
|
|
|
|
|
+ <report id="report_accountinvoice_document1"
|
|
|
|
+ model="account.invoice"
|
|
|
|
+ string="Nota de Venta"
|
|
report_type="qweb-html"
|
|
report_type="qweb-html"
|
|
- name="factura_venta_gavilan.report_presupuesto_gavilan"
|
|
|
|
- file="factura_venta_gavilan.report_presupuesto_gavilan"
|
|
|
|
|
|
+ name="factura_venta_gavilan.report_factura_gavilan"
|
|
|
|
+ file="factura_venta_gavilan.report_factura_gavilan"
|
|
/>
|
|
/>
|
|
|
|
|
|
|
|
|
|
@@ -28,7 +28,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- <template id="report_presupuesto_gavilan">
|
|
|
|
|
|
+ <template id="report_factura_gavilan">
|
|
<t t-call="report.external_layout">
|
|
<t t-call="report.external_layout">
|
|
<div class="page">
|
|
<div class="page">
|
|
<style type="text/css">
|
|
<style type="text/css">
|
|
@@ -280,11 +280,11 @@
|
|
</tr>
|
|
</tr>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
- <div class="col-xs-8">
|
|
|
|
|
|
+ <!-- <div class="col-xs-8">
|
|
<center>
|
|
<center>
|
|
<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 240px;max-width: 80px;"/>
|
|
<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 240px;max-width: 80px;"/>
|
|
</center>
|
|
</center>
|
|
- </div>
|
|
|
|
|
|
+ </div> -->
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
|
|
@@ -292,14 +292,14 @@
|
|
|
|
|
|
<h2>
|
|
<h2>
|
|
<center>
|
|
<center>
|
|
- <span>Presupuesto N° </span>
|
|
|
|
|
|
+ <span>NOTA DE VENTA N° </span>
|
|
<span t-field="o.name"/>
|
|
<span t-field="o.name"/>
|
|
</center>
|
|
</center>
|
|
</h2>
|
|
</h2>
|
|
|
|
|
|
<table class="table table-condensed table-bordered">
|
|
<table class="table table-condensed table-bordered">
|
|
<tr>
|
|
<tr>
|
|
- <td class="fecha_emision_data"><b>Fecha: </b><span t-field="o.date_order" t-field-options='{"format": "dd MMMM yyyy"}'/></td>
|
|
|
|
|
|
+ <td class="fecha_emision_data"><b>Fecha: </b><span t-field="o.date_invoice" t-field-options='{"format": "dd MMMM yyyy"}'/></td>
|
|
<td class="vendor"><b>Vendedor: </b><span t-field="o.user_id.name"/></td>
|
|
<td class="vendor"><b>Vendedor: </b><span t-field="o.user_id.name"/></td>
|
|
</tr>
|
|
</tr>
|
|
<tr>
|
|
<tr>
|
|
@@ -331,7 +331,7 @@
|
|
<tbody class="sale_tbody">
|
|
<tbody class="sale_tbody">
|
|
<tr t-foreach="o.order_line" t-as="l">
|
|
<tr t-foreach="o.order_line" t-as="l">
|
|
<td class="art-col1">
|
|
<td class="art-col1">
|
|
- <span t-esc="'%.0f'%l.product_uom_qty"/>
|
|
|
|
|
|
+ <span t-esc="'%.0f'%l.quantity"/>
|
|
</td>
|
|
</td>
|
|
<td class="art-col2">
|
|
<td class="art-col2">
|
|
<span t-field="l.name"/>
|
|
<span t-field="l.name"/>
|
|
@@ -340,7 +340,7 @@
|
|
<span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
|
|
<span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
|
|
</td>
|
|
</td>
|
|
<td class="art-col4">
|
|
<td class="art-col4">
|
|
- <span t-esc="'{0:,.0f}'.format(l.price_unit*l.product_uom_qty)"/>
|
|
|
|
|
|
+ <span t-esc="'{0:,.0f}'.format(l.price_unit*l.quantity)"/>
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
</tbody>
|
|
</tbody>
|
|
@@ -362,7 +362,7 @@
|
|
|
|
|
|
<div class="divisoria"> </div>
|
|
<div class="divisoria"> </div>
|
|
|
|
|
|
- <p t-field="o.note"/>
|
|
|
|
|
|
+ <!-- <p t-field="o.note"/>
|
|
<p t-if="o.payment_term.note">
|
|
<p t-if="o.payment_term.note">
|
|
<strong>Condición de Pago:</strong>
|
|
<strong>Condición de Pago:</strong>
|
|
<span t-field="o.payment_term.note"/>
|
|
<span t-field="o.payment_term.note"/>
|
|
@@ -374,13 +374,9 @@
|
|
<p>
|
|
<p>
|
|
<strong>Garantia:</strong>
|
|
<strong>Garantia:</strong>
|
|
<span t-field="o.payment_term.note"/>
|
|
<span t-field="o.payment_term.note"/>
|
|
- </p>
|
|
|
|
|
|
+ </p> -->
|
|
|
|
+
|
|
|
|
|
|
- <div>
|
|
|
|
- <center>
|
|
|
|
- <strong>Validez del presente presupuesto 15 días</strong>
|
|
|
|
- </center>
|
|
|
|
- </div>
|
|
|
|
<div class="divisoria"> </div>
|
|
<div class="divisoria"> </div>
|
|
<div>
|
|
<div>
|
|
<center>
|
|
<center>
|