Browse Source

Módificar impresión para nota de venta Tropishop

SEBAS 4 tháng trước cách đây
mục cha
commit
d6f13ea9dd
3 tập tin đã thay đổi với 421 bổ sung421 xóa
  1. 1 1
      __init__.py
  2. 201 218
      factura_venta_tropishop.xml
  3. 219 202
      factura_venta_tropishop2.xml

+ 1 - 1
__init__.py

@@ -19,4 +19,4 @@
 ###################################################################################
 # Product Brand is an Openobject module wich enable Brand management for products #
 ###################################################################################
-from . import factura_venta_tropishop, nota_credito_tropishop, account_invoice, res_currency
+from . import factura_venta_tropishop2, nota_credito_tropishop, account_invoice, res_currency

+ 201 - 218
factura_venta_tropishop.xml

@@ -2,23 +2,37 @@
 <openerp>
 <data>
 
-     <report id="factura_comun_tropishop"
+     <report id="factura_venta_tropishop"
         model="account.invoice"
-        string="Factura Comun"
+        string="Factura Legal"
         report_type="qweb-html"
-        name="factura_comun_tropishop.report_factura_tropishop"
-        file="factura_comun_tropishop.report_factura_tropishop"
+        name="factura_venta_tropishop.report_factura_tropishop"
+        file="factura_venta_tropishop.report_factura_tropishop"
      />
 
+    <template id="report_header_custom" inherit_id="report.external_layout_header">
+         <xpath expr="//div[@class='header']" position="replace">
+            <div class ="header">
+            </div>
+         </xpath>
+    </template>
+
+    <template id="external_layout_footer" inherit_id="report.external_layout_footer">
+        <xpath expr="//div[@class='footer']"  position="replace">
+            <div class ="footer">
+            </div>
+        </xpath>
+    </template>
+
     <template id="report_factura_tropishop">
         <t t-call="report.html_container">
