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

Trend analyzer issue fixed

Browse Source
This commit is contained in:
Nabin Hait 2012-05-04 12:52:56 +05:30
parent 978a1e0e46
commit 8cf9934b93
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.js
View File

@ -80,14 +80,8 @@ report.get_query = function() {
add_col = ''; add_col = '';
add_tables = ''; add_tables = '';
sp_cond = ''; sp_cond = '';
if(trans == 'Sales Invoice') trans = 'Sales Invoice';
else if(trans == 'Purchase Invoice') trans = 'Purchase Invoice';
trans_det = trans+' Detail' trans_det = trans+' Item'
if(trans == 'Sales Invoice') trans_det = 'Sales Invoice Item';
else if(trans == 'Purchase Invoice') trans_det = 'Purchase Invoice Item';
else if(trans == 'Purchase Order') trans_det = 'Purchase Order Item';
if(order_type != '') add_code += ' AND t1.order_type = '+order_type; if(order_type != '') add_code += ' AND t1.order_type = '+order_type;

8
erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.py
View File

@ -39,14 +39,8 @@ project = filter_values.get('project')
# ********************************************* SET DEFAULTS ************************************************** # ********************************************* SET DEFAULTS **************************************************
# Details Table # Details Table
# -------------- # --------------
if trans == 'Sales Invoice': trans = 'Sales Invoice'
elif trans == 'Purchase Invoice': trans = 'Purchase Invoice'
trans_det = trans+' Detail' trans_det = trans+' Item'
if trans == 'Sales Invoice': trans_det = 'Sales Invoice Item'
elif trans == 'Purchase Invoice': trans_det = 'Purchase Invoice Item'
elif trans == 'Purchase Order': trans_det = 'Purchase Order Item'
col_names, query_val = get_obj('Trend Analyzer Control').get_single_year_query_value(fiscal_year, period, trans, trans_det) col_names, query_val = get_obj('Trend Analyzer Control').get_single_year_query_value(fiscal_year, period, trans, trans_det)
query_val += 'SUM(t2.qty), SUM(t2.amount)' query_val += 'SUM(t2.qty), SUM(t2.amount)'

4
erpnext/accounts/search_criteria/trend_analyzer/trend_analyzer.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-04-03 12:49:53', 'creation': '2012-04-23 12:46:00',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-03 12:49:53', 'modified': '2012-05-04 12:49:43',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'saumil@webnotestech.com' 'owner': u'saumil@webnotestech.com'
}, },