FIX ADD detalles varios totales, currency

static/src/js/reports/report_pos.js

@@ -322,7 +322,7 @@ function report_pos(reporting){
                         journal_id: order[0].journal_id[0],
                         journal_name: order[0].journal_id[1],
                         user: item.user_id[1],
-                        store_id : store[0].store_ids[0]
+                        store_id : store[0].store_ids[0],
                     });
                 }
             });
@@ -456,6 +456,7 @@ function report_pos(reporting){
 
         drawPDF: function (getColumns,rows) {
             var self = this;
+            var rowsPdf=[];
             var desde =(this.$el.find('#from').val());
             var hasta =(this.$el.find('#to').val());
             var totalPagesExp = "{total_pages_count_string}";
@@ -469,7 +470,7 @@ function report_pos(reporting){
                     partner : {columnWidth: '8px'},
                     date_invoice : {columnWidth: '8px'},
                     amount_total : {halign:'right',columnWidth: '8px'},
-                    namejournal : {columnWidth: '6px'},
+                    journal_name: {columnWidth: '6px'},
                     user : {halign:'left',columnWidth: '8px'},
                 },
                 margin: { top: 16, horizontal: 7},

static/src/js/reports/report_pos_orders.js

@@ -506,7 +506,7 @@ function report_pos_orders(reporting){
                             category_id : product.categ_id.id,
                             attribute_ids : product.attribute_ids,
                             attribute_value_ids : product.atribute_value_ids,
-                            partner_id : order.partner_id[0]
+                            partner_id : order.partner_id[0],
                         });
                     }
                 }
