nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show general/stock ledger button links to new query reports

Browse Source
This commit is contained in:
Nabin Hait
2013-12-23 17:07:57 +05:30
parent facde47c6c
commit c38527ef5f
9 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accounts/doctype/account/account.js
View File

@@ -95,9 +95,10 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) {
wn.route_options = {
"account": doc.name,
"from_date": sys_defaults.year_start_date,
"to_date": sys_defaults.year_end_date
"to_date": sys_defaults.year_end_date,
"company": doc.company
};
wn.set_route("general-ledger");
wn.set_route("query-report", "General Ledger");
}, "icon-table");
}
}

3
accounts/doctype/journal_voucher/journal_voucher.js
View File

@@ -120,8 +120,9 @@ cur_frm.cscript.refresh = function(doc) {
"voucher_no": doc.name,
"from_date": doc.posting_date,
"to_date": doc.posting_date,
"company": doc.company
};
wn.set_route("general-ledger");
wn.set_route("query-report", "General Ledger");
}, "icon-table");
}
}

3
accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -35,8 +35,9 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
"voucher_no": doc.name,
"from_date": doc.posting_date,
"to_date": doc.posting_date,
"company": doc.company
};
wn.set_route("query-report/General Ledger");
wn.set_route("query-report", "General Ledger");
}, "icon-table");
}

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -54,8 +54,9 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
"voucher_no": doc.name,
"from_date": doc.posting_date,
"to_date": doc.posting_date,
"company": doc.company
};
wn.set_route("query-report/General Ledger");
wn.set_route("query-report", "General Ledger");
}, "icon-table");
var percent_paid = cint(flt(doc.grand_total - doc.outstanding_amount) / flt(doc.grand_total) * 100);

5
accounts/page/accounts_browser/accounts_browser.js
View File

@@ -175,9 +175,10 @@ erpnext.AccountsChart = Class.extend({
wn.route_options = {
"account": node.data('label'),
"from_date": sys_defaults.year_start_date,
"to_date": sys_defaults.year_end_date
"to_date": sys_defaults.year_end_date,
"company": me.company
};
wn.set_route("general-ledger");
wn.set_route("query-report", "General Ledger");
},
rename: function() {
var node = this.selected_node();

2
accounts/utils.py
View File

@@ -16,7 +16,7 @@ class BudgetError(webnotes.ValidationError): pass
def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1):
return get_fiscal_years(date, fiscal_year, label, verbose=1)[0]
return get_fiscal_years(date, fiscal_year, label, verbose)[0]
def get_fiscal_years(date=None, fiscal_year=None, label="Date", verbose=1):
# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)