|
@@ -510,7 +510,7 @@ function report_libro_venta_pos(reporting){
|
|
var invoices = self.invoices;
|
|
var invoices = self.invoices;
|
|
var PosOrder = self.PosOrder;
|
|
var PosOrder = self.PosOrder;
|
|
var order = [];
|
|
var order = [];
|
|
- var partner;
|
|
|
|
|
|
+ var partner = [];
|
|
var data = [];
|
|
var data = [];
|
|
var store = [];
|
|
var store = [];
|
|
var amount_total_total = 0;
|
|
var amount_total_total = 0;
|
|
@@ -540,7 +540,7 @@ function report_libro_venta_pos(reporting){
|
|
pago = '';
|
|
pago = '';
|
|
pago_name= '';
|
|
pago_name= '';
|
|
}
|
|
}
|
|
- if(order.length > 0 & store.length > 0){
|
|
|
|
|
|
+ if(order.length > 0 & store.length > 0 & partner.length > 0){
|
|
data.push({
|
|
data.push({
|
|
id : item.id,
|
|
id : item.id,
|
|
number: item.number,
|
|
number: item.number,
|
|
@@ -560,6 +560,8 @@ function report_libro_venta_pos(reporting){
|
|
amount : (item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
amount : (item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
journal_id: item.journal_id[0],
|
|
journal_id: item.journal_id[0],
|
|
journal_name: item.journal_id[1],
|
|
journal_name: item.journal_id[1],
|
|
|
|
+ ref_iva : 0,
|
|
|
|
+ ref_renta : 0,
|
|
user_id : item.user_id[0],
|
|
user_id : item.user_id[0],
|
|
user: item.user_id[1],
|
|
user: item.user_id[1],
|
|
store_id : store[0].store_ids[0]
|
|
store_id : store[0].store_ids[0]
|
|
@@ -570,6 +572,7 @@ function report_libro_venta_pos(reporting){
|
|
_.each(PosOrder, function(item){
|
|
_.each(PosOrder, function(item){
|
|
order = self.getStatementLine(item.id);
|
|
order = self.getStatementLine(item.id);
|
|
store = self.getAccountJournalPos(item.sale_journal[0]);
|
|
store = self.getAccountJournalPos(item.sale_journal[0]);
|
|
|
|
+ partner= self.getResPartner(item.partner_id[0]);
|
|
var pricelist = self.getProductPricelist(item.pricelist_id[0]).shift();
|
|
var pricelist = self.getProductPricelist(item.pricelist_id[0]).shift();
|
|
var currency = self.getResCurrency(pricelist.currency_id[0]).shift();
|
|
var currency = self.getResCurrency(pricelist.currency_id[0]).shift();
|
|
var untaxed = 0;
|
|
var untaxed = 0;
|
|
@@ -581,7 +584,7 @@ function report_libro_venta_pos(reporting){
|
|
untaxed = accounting.formatNumber((item.amount_total-item.amount_tax),"","");
|
|
untaxed = accounting.formatNumber((item.amount_total-item.amount_tax),"","");
|
|
iva_10 = accounting.formatNumber(item.amount_tax,"","");
|
|
iva_10 = accounting.formatNumber(item.amount_tax,"","");
|
|
}
|
|
}
|
|
- if(order.length > 0 & store.length > 0){
|
|
|
|
|
|
+ if(order.length > 0 & store.length > 0 & partner.length > 0){
|
|
var utc = moment.utc(item.create_date,'YYYY-MM-DD h:mm:ss A');
|
|
var utc = moment.utc(item.create_date,'YYYY-MM-DD h:mm:ss A');
|
|
var date = moment(utc._d).format('DD/MM/YYYY h:mm A');
|
|
var date = moment(utc._d).format('DD/MM/YYYY h:mm A');
|
|
var date_aux=moment(utc._d).format('YYYY-MM-DD');
|
|
var date_aux=moment(utc._d).format('YYYY-MM-DD');
|
|
@@ -599,12 +602,15 @@ function report_libro_venta_pos(reporting){
|
|
amount_total: accounting.formatNumber((item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),0,".",","),
|
|
amount_total: accounting.formatNumber((item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),0,".",","),
|
|
date: date_aux,
|
|
date: date_aux,
|
|
partner_id : item.partner_id[0],
|
|
partner_id : item.partner_id[0],
|
|
|
|
+ ruc: partner[0].ruc,
|
|
amount : (item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
amount : (item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
journal_id: order[0].journal_id[0],
|
|
journal_id: order[0].journal_id[0],
|
|
journal_name: order[0].journal_id[1],
|
|
journal_name: order[0].journal_id[1],
|
|
tax : (iva_10 * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
tax : (iva_10 * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
untaxed : (untaxed * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
untaxed : (untaxed * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
exentas: (exentas * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
exentas: (exentas * (CurrencyBase.rate_silent/currency.rate_silent)),
|
|
|
|
+ ref_iva : 0,
|
|
|
|
+ ref_renta : 0,
|
|
user_id : item.user_id[0],
|
|
user_id : item.user_id[0],
|
|
user: item.user_id[1],
|
|
user: item.user_id[1],
|
|
store_id : store[0].store_ids[0]
|
|
store_id : store[0].store_ids[0]
|
|
@@ -781,8 +787,8 @@ function report_libro_venta_pos(reporting){
|
|
amount_tax : {halign:'right',columnWidth: 17},
|
|
amount_tax : {halign:'right',columnWidth: 17},
|
|
amount_untaxed : {halign:'right',columnWidth: 17},
|
|
amount_untaxed : {halign:'right',columnWidth: 17},
|
|
amount_exentas : {halign:'right',columnWidth: 17},
|
|
amount_exentas : {halign:'right',columnWidth: 17},
|
|
- ref_iva : {columnWidth: 8},
|
|
|
|
- ref_renta : {columnWidth: 8},
|
|
|
|
|
|
+ ref_iva : {halign:'right',columnWidth: 8},
|
|
|
|
+ ref_renta : {halign:'right',columnWidth: 8},
|
|
amount_total : {halign:'right',columnWidth: 17},
|
|
amount_total : {halign:'right',columnWidth: 17},
|
|
journal_name : {columnWidth: 15},
|
|
journal_name : {columnWidth: 15},
|
|
user : {halign:'left',columnWidth: 14},
|
|
user : {halign:'left',columnWidth: 14},
|