@@ -791,6 +791,7 @@ function report_pos_orders(reporting){
 
         drawPDF: function (getColumns,rows) {
             var self = this;
+            var rowsPdf=[];
             var desde =(this.$el.find('#from').val());
             var hasta =(this.$el.find('#to').val());
             var totalPagesExp = "{total_pages_count_string}";
@@ -811,9 +812,8 @@ function report_pos_orders(reporting){
                         price_tot : {halign:'right' },
                         standar_tot : {halign:'right' },
                         utility : {halign:'right'},
-                        attribute_id : {halign:'left'},
-                        attribute_name : {halign:'left'},
                     },
+
                 margin: { top: 16, horizontal: 7},
                 addPageContent: function (data) {
                     pdfDoc.setFontSize(12);

static/src/js/reports/report_sale_cab.js

@@ -222,7 +222,7 @@ function report_sale_cab(reporting){
             var self = this;
             var defer = $.Deferred();
             var field = ['id', 'name','store_ids'];
-            var domain = [['active','=',true]];
+            var domain = [['active','=',true],['type','in',['sale','bank','cash']]];
             var AccountJournal = new instance.web.Model('account.journal');
             AccountJournal.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);

static/src/js/reports/report_sale_pos_cab.js

@@ -155,6 +155,12 @@ function report_sale_pos_cab(reporting){
                 return self.fecthResUser();
             }).then(function (ResUser) {
                 self.ResUser = ResUser;
+                return self.fecthCompanyCurrency();
+            }).then(function(resCompany){
+                self.resCompany = resCompany;
+                return self.fetchResCurrency();
+            }).then(function(ResCurrency){
+                self.ResCurrency = ResCurrency;
                 self.search();
                 self.searchUser();
                 return self.BuildTable();
@@ -209,6 +215,18 @@ function report_sale_pos_cab(reporting){
             }
         },
 
+        fecthCompanyCurrency: function(){
+            var self = this;
+            var defer = $.Deferred();
+            var field=['id','name', 'currency_id'];
+            var domain = [['id', '=', self.session.company_id]];
+            var ResCompany = new instance.web.Model('res.company');
+            ResCompany.query(field).filter(domain).all().then(function(results){
+                defer.resolve(results);
+            });
+            return defer;
+        },
+
         fecthResStore: function(){
             var self = this;
             var defer = $.Deferred();
@@ -224,7 +242,7 @@ function report_sale_pos_cab(reporting){
             var self = this;
             var defer = $.Deferred();
             var field = ['id', 'name','store_ids'];
-            var domain = [['active','=',true],['type','in',['sale','purchase']]];
+            var domain = [['active','=',true],['type','in',['sale','bank','cash']]];
             var AccountJournal = new instance.web.Model('account.journal');
             AccountJournal.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);
@@ -259,6 +277,18 @@ function report_sale_pos_cab(reporting){
             });
         },
 
+        fetchResCurrency : function(){
+            var self = this;
+            var defer = $.Deferred();
+            var fields = ['id','name', 'symbol', 'rate_silent', 'base', 'decimal_separator', 'decimal_places', 'thousands_separator', 'symbol_position'];
+            var domain = [['active', '=', true]];
+            var ResCurrency = new instance.web.Model('res.currency');
+            ResCurrency.query(fields).filter(domain).all().then(function(results) {
+                defer.resolve(results);
+            });
+            return defer;
+        },
+
         fecthAccountJournalPos: function(){
             var self = this;
             var defer = $.Deferred();
@@ -411,6 +441,13 @@ function report_sale_pos_cab(reporting){
             });
         },
 
+        getResCurrency: function (id) {
+            var self = this;
+            return _.filter(self.ResCurrency,function (item) {
+                return item.id === id;
+            })
+        },
+
         getSaleOrder:function(partner_id) {
             var self = this;
             return _.flatten(_.filter(self.invoices,function (inv) {
@@ -420,6 +457,7 @@ function report_sale_pos_cab(reporting){
 
         BuildTable: function(){
             var self = this;
+            var CurrencyBase = self.getResCurrency(self.resCompany[0].currency_id[0]).shift();
             var invoices = self.invoices;
             var PosOrder = self.PosOrder;
             var order = [];
@@ -428,6 +466,7 @@ function report_sale_pos_cab(reporting){
             var amount_total_total = 0;
             _.each(invoices, function(item){
                 order = self.getSaleOrder(item.user_id[0]);
+                var currency = self.getResCurrency(item.currency_id[0]).shift();
                 store= self.getAccountJournal(item.journal_id[0]);
                 if(order.length > 0 & store.length > 0){
                     data.push({
@@ -439,7 +478,7 @@ function report_sale_pos_cab(reporting){
                         amount_total: accounting.formatNumber(item.amount_total,0,".",","),
                         date: moment(item.date_invoice).format("YYYY-MM-DD"),
                         partner_id : item.partner_id[0],
-                        amount : item.amount_total,
+                        amount : (item.amount_total),
                         journal_id: item.journal_id[0],
                         journal_name: item.journal_id[1],
                         user_id : item.user_id[0],

static/src/js/reports/report_sales_invoice_analysis.js

@@ -270,7 +270,7 @@ function report_sales_invoice_analysis (reporting){
             var self = this;
             var defer = $.Deferred();
             var field = ['id', 'name','store_ids'];
-            var domain = [['active','=',true]];
+            var domain = [['active','=',true],['type','in',['sale','bank','cash']]];
             var AccountJournal = new model.web.Model('account.journal');
             AccountJournal.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);
@@ -547,8 +547,9 @@ function report_sales_invoice_analysis (reporting){
                 }
 
           }
+          this.rowsData=data;
           self.content = data;
-          this.loadTable(data);
+          this.loadTable(data)
         },
 
         fectSearch: function(){
@@ -801,7 +802,6 @@ function report_sales_invoice_analysis (reporting){
                 return map.currency_id[1];
             });
 
-
             pdfDoc.autoTable(getColumns, rows, {
                 styles: { overflow: 'linebreak', fontSize: 7, columnWidth: 'wrap'},
                 columnStyles: {
@@ -837,7 +837,7 @@ function report_sales_invoice_analysis (reporting){
                       }
                         pdfDoc.setFontSize(10);
                         pdfDoc.setFontStyle('bold');
-                        pdfDoc.setTextColor(40)
+                        pdfDoc.setTextColor(40);
                         pdfDoc.text(fecha, data.settings.margin.left,14);
                     }
                     // FOOTER

static/src/js/reports/report_ventas_pos_orders.js

@@ -287,7 +287,7 @@ function report_ventas_pos_orders(reporting){
             var self = this;
             var defer = $.Deferred();
             var field = ['id', 'name','store_ids'];
-            var domain = [['active','=',true],['type','in',['sale']]];
+            var domain = [['active','=',true],['type','in',['sale','bank','cash']]];
             var AccountJournal = new model.web.Model('account.journal');
             AccountJournal.query(field).filter(domain).all().then(function(results){
                 defer.resolve(results);