Prechádzať zdrojové kódy

[FIX] ajuste en el ranking de vendedores

Rodney Elpidio Enciso Arias 6 rokov pred
rodič
commit
61694e2fcf

+ 1 - 1
static/src/js/charts/chart_ranking_product.js

@@ -159,7 +159,7 @@ function chart_ranking_product (widget) {
             }));
             var desde = moment().format('YYYY-MM-01');
             var hasta = moment().add(1,'months').format('YYYY-MM-01');
-            var fields = ['id', 'invoice_line', 'date_invoice'];
+            var fields = ['id', 'invoice_line', 'date_invoice','journal_id'];
             var domain = [['date_invoice', '>=', desde],['date_invoice', '<', hasta],['state', 'in', ['open','paid']],['journal_id','in',journal_ids],['type','=','out_invoice']];
             var AccountInvoice = new model.web.Model('account.invoice');
             AccountInvoice.query(fields).filter(domain).all().then(function (results) {

+ 6 - 2
static/src/js/charts/chart_ranking_salesman.js

@@ -111,9 +111,12 @@ function chart_ranking_salesman (widget) {
             var defer = $.Deferred();
             var modules = self.checkModel('point_of_sale');
             if (modules.length > 0){
+                var journal_ids = _.flatten(_.map(self.AccountJournal, function (item) {
+                    return item.id;
+                }));
                 var date = moment().add(-1, 'month').format('YYYY-MM-23 00:00:00');
-                var fields = ['id','date_order','partner_id','amount_total','user_id'];
-                var domain = [['state', 'in', ['paid','done','invoiced']],['date_order','>=',date]];
+                var fields = ['id','date_order','partner_id','amount_total','user_id','sale_journal'];
+                var domain = [['state', 'in', ['paid','done','invoiced']],['date_order','>=',date],['sale_journal','in',journal_ids]];
                 var PosOrder = new model.web.Model('pos.order');
                 PosOrder.query(fields).filter(domain).all().then(function (results) {
                     defer.resolve(results);
@@ -193,6 +196,7 @@ function chart_ranking_salesman (widget) {
             var PosOrder;
             var AccountInvoice;
             var ranking = [];
+            console.log(self);
             var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
             for (var i = 0; i < self.ResUser.length; i++) {
                 var data = [];