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