[FIX] correcion en los widget de banco y caja

static/src/js/widgets/widget_bank.js

@@ -6,11 +6,7 @@ function widget_bank(widget) {
     widget.WidgetBankWidget = widget.Base.extend({
         template: 'WidgetBank',
 
-        events: {
-            'click .today': 'showToday',
-            'click .thisWeek': 'showThisWeek',
-            'click .thisMonth': 'showThisMonth',
-        },
+        events: {},
 
         init: function (parent) {
             this._super(parent, {
@@ -53,7 +49,7 @@ function widget_bank(widget) {
                 return self.fetchResCurrency();
             }).then(function(ResCurrency) {
                 self.ResCurrency = ResCurrency;
-                return self.showThisMonth();
+                return self.show();
             });
         },
 
@@ -100,7 +96,7 @@ function widget_bank(widget) {
                 return item.id;
             }));
             var fields = ['id', 'name', 'date', 'balance_end'];
-            var domain = [['state', 'in', ['open','confirm']],['journal_id','in',journal_ids]];
+            var domain = [['state', 'in', ['draft','open']],['journal_id','in',journal_ids]];
             var AccountBankStatement = new model.web.Model('account.bank.statement');
             AccountBankStatement.query(fields).filter(domain).all().then(function(results) {
                 defer.resolve(results);
@@ -122,7 +118,7 @@ function widget_bank(widget) {
             return defer;
         },
 
-        fetchResCurrency : function(){
+        fetchResCurrency: function(){
             var self = this;
             var defer = $.Deferred();
             var fields = ['id','name', 'symbol', 'rate_silent', 'base', 'decimal_separator', 'decimal_places', 'thousands_separator', 'symbol_position'];
@@ -141,68 +137,11 @@ function widget_bank(widget) {
             })
         },
 
-        getTodayAccountBankStatement:function() {
-            var self = this;
-            var date = moment().format('YYYY-MM-DD');
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).format('YYYY-MM-DD') === date;
-            }));
-        },
-
-        getThisWeekAccountBankStatement:function() {
-            var self = this;
-            var week = moment().week();
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).week() === week & moment(inv.date).format('YYYY')=== moment().format('YYYY');
-            }));
-        },
-
-        getThisMonthAccountBankStatement:function() {
-            var self = this;
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).format('YYYY-MM')=== moment().format('YYYY-MM');
-            }));
-        },
-
-        showToday: function () {
-            var self = this;
-            var amount = 0;
-            var data = [];
-            var statement = self.getTodayAccountBankStatement();
-            var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
-            if(statement.length > 0){
-                amount = _.reduce(_.map(statement, function (map) {
-                    return map.balance_end;
-                }), function (memo, num) {
-                    return memo + num;
-                });
-            }
-            self.$el.find('.widget-content.widget-loading').css('display','none');
-            self.$el.find('.widget-content').find('a').text(accounting.formatMoney(amount, CurrencyBase.symbol, CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator))
-        },
-
-        showThisWeek: function () {
-            var self = this;
-            var amount = 0;
-            var data = [];
-            var statement = self.getThisWeekAccountBankStatement();
-            var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
-            if(statement.length > 0){
-                amount = _.reduce(_.map(statement, function (map) {
-                    return map.balance_end;
-                }), function (memo, num) {
-                    return memo + num;
-                });
-            }
-            self.$el.find('.widget-content.widget-loading').css('display','none');
-            self.$el.find('.widget-content').find('a').text(accounting.formatMoney(amount, CurrencyBase.symbol, CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator))
-        },
-
-        showThisMonth: function () {
+        show: function () {
             var self = this;
             var amount = 0;
             var data = [];
-            var statement = self.getThisMonthAccountBankStatement();
+            var statement = self.AccountBankStatement;
             var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
             if(statement.length > 0){
                 amount = _.reduce(_.map(statement, function (map) {

static/src/js/widgets/widget_cash.js

@@ -6,11 +6,7 @@ function widget_cash(widget) {
     widget.WidgetCashWidget = widget.Base.extend({
         template: 'WidgetCash',
 
-        events: {
-            'click .today': 'showToday',
-            'click .thisWeek': 'showThisWeek',
-            'click .thisMonth': 'showThisMonth',
-        },
+        events: {},
 
         init: function (parent) {
             this._super(parent, {
@@ -53,7 +49,7 @@ function widget_cash(widget) {
                 return self.fetchResCurrecy();
             }).then(function(ResCurrecy) {
                 self.ResCurrecy = ResCurrecy;
-                return self.showThisMonth();
+                return self.show();
             });
         },
 
@@ -99,7 +95,7 @@ function widget_cash(widget) {
                 return item.id;
             }));
             var fields = ['id', 'name', 'date', 'balance_end'];
-            var domain = [['state', 'in', ['open','confirm']],['journal_id','in',journal_ids]];
+            var domain = [['state', 'in', ['open']],['journal_id','in',journal_ids]];
             var AccountBankStatement = new model.web.Model('account.bank.statement');
             AccountBankStatement.query(fields).filter(domain).all().then(function(results) {
                 defer.resolve(results);
@@ -140,68 +136,11 @@ function widget_cash(widget) {
             })
         },
 
-        getTodayAccountBankStatement:function() {
-            var self = this;
-            var date = moment().format('YYYY-MM-DD');
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).format('YYYY-MM-DD') === date;
-            }));
-        },
-
-        getThisWeekAccountBankStatement:function() {
-            var self = this;
-            var week = moment().week();
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).week() === week & moment(inv.date).format('YYYY')=== moment().format('YYYY');
-            }));
-        },
-
-        getThisMonthAccountBankStatement:function() {
-            var self = this;
-            return _.flatten(_.filter(self.AccountBankStatement,function (inv) {
-                return moment(inv.date).format('YYYY-MM')=== moment().format('YYYY-MM');
-            }));
-        },
-
-        showToday: function () {
-            var self = this;
-            var amount = 0;
-            var data = [];
-            var statement = self.getTodayAccountBankStatement();
-            var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
-            if(statement.length > 0){
-                amount = _.reduce(_.map(statement, function (map) {
-                    return map.balance_end;
-                }), function (memo, num) {
-                    return memo + num;
-                });
-            }
-            self.$el.find('.widget-content.widget-loading').css('display','none');
-            self.$el.find('.widget-content').find('a').text(accounting.formatMoney(amount, CurrencyBase.symbol, CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator))
-        },
-
-        showThisWeek: function () {
-            var self = this;
-            var amount = 0;
-            var data = [];
-            var statement = self.getThisWeekAccountBankStatement();
-            var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
-            if(statement.length > 0){
-                amount = _.reduce(_.map(statement, function (map) {
-                    return map.balance_end;
-                }), function (memo, num) {
-                    return memo + num;
-                });
-            }
-            self.$el.find('.widget-content.widget-loading').css('display','none');
-            self.$el.find('.widget-content').find('a').text(accounting.formatMoney(amount, CurrencyBase.symbol, CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator))
-        },
-
-        showThisMonth: function () {
+        show: function () {
             var self = this;
             var amount = 0;
             var data = [];
-            var statement = self.getThisMonthAccountBankStatement();
+            var statement = self.AccountBankStatement;
             var CurrencyBase = self.getResCurrency(self.ResCompany[0].currency_id[0]).shift();
             if(statement.length > 0){
                 amount = _.reduce(_.map(statement, function (map) {

static/src/xml/widgets/widget_bank.xml

@@ -9,21 +9,6 @@
                            <i class="fa fa-money" aria-hidden="true"> </i>
                             Banco 
                         </div>
-                        <div class="col-xs-6">
-                            <div class="col-xs-6 col-xs-offset-9">
-                                <div class="btn-group btn-group-xs">
-                                    <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <span class="caret"></span>
-                                    <span class="sr-only">Toggle Dropdown</span>
-                                    </a>
-                                    <ul class="dropdown-menu dropdown-menu-right">
-                                        <li><a class="today">Hoy</a></li>
-                                        <li><a class="thisWeek">Esta Semana</a></li>
-                                        <li><a class="thisMonth">Este Mes</a></li>
-                                    </ul>
-                                </div>
-                            </div>  
-                        </div>
                     </div>
                 </h2>
                 <div class="widget-content">

static/src/xml/widgets/widget_cash.xml

@@ -9,21 +9,6 @@
                            <i class="fa fa-money" aria-hidden="true"> </i>
                             Efectivo
                         </div>
-                        <div class="col-xs-6">
-                            <div class="col-xs-6 col-xs-offset-9">
-                                <div class="btn-group btn-group-xs">
-                                    <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <span class="caret"></span>
-                                    <span class="sr-only">Toggle Dropdown</span>
-                                    </a>
-                                    <ul class="dropdown-menu dropdown-menu-right">
-                                        <li><a class="today">Hoy</a></li>
-                                        <li><a class="thisWeek">Esta Semana</a></li>
-                                        <li><a class="thisMonth">Este Mes</a></li>
-                                    </ul>
-                                </div>
-                            </div>  
-                        </div>
                     </div>
                 </h2>
                 <div class="widget-content">