Ver Fonte

FIX ADD se agregó un nuevo report de libro de ventas para pos y otra para pos y ventas normales juntos

Sebas há 6 anos atrás
pai
commit
1fef7dc0e9

+ 8 - 4
static/src/js/reports/report_libro_pos.js

@@ -496,7 +496,7 @@ function report_libro_pos(reporting){
             var CurrencyBase = self.getResCurrency(self.resCompany[0].currency_id[0]).shift();
             var PosOrder = self.PosOrder;
             var order = [];
-            var partner;
+            var partner = [];
             var data = [];
             var store = [];
             var amount_total_total = 0;
@@ -504,6 +504,7 @@ function report_libro_pos(reporting){
             _.each(PosOrder, function(item){
                 order = self.getStatementLine(item.id);
                 store = self.getAccountJournalPos(item.sale_journal[0]);
+                partner= self.getResPartner(item.partner_id[0]);
                 var pricelist = self.getProductPricelist(item.pricelist_id[0]).shift();
                 var currency = self.getResCurrency(pricelist.currency_id[0]).shift();
                 var untaxed = 0;
@@ -515,7 +516,7 @@ function report_libro_pos(reporting){
                        untaxed = accounting.formatNumber((item.amount_total-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 date = moment(utc._d).format('DD/MM/YYYY h:mm A');
                     var date_aux=moment(utc._d).format('YYYY-MM-DD');
@@ -532,12 +533,15 @@ function report_libro_pos(reporting){
                         amount_total: accounting.formatNumber((item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),0,".",","),
                         date: date_aux,
                         partner_id : item.partner_id[0],
+                        ruc: partner[0].ruc,
                         amount : (item.amount_total * (CurrencyBase.rate_silent/currency.rate_silent)),
                         journal_id: order[0].journal_id[0],
                         journal_name: order[0].journal_id[1],
                         tax : (iva_10 * (CurrencyBase.rate_silent/currency.rate_silent)),
                         untaxed : (untaxed * (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: item.user_id[1],
                         store_id : store[0].store_ids[0]
@@ -713,8 +717,8 @@ function report_libro_pos(reporting){
                     amount_tax : {halign:'right',columnWidth: 18},
                     amount_untaxed : {halign:'right',columnWidth: 18},
                     amount_exentas : {halign:'right',columnWidth: 18},
-                    ref_iva : {columnWidth: 10},
-                    ref_renta : {columnWidth: 10},
+                    ref_iva : {halign:'right',columnWidth: 10},
+                    ref_renta : {halign:'right',columnWidth: 10},
                     amount_total : {halign:'right',columnWidth: 18},
                     journal_name : {columnWidth: 15},
                     user : {halign:'left',columnWidth: 14},

+ 1 - 1
static/src/js/reports/report_libro_venta.js

@@ -448,7 +448,7 @@ function report_libro_venta(reporting){
                     pago = '';
                     pago_name= '';
                 }
-                if(order.length > 0 & store.length > 0){
+                if(order.length > 0 & store.length > 0 & partner.length > 0){
                     data.push({
                         id : item.id,
                         number: item.number,

+ 11 - 5
static/src/js/reports/report_libro_venta_pos.js

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

+ 2 - 2
static/src/reports/report_libro_pos.xml

@@ -99,8 +99,8 @@
                         <th data-field="amount_tax" data-sortable="true" data-align="right">Impuesto</th>
                         <th data-field="amount_exentas" data-sortable="true" data-align="right">Exentas</th>
                         <th data-field="amount_total" data-sortable="true" data-align="right">Total</th>
-                        <th data-field="ref_iva" data-sortable="true">Ref. Iva</th>
-                        <th data-field="ref_renta" data-sortable="true">Ref. Renta</th>
+                        <th data-field="ref_iva" data-sortable="true" data-align="right">Ref. Iva</th>
+                        <th data-field="ref_renta" data-sortable="true" data-align="right">Ref. Renta</th>
                         <th data-field="user" data-sortable="true">Vendedor</th>
                     </tr>
                 </thead>

+ 2 - 2
static/src/reports/report_libro_venta_pos.xml

@@ -100,8 +100,8 @@
                         <th data-field="amount_tax" data-sortable="true" data-align="right">Impuesto</th>
                         <th data-field="amount_exentas" data-sortable="true" data-align="right">Exentas</th>
                         <th data-field="amount_total" data-sortable="true" data-align="right">Total</th>
-                        <th data-field="ref_iva" data-sortable="true">Ref. Iva</th>
-                        <th data-field="ref_renta" data-sortable="true">Ref. Renta</th>
+                        <th data-field="ref_iva" data-sortable="true" data-align="right">Ref. Iva</th>
+                        <th data-field="ref_renta" data-sortable="true" data-align="right">Ref. Renta</th>
                         <th data-field="user" data-sortable="true">Vendedor</th>
                     </tr>
                 </thead>