Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove cancelled entries from grid report when fetching data based on modified

Browse Source
This commit is contained in:
Anand Doshi 2013-03-07 15:35:36 +05:30
parent 77a6ddaf03
commit b96fef9802
5 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/general_ledger.py
View File

@ -16,7 +16,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
from webnotes.utils import flt, cstr from webnotes.utils import flt, cstr, now
from webnotes.model.doc import Document from webnotes.model.doc import Document
def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True, def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True,
@ -109,5 +109,7 @@ def validate_total_debit_credit(total_debit, total_credit):
(total_debit - total_credit), raise_exception=1) (total_debit - total_credit), raise_exception=1)
def set_as_cancel(voucher_type, voucher_no): def set_as_cancel(voucher_type, voucher_no):
webnotes.conn.sql("""update `tabGL Entry` set is_cancelled='Yes' webnotes.conn.sql("""update `tabGL Entry` set is_cancelled='Yes',
where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no)) modified=%s, modified_by=%s
where voucher_type=%s and voucher_no=%s""",
(now(), webnotes.session.user, voucher_type, voucher_no))

8
accounts/page/financial_analytics/financial_analytics.js
View File

@ -71,9 +71,11 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
setup_filters: function() { setup_filters: function() {
var me = this; var me = this;
this._super(); this._super();
this.filter_inputs.pl_or_bs.change(function() { this.trigger_refresh_on_change(["pl_or_bs"]);
me.filter_inputs.refresh.click();
}).add_options($.map(wn.report_dump.data["Cost Center"], function(v) {return v.name;})); this.filter_inputs.pl_or_bs
.add_options($.map(wn.report_dump.data["Cost Center"], function(v) {return v.name;}));
this.setup_plot_check(); this.setup_plot_check();
}, },
init_filter_values: function() { init_filter_values: function() {

2
accounts/page/general_ledger/general_ledger.js
View File

@ -108,7 +108,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
// filter accounts options by company // filter accounts options by company
this.filter_inputs.company.change(function() { this.filter_inputs.company.change(function() {
me.setup_account_filter(this); me.setup_account_filter(this);
me.filter_inputs.refresh.click(); me.set_route()
}); });
this.filter_inputs.account.change(function() { this.filter_inputs.account.change(function() {

14
buying/page/purchase_analytics/purchase_analytics.js
View File

@ -120,19 +120,9 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({
setup_filters: function() { setup_filters: function() {
var me = this; var me = this;
this._super(); this._super();
this.filter_inputs.value_or_qty.change(function() {
me.filter_inputs.refresh.click();
});
this.filter_inputs.tree_type.change(function() {
me.filter_inputs.refresh.click();
});
this.filter_inputs.based_on.change(function() {
me.filter_inputs.refresh.click();
});
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on"]);
this.show_zero_check() this.show_zero_check()
this.setup_plot_check(); this.setup_plot_check();
}, },

12
selling/page/sales_analytics/sales_analytics.js
View File

@ -122,18 +122,8 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
setup_filters: function() { setup_filters: function() {
var me = this; var me = this;
this._super(); this._super();
this.filter_inputs.value_or_qty.change(function() {
me.filter_inputs.refresh.click();
});
this.filter_inputs.tree_type.change(function() {
me.filter_inputs.refresh.click();
});
this.filter_inputs.based_on.change(function() { this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on"]);
me.filter_inputs.refresh.click();
});
this.show_zero_check() this.show_zero_check()
this.setup_plot_check(); this.setup_plot_check();