瀏覽代碼

Agregar descuento en la impresión de orden de trabajo.

sebas 3 年之前
父節點
當前提交
4b656f1b03
共有 1 個文件被更改,包括 27 次插入45 次删除
  1. 27 45
      orden_trabajo_tag.xml

+ 27 - 45
orden_trabajo_tag.xml

@@ -329,55 +329,37 @@
                                 </tbody>
                             </table>
 
-                            <div class="row">
-                                <div class="col-xs-12 pull-right">
-                                    <table class="table table-condensed">
-                                        <td class="art-col1"><b>Totales: </b></td>
-                                        <td class="art-col3"></td>
-                                        <td class="art-col4"></td>
-                                        <td class="art-col5">
-                                            <span t-esc="'{0:,.0f}'.format(int(valor_mat)).replace(',', '.')"></span>
-                                        </td>
-                                    </table>
-                                 </div>
-                            </div>
+                            <table class="table table-condensed table-bordered">
+                              <tr>
+                                <td class="art-col1"><b>Subtotal: </b></td>
+                                    <td class="art-col3"></td>
+                                    <td class="art-col4"></td>
+                                    <td class="art-col5">
+                                        <span t-esc="'{0:,.0f}'.format(int(valor_mat)).replace(',', '.')"></span>
+                                  </td>
+                               </tr>
+                               <tr>
+                                 <td class="art-col1"><b>Descuento: </b></td>
+                                 <td class="art-col3"></td>
+                                 <td class="art-col4"></td>
+                                 <td class="art-col5">
+                                     <span t-esc="'{0:,.0f}'.format(int(o.amount_discount)).replace(',', '.')"></span>
+                                 </td>
+                               </tr>
+                                <tr>
+                                   <td class="art-col1"><b>Total: </b></td>
+                                   <td class="art-col3"></td>
+                                   <td class="art-col4"></td>
+                                   <td class="art-col5">
+                                       <span t-esc="'{0:,.0f}'.format(int(valor_mat-o.amount_discount)).replace(',', '.')"></span>
+                                   </td>
+                                 </tr>
+                            </table>
 
                             <div class="row">
                                 <div class="col-xs-4 pull-right">
                                     <table class="table table-condensed">
-                                        <!-- <tr class="border-black">
-                                            <td><strong>Total s/ IVA</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</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>