nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored communication and added to Lead / Contact

Browse Source
This commit is contained in:
Rushabh Mehta
2012-11-27 18:43:19 +05:30
parent e1a433812f ab6848d37b
commit fe9707a08a
14 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selling/doctype/sales_common/sales_common.py
View File

@@ -717,7 +717,7 @@ class StatusUpdater:
tolerance = flt(get_value('Item',item_code,'tolerance') or 0)
if not(tolerance):
if not tolerance:
if self.global_tolerance == None:
self.global_tolerance = flt(get_value('Global Defaults',None,'tolerance') or 0)
tolerance = self.global_tolerance
@@ -732,7 +732,7 @@ class StatusUpdater:
# check if overflow is within tolerance
tolerance = self.get_tolerance_for(item['item_code'])
overflow_percent = ((item[args['compare_field']] - item[args['compare_ref_field']]) / item[args['compare_ref_field']] * 100)
overflow_percent = ((item[args['compare_field']] - item[args['compare_ref_field']]) / item[args['compare_ref_field']]) * 100
if overflow_percent - tolerance > 0.01:
item['max_allowed'] = flt(item[args['compare_ref_field']] * (100+tolerance)/100)

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

@@ -21,6 +21,8 @@ wn.pages['sales-analytics'].onload = function(wrapper) {
single_column: true
});
new erpnext.SalesAnalytics(wrapper);
wrapper.appframe.add_module_tab("Selling");
}
erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({