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

[minor] [fix] sales and purchase analytics

Browse Source
This commit is contained in:
Anand Doshi 2013-07-23 11:01:27 +05:30
parent 832dd5f27d
commit f577b09b3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({
var me = this;
this._super();
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on"]);
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
this.show_zero_check()
this.setup_plot_check();
@ -216,7 +216,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({
var is_val = this.value_or_qty == 'Value';
$.each(this.tl[this.based_on], function(i, tl) {
if (me.is_default('company') ? true : me.apply_filter(tl, "company")) {
if (me.is_default('company') ? true : tl.company === me.company) {
var posting_date = dateutil.str_to_obj(tl.posting_date);
if (posting_date >= from_date && posting_date <= to_date) {
var item = me.item_by_name[tl[me.tree_grid.item_key]] ||

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

@ -123,7 +123,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
var me = this;
this._super();
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on"]);
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
this.show_zero_check()
this.setup_plot_check();
@ -209,7 +209,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
var is_val = this.value_or_qty == 'Value';
$.each(this.tl[this.based_on], function(i, tl) {
if (me.is_default('company') ? true : me.apply_filter(tl, "company")) {
if (me.is_default('company') ? true : tl.company === me.company) {
var posting_date = dateutil.str_to_obj(tl.posting_date);
if (posting_date >= from_date && posting_date <= to_date) {
var item = me.item_by_name[tl[me.tree_grid.item_key]] ||