浏览代码

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

Sebas 5 年之前
父节点
当前提交
e73f9ef1cc
共有 2 个文件被更改,包括 39 次插入23 次删除
  1. 21 14
      factura_comun_2ca.xml
  2. 18 9
      factura_venta_2ca.xml

+ 21 - 14
factura_comun_2ca.xml

@@ -186,23 +186,26 @@
                             width: 14cm;
                         }
                         .art-col1{
-                            width:1.9cm;
+                            width:0.4cm;
                             text-align: center;
                         }
                         .art-col2{
-                            padding-left: 0.3cm;
-                            width:11cm;
+                            padding-left: 0.8cm;
+                            width:1cm;
+                            text-align: center;
                         }
                         .art-col3{
                             padding-left: 0.3cm;
-                            text-align: right;
-                            width:5cm;
+                            width:9cm;
                         }
                         .art-col4{
-                            width:3.4cm;
+                            width:2.8cm;
+                            text-align: right;
+                        }
+                        .art-col5{
+                            width:2.7cm;
                             text-align: right;
                         }
-
 						.logo1{
                             height: 2cm;
                             width: 100%;
@@ -291,21 +294,25 @@
                             <table class="table table-condensed table-bordered">
                                 <thead>
                                     <tr>
-                                        <th class="art-col1">Cantidad</th>
-                                        <th class="art-col2">Descripción</th>
-                                        <th class="art-col3">Prec. Unitario</th>
-                                        <th class="art-col4">Sub Total</th>
+                                        <th class="art-col1">Código</th>
+                                        <th class="art-col2">Cantidad</th>
+                                        <th class="art-col3">Descripción</th>
+                                        <th class="art-col4">Prec. Unitario</th>
+                                        <th class="art-col5">Sub Total</th>
                                     </tr>
                                </thead>
                                <tbody class="sale_tbody">
                                     <tr t-foreach="o.invoice_line" t-as="l">
                                         <td class="art-col1">
-                                            <span t-esc="'%.0f'%l.quantity"/>
+                                            <span t-field="l.product_id.default_code"/>
                                         </td>
                                         <td class="art-col2">
-                                           <span t-field="l.product_id.name"/>
+                                           <span t-esc="'%.0f'%l.product_uom_qty"/>
                                         </td>
                                         <td class="art-col3">
+                                           <span t-field="l.product_id.name"/>
+                                        </td>
+                                        <td class="art-col4">
                                             <t t-if="o.currency_id.id == 166">
                                                 <span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
                                             </t>
@@ -314,7 +321,7 @@
                                             </t>
                                         </td>
 
-                                        <td class="art-col4">
+                                        <td class="art-col5">
                                             <t t-if="o.currency_id.id == 166">
                                                 <span t-esc="'{0:,.0f}'.format(l.price_unit*l.quantity)"/>
                                             </t>

+ 18 - 9
factura_venta_2ca.xml

@@ -187,14 +187,19 @@
                             text-align: center;
                         }
                         .art-col2{
+                            padding-left: 0.8cm;
+                            width:1cm;
+                            text-align: center;
+                        }
+                        .art-col3{
                             padding-left: 0.3cm;
                             width:9cm;
                         }
-                        .art-col3{
+                        .art-col4{
                             width:2.8cm;
                             text-align: right;
                         }
-                        .art-col4{
+                        .art-col5{
                             width:2.7cm;
                             text-align: right;
                         }
@@ -287,21 +292,25 @@
                             <table class="table table-condensed table-bordered">
                                 <thead>
                                     <tr>
-                                        <th class="art-col1">Cantidad</th>
-                                        <th class="art-col2">Descripción</th>
-                                        <th class="art-col3">Prec. Unitario</th>
-                                        <th class="art-col4">Sub Total</th>
+                                        <th class="art-col1">Código</th>
+                                        <th class="art-col2">Cantidad</th>
+                                        <th class="art-col3">Descripción</th>
+                                        <th class="art-col4">Prec. Unitario</th>
+                                        <th class="art-col5">Sub Total</th>
                                     </tr>
                                </thead>
                                <tbody class="sale_tbody">
                                     <tr t-foreach="o.order_line" t-as="l">
                                         <td class="art-col1">
-                                            <span t-esc="'%.0f'%l.product_uom_qty"/>
+                                            <span t-field="l.product_id.default_code"/>
                                         </td>
                                         <td class="art-col2">
-                                           <span t-field="l.product_id.name"/>
+                                           <span t-esc="'%.0f'%l.product_uom_qty"/>
                                         </td>
                                         <td class="art-col3">
+                                           <span t-field="l.product_id.name"/>
+                                        </td>
+                                        <td class="art-col4">
                                             <t t-if="o.currency_id.id == 166">
                                                 <span t-esc="'{0:,.0f}'.format(l.price_unit)"/>
                                             </t>
@@ -310,7 +319,7 @@
                                             </t>
                                         </td>
 
-                                        <td class="art-col4">
+                                        <td class="art-col5">
                                             <t t-if="o.currency_id.id == 166">
                                                 <span t-esc="'{0:,.0f}'.format(l.price_unit*l.product_uom_qty)"/>
                                             </t>