Bläddra i källkod

Retoque agrehar cantidad de cuotas y utilidad total

Sebas 5 år sedan
förälder
incheckning
7aad52e01b

+ 14 - 2
static/src/js/reports/report_saledecorart_utility_analytic.js

@@ -541,11 +541,14 @@ function report_saledecorart_utility_analytic(reporting){
                               standar_price : accounting.formatNumber((product.standard_price),0, ".", ","),
                               price_tot : accounting.formatNumber((item.quantity * (item.price_unit * (CurrencyBase.rate_silent/currency.rate_silent))),0, ".", ","),
                               standar_tot : accounting.formatNumber((item.quantity * product.standard_price),0, ".", ","),
+                              total_cuota : x,
                               utility : accounting.formatNumber((((item.quantity * (item.price_unit * (CurrencyBase.rate_silent/currency.rate_silent))) - (item.quantity * product.standard_price))/x),0, ".", ","),
+                              utilidad : accounting.formatNumber(((item.quantity * (item.price_unit * (CurrencyBase.rate_silent/currency.rate_silent))) - (item.quantity * product.standard_price)),0, ".", ","),
                               quantity_tot : (item.quantity),
                               price_tot_tot : ((item.quantity * (item.price_unit *(CurrencyBase.rate_silent/currency.rate_silent)))),
                               standar_tot_tot : ((item.quantity * product.standard_price)),
                               utility_tot : ((((item.quantity * (item.price_unit * (CurrencyBase.rate_silent/currency.rate_silent))) - (item.quantity * product.standard_price)))/x),
+                              utilidad_tot : (((item.quantity * (item.price_unit * (CurrencyBase.rate_silent/currency.rate_silent))) - (item.quantity * product.standard_price))),
                               date_create : moment(invoice.date_invoice).format("DD/MM/YYYY"),
                               date_invoice : (invoice.date_invoice),
                               partner_id : invoice.partner_id[0],
@@ -732,12 +735,19 @@ function report_saledecorart_utility_analytic(reporting){
                   return memo + num;
               },0);
 
+              var amount_utilidad_total = _.reduce(_.map(content,function(map){
+                  return(map.utilidad_tot);
+              }),function(memo, num){
+                  return memo + num;
+              },0);
+
               content.push({
                   number: "Totales:",
                   quantity: accounting.formatNumber((quantity_tot_total),0,".",","),
                   price_tot: accounting.formatNumber((price_total_total),0,".",","),
                   standar_tot: accounting.formatNumber((standar_total_total),0,".",","),
                   utility: accounting.formatNumber((amount_total_total),0,".",","),
+                  utilidad: accounting.formatNumber((amount_utilidad_total),0,".",","),
               });
 
               self.loadTable(content)
@@ -833,14 +843,16 @@ function report_saledecorart_utility_analytic(reporting){
                                 date_create :{columnWidth: 17},
                                 partner_name:{columnWidth: 20},
                                 ean13:{columnWidth: 12},
-                                product_name :{columnWidth: 45},
-                                category_name : {columnWidth: 33},
+                                product_name :{columnWidth: 40},
+                                category_name : {columnWidth: 30},
                                 quantity :{halign:'right',columnWidth: 8},
                                 price_unity : {halign:'right',columnWidth: 18},
                                 standar_price : {halign:'right',columnWidth: 18},
                                 price_tot : {halign:'right' ,columnWidth: 18},
                                 standar_tot : {halign:'right' ,columnWidth: 19},
+                                total_cuota : {halign:'right',columnWidth: 17},
                                 utility : {halign:'right',columnWidth: 17},
+                                utilidad : {halign:'right',columnWidth: 17},
                                 user_name : {columnWidth: 15},
                             },
                   margin: { top: 16, horizontal: 7},

+ 3 - 1
static/src/reports/report_saledecorart_utility_analytic.xml

@@ -118,7 +118,9 @@
             <th data-field="standar_price" data-sortable="true" data-align="right">Precio Costo</th>
             <th data-field="price_tot" data-sortable="true" data-align="right">Total Venta</th>
             <th data-field="standar_tot" data-sortable="true" data-align="right">Total Costo</th>
-            <th data-field="utility" data-sortable="true"  data-align="right">Utilidad</th>
+            <th data-field="total_cuota" data-sortable="true"  data-align="right">N° Cuota</th>
+            <th data-field="utility" data-sortable="true"  data-align="right">Util. Mensual</th>
+            <th data-field="utilidad" data-sortable="true"  data-align="right">Util. Total</th>
             <th data-field="user_name" data-sortable="true">Vendedor</th>
           </tr>
         </thead>