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

[minor] budget link in cost center, fixes #6093

Browse Source
This commit is contained in:
Rushabh Mehta 2016-08-18 12:35:58 +05:30
parent b8a8fb5877
commit b969c2cb60
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/cost_center/cost_center.js
View File

@ -32,8 +32,13 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.toggle_display('sb1', doc.is_group==0) cur_frm.toggle_display('sb1', doc.is_group==0)
cur_frm.set_intro(intro_txt); cur_frm.set_intro(intro_txt);
cur_frm.add_custom_button(__('Chart of Cost Centers'), if(!cur_frm.doc.__islocal) {
function() { frappe.set_route("Tree", "Cost Center"); }, __("View")) cur_frm.add_custom_button(__('Chart of Cost Centers'),
function() { frappe.set_route("Tree", "Cost Center"); });
cur_frm.add_custom_button(__('Budget'),
function() { frappe.set_route("List", "Budget", {'cost_center': cur_frm.doc.name}); });
}
} }
cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) { cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {

2
erpnext/selling/sales_common.js
View File

@ -80,7 +80,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
} else { } else {
filters = { filters = {
'item_code': item.item_code, 'item_code': item.item_code,
'posting_date': me.frm.doc.posting_date || nowdate(), 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
} }
if(item.warehouse) filters["warehouse"] = item.warehouse if(item.warehouse) filters["warehouse"] = item.warehouse