Retocar impresión de 2ca factura común y presupuesto

factura_comun_2ca.xml

@@ -10,6 +10,27 @@
         file="factura_comun_2ca.report_factura_2ca"
      />
 
+     <record id="paperformat_lowmargin" model="report.paperformat">
+          <field name="name">Hoja 2ca</field>
+          <field name="default" eval="True" />
+          <field name="format">custom</field>
+          <field name="page_height">150</field>
+          <field name="page_width">193</field>
+          <field name="orientation">Portrait</field>
+          <field name="margin_top">11</field>
+          <field name="margin_bottom">3</field>
+          <field name="margin_left">3</field>
+          <field name="margin_right">3</field>
+          <field name="header_line" eval="False" />
+          <field name="header_spacing">3</field>
+          <field name="dpi">90</field>
+     </record>
+
+     <record id="factura_comun_2ca.factura_comun_2ca" model="ir.actions.report.xml">
+         <field name="paperformat_id" ref="factura_comun_2ca.paperformat_lowmargin" />
+     </record>
+
+
     <template id="report_factura_2ca">
         <t t-call="report.html_container">
 			    <!-- <t t-foreach="[1,2]" t-as="i"> -->
@@ -28,6 +49,10 @@
                             padding-right: 1cm;
                             height: 15cm;
                         }
+                        .cabecera{
+                            width:6cm;
+                            width: 100%;
+                        }
                         .descripcion{
                             width: 11.2cm;
                             font-size: 13px;
@@ -188,10 +213,16 @@
                     </style>
                     <t t-foreach="docs" t-as="o">
                         <div class="pagina">
+                            <div class="cabecera"> </div>
                             <div class="divisoria"> </div>
-                            <div style="border:0.3px solid #000;"></div>
                             <div class="divisoria"> </div>
-                            <div class="row">
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <!-- <div class="row">
                                 <div class="col-xs-6">
     								<center>
     									<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 250px;max-width: 80px;"/>
@@ -232,9 +263,9 @@
     								</tr>
                                 </div>
 
-                            </div>
+                            </div> -->
                             <div class="divisoria"> </div>
-                            <div style="border:0.3px solid #000;"></div>
+                            <!-- <div style="border:0.3px solid #000;"></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>
@@ -272,7 +303,7 @@
                                             <span t-esc="'%.0f'%l.quantity"/>
                                         </td>
                                         <td class="art-col2">
-                                           <span t-field="l.name"/>
+                                           <span t-field="l.product_id.name"/>
                                         </td>
                                         <td class="art-col3">
                                             <t t-if="o.currency_id.id == 166">

factura_venta_2ca.xml

@@ -10,9 +10,29 @@
         file="factura_comun_2ca.report_presupuesto_2ca"
      />
 
+     <record id="paperformat_lowmargin" model="report.paperformat">
+          <field name="name">Hoja 2ca</field>
+          <field name="default" eval="True" />
+          <field name="format">custom</field>
+          <field name="page_height">150</field>
+          <field name="page_width">193</field>
+          <field name="orientation">Portrait</field>
+          <field name="margin_top">11</field>
+          <field name="margin_bottom">3</field>
+          <field name="margin_left">3</field>
+          <field name="margin_right">3</field>
+          <field name="header_line" eval="False" />
+          <field name="header_spacing">3</field>
+          <field name="dpi">90</field>
+     </record>
+
+     <record id="factura_comun_2ca.factura_venta_2ca" model="ir.actions.report.xml">
+         <field name="paperformat_id" ref="factura_comun_2ca.paperformat_lowmargin" />
+     </record>
+
     <template id="report_presupuesto_2ca">
         <t t-call="report.html_container">
-			<t t-foreach="[1,2]" t-as="i">
+			<t t-foreach="[1]" t-as="i">
                 <div class="page">
                     <style type="text/css">
                         body{
@@ -25,6 +45,10 @@
                         .pagina{
                             width:19.3cm;
                         }
+                        .cabecera{
+                            width:6cm;
+                            width: 100%;
+                        }
                         .descripcion{
                             width: 0.3cm;
                             font-size: 13px;
@@ -163,29 +187,16 @@
                             text-align: center;
                         }
                         .art-col2{
-							padding-left: 0.7cm;
-                            width:1cm;
-                            text-align: center;
-                        }
-                        .art-col3{
                             padding-left: 0.3cm;
                             width:9cm;
                         }
-                        .art-col4{
-                            width:0.9cm;
-                            text-align: right;
-                        }
-                        .art-col5{
+                        .art-col3{
                             width:2.8cm;
                             text-align: right;
                         }
-                        .art-col6{
+                        .art-col4{
                             width:2.7cm;
                             text-align: right;
-                        }
-                        .art-col7{
-                            width:1.5cm;
-                            text-align: right;
                         }
 						.logo1{
                             height: 2cm;
@@ -197,10 +208,17 @@
                     </style>
                     <t t-foreach="docs" t-as="o">
                         <div class="pagina">
+                            <div class="cabecera"> </div>
                             <div class="divisoria"> </div>
-                            <div style="border:0.3px solid #000;"></div>
+                            <!-- <div style="border:0.3px solid #000;"></div> -->
                             <div class="divisoria"> </div>
-                            <div class="row">
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <div class="divisoria"> </div>
+                            <!-- <div class="row">
                                 <div class="col-xs-6">
     								<center>
     									<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 250px;max-width: 80px;"/>
@@ -241,9 +259,9 @@
     								</tr>
                                 </div>
 
-                            </div>
+                            </div> -->
                             <div class="divisoria"> </div>
-                            <div style="border:0.3px solid #000;"></div>
+                            <!-- <div style="border:0.3px solid #000;"></div> -->
                             <div class="divisoria"> </div>
                             <div class="linea3">
                                 <div class="fecha_emision_data"><b>Fecha de Presupuesto: </b><span t-field="o.create_date" t-field-options='{"format": "dd MMMM yyyy"}'/></div>
@@ -281,7 +299,7 @@
                                             <span t-esc="'%.0f'%l.product_uom_qty"/>
                                         </td>
                                         <td class="art-col2">
-                                           <span t-field="l.name"/>
+                                           <span t-field="l.product_id.name"/>
                                         </td>
                                         <td class="art-col3">
                                             <t t-if="o.currency_id.id == 166">