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

Merge pull request #5035 from rmehta/warehouse-buttons

Browse Source 
[enhancement] [minor] stock ledger, general ledger buttons in warehouse
This commit is contained in:
Rushabh Mehta 2016-03-23 11:50:30 +05:30
commit 17da0b8f8b
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/stock/doctype/warehouse/warehouse.js
View File

@ -1,9 +1,25 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
cur_frm.cscript.refresh = function(doc) { frappe.ui.form.on("Warehouse", {
cur_frm.toggle_display('warehouse_name', doc.__islocal); refresh: function(frm) {
} frm.toggle_display('warehouse_name', frm.doc.__islocal);
frm.add_custom_button(__("Stock Ledger"), function() {
frappe.set_route("query-report", "Stock Ledger", {"warehouse": frm.doc.name});
});
if(frm.doc.__onload && frm.doc.__onload.account) {
frm.add_custom_button(__("General Ledger"), function() {
frappe.route_options = {
"account": frm.doc.__onload.account,
"company": frm.doc.company
}
frappe.set_route("query-report", "General Ledger");
});
}
}
});
cur_frm.set_query("create_account_under", function() { cur_frm.set_query("create_account_under", function() {
return { return {

8
erpnext/stock/doctype/warehouse/warehouse.py
View File

@ -14,6 +14,14 @@ class Warehouse(Document):
if not self.warehouse_name.endswith(suffix): if not self.warehouse_name.endswith(suffix):
self.name = self.warehouse_name + suffix self.name = self.warehouse_name + suffix
def onload(self):
'''load account name for General Ledger Report'''
account = frappe.db.get_value("Account", {
"account_type": "Warehouse", "company": self.company, "warehouse": self.name})
if account:
self.set_onload('account', account)
def validate(self): def validate(self):
if self.email_id: if self.email_id:
validate_email_add(self.email_id, True) validate_email_add(self.email_id, True)