-            <!-- <t t-call="report.external_layout"> -->
-			    <t t-foreach="[1,2]" t-as="i">
+            <t t-call="report.external_layout">
+			    <t t-foreach="[1,2,3]" t-as="i">
                 <div class="page">
                     <style type="text/css">
                         body{
-                            font-size: 3mm;
-                            font-family: Arial;
+                            font-size: 2.67mm;
+                            font-family: Arial, Helvetica, sans-serif;
                         }
                         div{
                             padding: 0px;
@@ -26,308 +40,277 @@
                         .pagina{
                             width:19.3cm;
                         }
-                        .descripcion1{
-                            width: 11.2cm;
-                            font-size: 13px;
-                            padding-top: 0.2cm;
-                            float: left;
-                            min-height: 0cm;
-                        }
-
-                        .descripcion2{
-                            width: 13cm;
-                            font-size: 10px;
-                            float: left;
-                            min-height: 0cm;
-                        }
-
-                        .descripcion3{
-                            width: 15cm;
-                            font-size: 10px;
-                            float: left;
-                            min-height: 0cm;
-                        }
-                        .descripcion4{
-                            width: 15cm;
-                            font-size: 10px;
-                            float: left;
-                            min-height: 0cm;
-                        }
-                        .email{
-                            width: 13cm;
-                            font-size: 10px;
-                            float: left;
-                            min-height: 0cm;
-                        }
-                        .ciudad{
-                            width: 13cm;
-                            float: left;
-                            font-size: 10px;
-                            min-height: 0cm;
-                        }
-                        .tel{
-                            width: 13cm;
-                            float: left;
-                            font-size: 10px;
-                            min-height: 0cm;
-                        }
-                        .table-condensed>tbody>tr>td {
-                            padding: 1px !important;
-                        }
-                        .divisoria{
-                            height: 0.5cm;
-                            clear: both;
+                        .logo{
+                            height: 0.6cm;
+                            width: 100%;
+                            top: 0px;
                         }
                         .fecha_emision_data{
-                            width: 11.5cm;
+                            width: 13.1cm;
+                            padding-left: 8.9cm;
                             float: left;
-                            min-height: 0.5cm;
+                            min-height: 0.6cm;
                         }
                         .contado_x{
-                            width: 1.8cm;
+                            width: 0.4cm;
                             float: left;
-                            padding-left: 9cm;
-                            min-height: 0.5cm;
+                            padding-left: 0.0cm;
+                            min-height: 0.6cm;
                         }
                         .credito_x{
-                            width: 1.8cm;
+                            width: 0.2cm;
                             float: left;
-                            padding-left: 1.6cm;
-                            min-height: 0.5cm;
+                            padding-left: 0.5cm;
+                            min-height: 0.4cm;
                         }
                         .linea2{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.5cm;
+                            min-height: 0.4cm;
                          }
                         .razon_data{
-                            width: 12cm;
-                            float: left;
-                            min-height: 0.4cm;
-                        }
-                        .ruc_data{
-                            width: 5cm;
+                            width: 15cm;
                             float: left;
+                            padding-left: 9.9cm;
                             min-height: 0.5cm;
                         }
                         .linea3{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.3cm;
+                            min-height: 0.4cm;
                          }
                         .direccion_data{
-                            width: 14cm;
+                            width: 13.5cm;
                             float: left;
-                            min-height: 0.4cm;
+                            padding-left: 9.7cm;
+                            min-height: 0.5cm;
                         }
                         .linea4{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.3cm;
+                            min-height: 0.4cm;
+                         }
+                         .ruc_data{
+                             width: 11.9cm;
+                             float: left;
+                             padding-left: 9.1cm;
+                             min-height: 0.4cm;
                          }
                         .telefono_data{
-                            width: 10cm;
+                            width: 6.8cm;
                             float: left;
-                            min-height: 0.4cm;
+                            padding-left: 2.3cm;
+                            min-height: 0.5cm;
                         }
-
+                        .linea5{
+                            position: relative;
+                            top: -0.12cm;
+                            min-height: 0.4cm;
+                         }
                         .nota_remision_data{
-                            width: 4cm;
+                            width: 8.3cm;
                             float: left;
-                            min-height: 0.4cm;
+                            padding-left: 2.5cm;
+                            min-height: 0.5cm;
                         }
 
                         .cab-articulos{
-                            height: 0.4cm;
+                            height: 0.7cm;
                             clear: both;
                         }
                         .articulos{
-                            height: 4.5cm;
+                            height: 3.65cm;
                         }
                         .art-col1{
-                            width:0.4cm;
+                            width:0.9cm;
                             text-align: center;
                         }
                         .art-col2{
-							padding-left: 0.7cm;
+						                padding-left: 0.8cm;
                             width:1cm;
                             text-align: center;
                         }
                         .art-col3{
-                            padding-left: 0.3cm;
-                            width:9cm;
+                            padding-left: 1cm;
+                            width:9.4cm;
                         }
                         .art-col4{
-                            width:0.9cm;
+                            width:1.9cm;
                             text-align: right;
                         }
                         .art-col5{
-                            width:2.8cm;
+                            width:2.2cm;
                             text-align: right;
                         }
                         .art-col6{
-                            width:2.7cm;
+                            width:2.3cm;
                             text-align: right;
                         }
                         .art-col7{
-                            width:1.5cm;
+                            width:1.9cm;
                             text-align: right;
                         }
-						.logo1{
-                            height: 2cm;
+						           .logo1{
+                            height: 3.48cm;
                             width: 100%;
                             top: 0px;
                         }
-
+                        .logo2{
+                             height: 3.46cm;
+                             width: 100%;
+                             top: 0px;
+                         }
+                        .subtotal_data{
+                            width: 6cm;
+                            float: left;
+                            padding-top: 0.002cm;
+                            padding-left: 2.3cm;
+                            min-height: 0.2cm;
+                        }
+                        .subtotal_excentas{
+                            width: 1.8cm;
+                            float: left;
+                            text-align: right;
+							              padding-left: 10cm;
+                            padding-top: 0.7cm;
+                            min-height: 0.2cm;
+                        }
+                        .subtotal_5{
+                            width: 1cm;
+                            float: left;
+							              padding-left: 1cm;
+                            text-align: right;
+                            padding-top: 0.7cm;
+                            min-height: 0.2cm;
+                        }
+                        .subtotal_10{
+                            width: 2.3cm;
+                            float: left;
+							              padding-left: 0.8cm;
+                            text-align: left;
+                            padding-top: 0.7cm;
+                            min-height: 0.2cm;
+                        }
+                        .total_pagar_data{
+                            width: 16.4cm;
+                            float: left;
+                            padding-top: 0.01mm;
+                            padding-left: 4.8cm;
+                            min-height: 0.3cm;
+                        }
+                        .total_pagar{
+                            width: 2.3cm;
+                            float: right;
+                            padding-top: 0.01mm;
+                            padding-left: 0.8cm;
+                            min-height: 0.3cm;
+                        }
+                        .iva_5_data{
+                            width: 5cm;
+                            float: left;
+                            padding-left: 4.7cm;
+                            min-height: 0.25cm;
+                        }
+                        .iva_10_data{
+                            width: 5.2cm;
+                            float: left;
+                            padding-left: 3.8cm;
+                            min-height: 0.25cm;
+                        }
+                        .iva_total_data{
+                            width: 7cm;
+                            float: left;
+                            padding-left: 3.3cm;
+                            min-height: 0.25cm;
+                        }
 
                     </style>
                     <t t-foreach="docs" t-as="o">
                         <div class="pagina">
-                            <div class="divisoria"> </div>
-                            <div style="border:0.3px solid #000;"></div>
-                            <div class="divisoria"> </div>
-                            <div class="divisoria"> </div>
-                            <div class="row">
-                                <div class="col-xs-4">
-
-                                    <tr>
-                                        <div class="descripcion1"><b><i>TROPISHOP</i></b></div>
-                                    </tr>
-
-                                    <tr>
-                                        <div class="descripcion2"><b>ELECTRONICA Y ELECTRODOMESTICOS</b></div>
-                                    </tr>
-                          <!--            <tr>
-                                        <div class="descripcion3"><b>SERVICIOS ELÉCTRICOS 24 hs. - MONTAJES INDUSTRIALES</b></div>
-                                    </tr>
-
-                                    <tr>
-                                        <div class="descripcion4"><b>AUTOMATIZACIONES - REFRIGERACIÓN, CCTV, SPLIT</b></div>
-                                    </tr> -->
-                                    <tr>
-                                        <div class="email"><b>[email protected] - R.U.C. N°: </b></div>
-                                    </tr>
-                                    <tr>
-                                        <div class="ciudad"><b>SAN PEDRO - PARAGUAY</b></div>
-                                    </tr>
-                                    <tr>
-                                        <div class="tel"><b>(0983) </b></div>
-                                    </tr>
-
+                            <div class="logo"> </div>
+                            <div class="linea1">
+                                <div class="fecha_emision_data"><span t-field="o.date_invoice" t-field-options='{"format": "dd MMM yyyy"}'/></div>
+                                <div class="contado_x">
+                                    <t t-if="o.contado == True">X</t>
+                                    <t t-if="o.contado == False"></t>
                                 </div>
-                                <div class="col-xs-8">
-                                    <center>
-                                        <img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 150px;max-width: 100px;"/>
-                                    </center>
+                                <div class="credito_x">
+                                    <t t-if="o.credito == True">X</t>
+                                    <t t-if="o.credito == False"></t>
                                 </div>
                             </div>
-                            <div class="cab-articulos"><b>____________________________________________________________________________________________________________________</b></div>
-                            <div class="divisoria"> </div>
-                            <div class="linea3">
-                                <div class="fecha_emision_data"><b>Fecha de Factura: </b><span t-field="o.date_invoice" t-field-options='{"format": "dd MMMM yyyy"}'/></div>
-                            </div>
 
                             <div class="linea2">
-                                <div class="razon_data"><b>Cliente: </b><span t-field="o.partner_id.name"/></div>
-                                <div class="ruc_data"><b>R.U.C N°: </b><span t-field="o.partner_id.ruc"/></div>
+                                <div class="razon_data"><span t-field="o.partner_id.name"/></div>
                             </div>
 
                             <div class="linea3">
                                 <div class="direccion_data">
-                                    <t t-f="o.partner_id.street"><b>Direccion: </b><span t-field="o.partner_id.street"/> <span t-field="o.partner_id.street2"/></t>
+                                    <t t-f="o.partner_id.street"><span t-field="o.partner_id.street"/> <span t-field="o.partner_id.street2"/></t>
                                     <t t-f="not o.partner_id.street"> </t>
                                 </div>
                             </div>
 
                             <div class="linea4">
-                                <div class="telefono_data"><b>Telefono: </b><span t-field="o.partner_id.phone"/></div>
-                                <div class="nota_remision_data"><b>Factura Nº: </b><span t-field="o.name"/></div>
+                                <div class="ruc_data"><span t-field="o.partner_id.ruc"/></div>
+                                <div class="telefono_data"><span t-field="o.partner_id.phone"/></div>
                             </div>
+							              <div class="linea5">
+                            <div class="nota_remision_data"> </div>
+                            </div>
+                            <div class="cab-articulos"> </div>
+                            <div class="articulos">
 
-
-                            <table class="table table-condensed table-bordered">
-                                <thead>
-                                    <tr>
-                                        <th class="text-center">Cantidad</th>
-                                        <th class="text-center">Descripción</th>
-                                        <th class="text-center">Prec. Unitario</th>
-                                        <th class="text-center">Sub Total</th>
-                                    </tr>
-                               </thead>
-                               <tbody class="sale_tbody">
+                                <table class="tab-articulos">
                                     <tr t-foreach="o.invoice_line" t-as="l">
-                                        <td class="text-right">
-                                            <span t-esc="'%.0f'%l.quantity"/>
-                                        </td>
-                                        <td>
-                                           <span t-field="l.name"/>
-                                        </td>
-                                        <td class="text-right">
-                                            <t t-if="o.currency_id.id == 166">
-                                                <span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
-                                            </t>
-                                            <t t-if="o.currency_id.id != 166">
-                                                <span t-esc="'{0:,.2f}'.format(l.price_unit)"/>
-                                            </t>
-                                        </td>
+                                        <td class="art-col1"><span t-field="l.product_id.default_code"/></td>
+                                        <td class="art-col2"><span t-esc="'{0:,.2f}'.format(l.quantity)"/></td>
+                                        <td class="art-col3"><span t-field="l.product_id.name"/></td>
+                                        <td class="art-col4"></td>
+                                        <td class="art-col5"> </td>
+                                        <td class="art-col6"> </td>
+                                        <td class="art-col7"><span t-esc="'{0:,.0f}'.format((l.quantity * l.price_unit))"/></td>
+                                   </tr>
+                                </table>
+                                <table class="tab-articulos1">
+                                  <td class="art-col1"></td>
+                                  <td class="art-col2"></td>
+                                  <td class="art-col3"><t t-if="o.amount_discount != 0"> Descuento: </t></td>
+                                  <td class="art-col4"></td>
+                                  <td class="art-col5"> </td>
+                                  <td class="art-col6"> </td>
+                                  <td class="art-col7">-<span t-esc="'{0:,.0f}'.format(o.amount_discount)"/></td>
+                                   <!-- <tr>
+                                       <t t-if="o.amount_discount != 0">Descuento:                 <span t-esc="'{0:,.0f}'.format(o.amount_discount)"/></t>
+                                    </tr> -->
+                                </table>
+                            </div>
 
-                                        <td class="text-right">
-                                            <t t-if="o.currency_id.id == 166">
-                                                <span t-esc="'{0:,.0f}'.format(l.price_unit*l.quantity)"/>
-                                            </t>
-                                            <t t-if="o.currency_id.id != 166">
-                                                <span t-esc="'{0:,.2f}'.format(l.price_unit*l.quantity)"/>
-                                            </t>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                             <div class="subtotal_data"> </div>
+                             <div class="subtotal_excentas"> </div>
+                             <div class="subtotal_5"> </div>
+                             <td style="font-size:7.0px;">
+                                <div class="subtotal_10"><span t-esc="'{0:,.0f}'.format(o.amount_total)"/></div>
+                            </td>
+                            <div class="total_pagar_data">Gs.: <span t-esc="convertir(o.amount_total,o.currency_id.en_letras)"/></div>
+                            <div class="total_pagar"><span t-esc="'{0:,.0f}'.format(o.amount_total)"/></div>
 
-                            <div class="row">
-                                <div class="col-xs-4 pull-right">
-                                    <table class="table table-condensed">
-                                        <tr class="border-black">
-                                            <td><strong>Monto Gravado</strong></td>
-                                            <td class="text-right">
-                                                <t t-if="o.currency_id.id == 166">
-                                                    <span t-esc="'{0:,.0f}'.format(o.amount_untaxed)"/>
-                                                </t>
-                                                <t t-if="o.currency_id.id != 166">
-                                                    <span t-esc="'{0:,.2f}'.format(o.amount_untaxed)"/>
-                                                </t>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>IVA 10%</td>
-                                            <td class="text-right">
-                                                <t t-if="o.currency_id.id == 166">
-                                                    <span t-esc="'{0:,.0f}'.format(o.amount_tax)"/>
-                                                </t>
-                                                <t t-if="o.currency_id.id != 166">
-                                                    <span t-esc="'{0:,.2f}'.format(o.amount_tax)"/>
-                                                </t>
-                                            </td>
-                                        </tr>
-                                        <tr class="border-black">
-                                            <td><strong>Total</strong></td>
-                                            <td class="text-right">
-                                                <t t-if="o.currency_id.id == 166">
-                                                    <span t-esc="'{0:,.0f}'.format(o.amount_total)"/>
-                                                </t>
-                                                <t t-if="o.currency_id.id != 166">
-                                                    <span t-esc="'{0:,.2f}'.format(o.amount_total)"/>
-                                                </t>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
-                            </div>
+
+                             <div class="iva_5_data"> </div>
+                             <div class="iva_10_data"><span t-esc="'{0:,.0f}'.format(o.amount_tax)"/></div>
+                             <div class="iva_total_data"><span t-esc="'{0:,.0f}'.format(o.amount_tax)"/></div>
                         </div>
-                       <div class="logo1"> </div>
+                        <t t-if="i == 1">
+                          <div class="logo1"> </div>
+                        </t>
+
+                        <t t-if="i == 2">
+                          <div class="logo2"> </div>
+                        </t>
                     </t>
                 </div>
 				</t>
-            <!-- </t> -->
+            </t>
         </t>
     </template>
 

+ 219 - 202
factura_venta_tropishop2.xml

@@ -2,37 +2,23 @@
 <openerp>
 <data>
 
-     <report id="factura_venta_verdufres"
+     <report id="factura_comun_tropishop"
         model="account.invoice"
-        string="Factura Legal"
+        string="Factura Comun"
         report_type="qweb-html"
-        name="factura_venta_verdufres.report_factura_verdufres"
-        file="factura_venta_verdufres.report_factura_verdufres"
+        name="factura_comun_tropishop.report_factura_tropishop"
+        file="factura_comun_tropishop.report_factura_tropishop"
      />
 
-    <template id="report_header_custom" inherit_id="report.external_layout_header">
-         <xpath expr="//div[@class='header']" position="replace">
-            <div class ="header">
-            </div>
-         </xpath>
-    </template>
-
-    <template id="external_layout_footer" inherit_id="report.external_layout_footer">
-        <xpath expr="//div[@class='footer']"  position="replace">
-            <div class ="footer">
-            </div>
-        </xpath>
-    </template>
-
-    <template id="report_factura_verdufres">
+    <template id="report_factura_tropishop">
         <t t-call="report.html_container">
-            <t t-call="report.external_layout">
-			    <t t-foreach="[1,2,3]" t-as="i">
+            <!-- <t t-call="report.external_layout"> -->
+			    <t t-foreach="[1,2]" t-as="i">
                 <div class="page">
                     <style type="text/css">
                         body{
-                            font-size: 2.67mm;
-                            font-family: Arial, Helvetica, sans-serif;
+                            font-size: 3mm;
+                            font-family: Arial;
                         }
                         div{
                             padding: 0px;
@@ -40,277 +26,308 @@
                         .pagina{
                             width:19.3cm;
                         }
-                        .logo{
-                            height: 0.6cm;
-                            width: 100%;
-                            top: 0px;
+                        .descripcion1{
+                            width: 11.2cm;
+                            font-size: 13px;
+                            padding-top: 0.2cm;
+                            float: left;
+                            min-height: 0cm;
+                        }
+
+                        .descripcion2{
+                            width: 13cm;
+                            font-size: 10px;
+                            float: left;
+                            min-height: 0cm;
+                        }
+
+                        .descripcion3{
+                            width: 15cm;
+                            font-size: 10px;
+                            float: left;
+                            min-height: 0cm;
+                        }
+                        .descripcion4{
+                            width: 15cm;
+                            font-size: 10px;
+                            float: left;
+                            min-height: 0cm;
+                        }
+                        .email{
+                            width: 13cm;
+                            font-size: 10px;
+                            float: left;
+                            min-height: 0cm;
+                        }
+                        .ciudad{
+                            width: 13cm;
+                            float: left;
+                            font-size: 10px;
+                            min-height: 0cm;
+                        }
+                        .tel{
+                            width: 13cm;
+                            float: left;
+                            font-size: 10px;
+                            min-height: 0cm;
+                        }
+                        .table-condensed>tbody>tr>td {
+                            padding: 1px !important;
+                        }
+                        .divisoria{
+                            height: 0.5cm;
+                            clear: both;
                         }
                         .fecha_emision_data{
-                            width: 13.1cm;
-                            padding-left: 8.9cm;
+                            width: 11.5cm;
                             float: left;
-                            min-height: 0.6cm;
+                            min-height: 0.5cm;
                         }
                         .contado_x{
-                            width: 0.4cm;
+                            width: 1.8cm;
                             float: left;
-                            padding-left: 0.0cm;
-                            min-height: 0.6cm;
+                            padding-left: 9cm;
+                            min-height: 0.5cm;
                         }
                         .credito_x{
-                            width: 0.2cm;
+                            width: 1.8cm;
                             float: left;
-                            padding-left: 0.5cm;
-                            min-height: 0.4cm;
+                            padding-left: 1.6cm;
+                            min-height: 0.5cm;
                         }
                         .linea2{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.4cm;
+                            min-height: 0.5cm;
                          }
                         .razon_data{
-                            width: 15cm;
+                            width: 12cm;
+                            float: left;
+                            min-height: 0.4cm;
+                        }
+                        .ruc_data{
+                            width: 5cm;
                             float: left;
-                            padding-left: 9.9cm;
                             min-height: 0.5cm;
                         }
                         .linea3{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.4cm;
+                            min-height: 0.3cm;
                          }
                         .direccion_data{
-                            width: 13.5cm;
+                            width: 14cm;
                             float: left;
-                            padding-left: 9.7cm;
-                            min-height: 0.5cm;
+                            min-height: 0.4cm;
                         }
                         .linea4{
                             position: relative;
                             top: -0.12cm;
-                            min-height: 0.4cm;
-                         }
-                         .ruc_data{
-                             width: 11.9cm;
-                             float: left;
-                             padding-left: 9.1cm;
-                             min-height: 0.4cm;
+                            min-height: 0.3cm;
                          }
                         .telefono_data{
-                            width: 6.8cm;
+                            width: 10cm;
                             float: left;
-                            padding-left: 2.3cm;
-                            min-height: 0.5cm;
-                        }
-                        .linea5{
-                            position: relative;
-                            top: -0.12cm;
                             min-height: 0.4cm;
-                         }
+                        }
+
                         .nota_remision_data{
-                            width: 8.3cm;
+                            width: 4cm;
                             float: left;
-                            padding-left: 2.5cm;
-                            min-height: 0.5cm;
+                            min-height: 0.4cm;
                         }
 
                         .cab-articulos{
-                            height: 0.7cm;
+                            height: 0.4cm;
                             clear: both;
                         }
                         .articulos{
-                            height: 3.65cm;
+                            height: 4.5cm;
                         }
                         .art-col1{
-                            width:0.9cm;
+                            width:0.4cm;
                             text-align: center;
                         }
                         .art-col2{
-						                padding-left: 0.8cm;
+							padding-left: 0.7cm;
                             width:1cm;
                             text-align: center;
                         }
                         .art-col3{
-                            padding-left: 1cm;
-                            width:9.4cm;
+                            padding-left: 0.3cm;
+                            width:9cm;
                         }
                         .art-col4{
-                            width:1.9cm;
+                            width:0.9cm;
                             text-align: right;
                         }
                         .art-col5{
-                            width:2.2cm;
+                            width:2.8cm;
                             text-align: right;
                         }
                         .art-col6{
-                            width:2.3cm;
+                            width:2.7cm;
                             text-align: right;
                         }
                         .art-col7{
-                            width:1.9cm;
+                            width:1.5cm;
                             text-align: right;
                         }
-						           .logo1{
-                            height: 3.48cm;
+						.logo1{
+                            height: 2cm;
                             width: 100%;
                             top: 0px;
                         }
-                        .logo2{
-                             height: 3.46cm;
-                             width: 100%;
-                             top: 0px;
-                         }
-                        .subtotal_data{
-                            width: 6cm;
-                            float: left;
-                            padding-top: 0.002cm;
-                            padding-left: 2.3cm;
-                            min-height: 0.2cm;
-                        }
-                        .subtotal_excentas{
-                            width: 1.8cm;
-                            float: left;
-                            text-align: right;
-							              padding-left: 10cm;
-                            padding-top: 0.7cm;
-                            min-height: 0.2cm;
-                        }
-                        .subtotal_5{
-                            width: 1cm;
-                            float: left;
-							              padding-left: 1cm;
-                            text-align: right;
-                            padding-top: 0.7cm;
-                            min-height: 0.2cm;
-                        }
-                        .subtotal_10{
-                            width: 2.3cm;
-                            float: left;
-							              padding-left: 0.8cm;
-                            text-align: left;
-                            padding-top: 0.7cm;
-                            min-height: 0.2cm;
-                        }
-                        .total_pagar_data{
-                            width: 16.4cm;
-                            float: left;
-                            padding-top: 0.01mm;
-                            padding-left: 4.8cm;
-                            min-height: 0.3cm;
-                        }
-                        .total_pagar{
-                            width: 2.3cm;
-                            float: right;
-                            padding-top: 0.01mm;
-                            padding-left: 0.8cm;
-                            min-height: 0.3cm;
-                        }
-                        .iva_5_data{
-                            width: 5cm;
-                            float: left;
-                            padding-left: 4.7cm;
-                            min-height: 0.25cm;
-                        }
-                        .iva_10_data{
-                            width: 5.2cm;
-                            float: left;
-                            padding-left: 3.8cm;
-                            min-height: 0.25cm;
-                        }
-                        .iva_total_data{
-                            width: 7cm;
-                            float: left;
-                            padding-left: 3.3cm;
-                            min-height: 0.25cm;
-                        }
+
 
                     </style>
                     <t t-foreach="docs" t-as="o">
                         <div class="pagina">
-                            <div class="logo"> </div>
-                            <div class="linea1">
-                                <div class="fecha_emision_data"><span t-field="o.date_invoice" t-field-options='{"format": "dd MMM yyyy"}'/></div>
-                                <div class="contado_x">
-                                    <t t-if="o.contado == True">X</t>
-                                    <t t-if="o.contado == False"></t>
+                            <div class="divisoria"> </div>
+                            <div style="border:0.3px solid #000;"></div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="row">
+                                <div class="col-xs-4">
+
+                                    <tr>
+                                        <div class="descripcion1"><b><i>TROPISHOP</i></b></div>
+                                    </tr>
+
+                                    <tr>
+                                        <div class="descripcion2"><b>ELECTRONICA Y ELECTRODOMESTICOS</b></div>
+                                    </tr>
+                          <!--            <tr>
+                                        <div class="descripcion3"><b>SERVICIOS ELÉCTRICOS 24 hs. - MONTAJES INDUSTRIALES</b></div>
+                                    </tr>
+
+                                    <tr>
+                                        <div class="descripcion4"><b>AUTOMATIZACIONES - REFRIGERACIÓN, CCTV, SPLIT</b></div>
+                                    </tr> -->
+                                    <tr>
+                                        <div class="email"><b>[email protected] - R.U.C. N°: </b></div>
+                                    </tr>
+                                    <tr>
+                                        <div class="ciudad"><b>CIUDAD DEL ESTE - PARAGUAY</b></div>
+                                    </tr>
+                                    <tr>
+                                        <div class="tel"><b>(0983) </b></div>
+                                    </tr>
+
                                 </div>
-                                <div class="credito_x">
-                                    <t t-if="o.credito == True">X</t>
-                                    <t t-if="o.credito == False"></t>
+                                <div class="col-xs-8">
+                                    <center>
+                                        <img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 150px;max-width: 100px;"/>
+                                    </center>
                                 </div>
                             </div>
+                            <div class="cab-articulos"><b>____________________________________________________________________________________________________________________</b></div>
+                            <div class="divisoria"> </div>
+                            <div class="linea3">
+                                <div class="fecha_emision_data"><b>Fecha de Factura: </b><span t-field="o.date_invoice" t-field-options='{"format": "dd MMMM yyyy"}'/></div>
+                            </div>
 
                             <div class="linea2">
-                                <div class="razon_data"><span t-field="o.partner_id.name"/></div>
+                                <div class="razon_data"><b>Cliente: </b><span t-field="o.partner_id.name"/></div>
+                                <div class="ruc_data"><b>R.U.C N°: </b><span t-field="o.partner_id.ruc"/></div>
                             </div>
 
                             <div class="linea3">
                                 <div class="direccion_data">
-                                    <t t-f="o.partner_id.street"><span t-field="o.partner_id.street"/> <span t-field="o.partner_id.street2"/></t>
+                                    <t t-f="o.partner_id.street"><b>Direccion: </b><span t-field="o.partner_id.street"/> <span t-field="o.partner_id.street2"/></t>
                                     <t t-f="not o.partner_id.street"> </t>
                                 </div>
                             </div>
 
                             <div class="linea4">
-                                <div class="ruc_data"><span t-field="o.partner_id.ruc"/></div>
-                                <div class="telefono_data"><span t-field="o.partner_id.phone"/></div>
-                            </div>
-							              <div class="linea5">
-                            <div class="nota_remision_data"> </div>
+                                <div class="telefono_data"><b>Telefono: </b><span t-field="o.partner_id.phone"/></div>
+                                <div class="nota_remision_data"><b>Factura Nº: </b><span t-field="o.name"/></div>
                             </div>
-                            <div class="cab-articulos"> </div>
-                            <div class="articulos">
 
-                                <table class="tab-articulos">
-                                    <tr t-foreach="o.invoice_line" t-as="l">
-                                        <td class="art-col1"><span t-field="l.product_id.default_code"/></td>
-                                        <td class="art-col2"><span t-esc="'{0:,.2f}'.format(l.quantity)"/></td>
-                                        <td class="art-col3"><span t-field="l.product_id.name"/></td>
-                                        <td class="art-col4"></td>
-                                        <td class="art-col5"> </td>
-                                        <td class="art-col6"> </td>
-                                        <td class="art-col7"><span t-esc="'{0:,.0f}'.format((l.quantity * l.price_unit))"/></td>
-                                   </tr>
-                                </table>
-                                <table class="tab-articulos1">
-                                  <td class="art-col1"></td>
-                                  <td class="art-col2"></td>
-                                  <td class="art-col3"><t t-if="o.amount_discount != 0"> Descuento: </t></td>
-                                  <td class="art-col4"></td>
-                                  <td class="art-col5"> </td>
-                                  <td class="art-col6"> </td>
-                                  <td class="art-col7">-<span t-esc="'{0:,.0f}'.format(o.amount_discount)"/></td>
-                                   <!-- <tr>
-                                       <t t-if="o.amount_discount != 0">Descuento:                 <span t-esc="'{0:,.0f}'.format(o.amount_discount)"/></t>
-                                    </tr> -->
-                                </table>
-                            </div>
 
-                             <div class="subtotal_data"> </div>
-                             <div class="subtotal_excentas"> </div>
-                             <div class="subtotal_5"> </div>
-                             <td style="font-size:7.0px;">
-                                <div class="subtotal_10"><span t-esc="'{0:,.0f}'.format(o.amount_total)"/></div>
-                            </td>
-                            <div class="total_pagar_data">Gs.: <span t-esc="convertir(o.amount_total,o.currency_id.en_letras)"/></div>
-                            <div class="total_pagar"><span t-esc="'{0:,.0f}'.format(o.amount_total)"/></div>
+                            <table class="table table-condensed table-bordered">
+                                <thead>
+                                    <tr>
+                                        <th class="text-center">Cantidad</th>
+                                        <th class="text-center">Descripción</th>
+                                        <th class="text-center">Prec. Unitario</th>
+                                        <th class="text-center">Sub Total</th>
+                                    </tr>
+                               </thead>
+                               <tbody class="sale_tbody">
+                                    <tr t-foreach="o.invoice_line" t-as="l">
+                                        <td class="text-right">
+                                            <span t-esc="'%.0f'%l.quantity"/>
+                                        </td>
+                                        <td>
+                                           <span t-field="l.name"/>
+                                        </td>
+                                        <td class="text-right">
+                                            <t t-if="o.currency_id.id == 166">
+                                                <span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
+                                            </t>
+                                            <t t-if="o.currency_id.id != 166">
+                                                <span t-esc="'{0:,.2f}'.format(l.price_unit)"/>
+                                            </t>
+                                        </td>
 
+                                        <td class="text-right">
+                                            <t t-if="o.currency_id.id == 166">
+                                                <span t-esc="'{0:,.0f}'.format(l.price_unit*l.quantity)"/>
+                                            </t>
+                                            <t t-if="o.currency_id.id != 166">
+                                                <span t-esc="'{0:,.2f}'.format(l.price_unit*l.quantity)"/>
+                                            </t>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
 
-                             <div class="iva_5_data"> </div>
-                             <div class="iva_10_data"><span t-esc="'{0:,.0f}'.format(o.amount_tax)"/></div>
-                             <div class="iva_total_data"><span t-esc="'{0:,.0f}'.format(o.amount_tax)"/></div>
+                            <div class="row">
+                                <div class="col-xs-4 pull-right">
+                                    <table class="table table-condensed">
+                                        <tr class="border-black">
+                                            <td><strong>Monto Gravado</strong></td>
+                                            <td class="text-right">
+                                                <t t-if="o.currency_id.id == 166">
+                                                    <span t-esc="'{0:,.0f}'.format(o.amount_untaxed)"/>
+                                                </t>
+                                                <t t-if="o.currency_id.id != 166">
+                                                    <span t-esc="'{0:,.2f}'.format(o.amount_untaxed)"/>
+                                                </t>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>IVA 10%</td>
+                                            <td class="text-right">
+                                                <t t-if="o.currency_id.id == 166">
+                                                    <span t-esc="'{0:,.0f}'.format(o.amount_tax)"/>
+                                                </t>
+                                                <t t-if="o.currency_id.id != 166">
+                                                    <span t-esc="'{0:,.2f}'.format(o.amount_tax)"/>
+                                                </t>
+                                            </td>
+                                        </tr>
+                                        <tr class="border-black">
+                                            <td><strong>Total</strong></td>
+                                            <td class="text-right">
+                                                <t t-if="o.currency_id.id == 166">
+                                                    <span t-esc="'{0:,.0f}'.format(o.amount_total)"/>
+                                                </t>
+                                                <t t-if="o.currency_id.id != 166">
+                                                    <span t-esc="'{0:,.2f}'.format(o.amount_total)"/>
+                                                </t>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
                         </div>
-                        <t t-if="i == 1">
-                          <div class="logo1"> </div>
-                        </t>
-
-                        <t t-if="i == 2">
-                          <div class="logo2"> </div>
-                        </t>
+                       <div class="logo1"> </div>
                     </t>
                 </div>
 				</t>
-            </t>
+            <!-- </t> -->
         </t>
     </template>