Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2012-11-26 14:19:40 +01:00
commit 2be7602916
9 changed files with 16 additions and 1 deletions

View File

@ -23,6 +23,8 @@ wn.pages['financial-analytics'].onload = function(wrapper) {
single_column: true single_column: true
}); });
erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics'); erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics');
wrapper.appframe.add_module_tab("Accounts");
} }
erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({

View File

@ -23,6 +23,8 @@ wn.pages['general-ledger'].onload = function(wrapper) {
erpnext.general_ledger = new erpnext.GeneralLedger(wrapper); erpnext.general_ledger = new erpnext.GeneralLedger(wrapper);
wrapper.appframe.add_module_tab("Accounts");
} }
erpnext.GeneralLedger = wn.views.GridReport.extend({ erpnext.GeneralLedger = wn.views.GridReport.extend({

View File

@ -55,4 +55,6 @@ wn.pages['trial-balance'].onload = function(wrapper) {
}, },
}) })
erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance'); erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance');
wrapper.appframe.add_module_tab("Accounts");
} }

View File

@ -139,7 +139,7 @@ cur_frm.cscript['Make Purchase Receipt'] = function() {
//========================== Make Purchase Invoice ===================================================== //========================== Make Purchase Invoice =====================================================
cur_frm.cscript['Make Purchase Invoice'] = function() { cur_frm.cscript['Make Purchase Invoice'] = function() {
n = createLocal('Purchase Invoice'); n = createLocal('Purchase Invoice');
$c('dt_map', args={ $c('dt_map', {
'docs':compress_doclist([locals['Purchase Invoice'][n]]), 'docs':compress_doclist([locals['Purchase Invoice'][n]]),
'from_doctype':cur_frm.doc.doctype, 'from_doctype':cur_frm.doc.doctype,
'to_doctype':'Purchase Invoice', 'to_doctype':'Purchase Invoice',

View File

@ -22,6 +22,8 @@ wn.pages['purchase-analytics'].onload = function(wrapper) {
}); });
new erpnext.PurchaseAnalytics(wrapper); new erpnext.PurchaseAnalytics(wrapper);
wrapper.appframe.add_module_tab("Buying");
} }
erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({

View File

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

View File

@ -24,6 +24,7 @@ wn.pages['stock-ageing'].onload = function(wrapper) {
new erpnext.StockAgeing(wrapper); new erpnext.StockAgeing(wrapper);
wrapper.appframe.add_module_tab("Stock");
} }
wn.require("app/js/stock_grid_report.js"); wn.require("app/js/stock_grid_report.js");

View File

@ -22,6 +22,8 @@ wn.pages['stock-analytics'].onload = function(wrapper) {
}); });
new erpnext.StockAnalytics(wrapper); new erpnext.StockAnalytics(wrapper);
wrapper.appframe.add_module_tab("Stock");
} }
wn.require("app/js/stock_grid_report.js"); wn.require("app/js/stock_grid_report.js");

View File

@ -22,6 +22,8 @@ wn.pages['stock-ledger'].onload = function(wrapper) {
}); });
new erpnext.StockLedger(wrapper); new erpnext.StockLedger(wrapper);
wrapper.appframe.add_module_tab("Stock");
} }
wn.require("app/js/stock_grid_report.js"); wn.require("app/js/stock_grid_report.js");