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

fix: override primary action button, change filter to root company

Browse Source
This commit is contained in:
Zlash65
2019-01-30 11:12:15 +05:30
committed by Rohit Waghchaure
parent 2def228da8
commit 0407bf1e00
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/accounts/doctype/account/account_tree.js
View File

@@ -15,25 +15,23 @@ frappe.treeview_settings["Account"] = {
var me = frappe.treeview_settings['Account'].treeview; var me = frappe.treeview_settings['Account'].treeview;
var company = me.page.fields_dict.company.get_value(); var company = me.page.fields_dict.company.get_value();
frappe.call({ frappe.call({
method: "frappe.client.get_value", method: "erpnext.accounts.doctype.account.account.get_root_company",
args: { args: {
doctype: "Company", company: company,
fieldname: "parent_company",
filters: { name: company},
}, },
callback: function(r, rt) { callback: function(r, rt) {
if(r.message) { if(r.message) {
me.page.fields_dict.parent_company.set_value(r.message["parent_company"] || ""); let root_company = r.message.length ? r.message[0] : "";
me.page.fields_dict.root_company.set_value(root_company);
} }
} }
}); });
} }
}, },
{ {
fieldname: "parent_company", fieldname: "root_company",
fieldtype:"Data", fieldtype:"Data",
fetch_from: "company.parent_company", label: __("Root Company"),
label: __("Parent Company"),
hidden: true, hidden: true,
disable_onchange: true disable_onchange: true
} }
@@ -105,6 +103,18 @@ frappe.treeview_settings["Account"] = {
} }
}, },
post_render: function(treeview) {
frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
treeview.page.set_primary_action(__("New"), function() {
let root_company = treeview.page.fields_dict.root_company.get_value();
if(root_company) {
frappe.throw(__("Please add the account to root level Company - ") + root_company);
} else {
treeview.new_node();
}
}, "octicon octicon-plus");
},
onrender: function(node) { onrender: function(node) {
if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){ if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
@@ -124,12 +134,12 @@ frappe.treeview_settings["Account"] = {
label:__("Add Child"), label:__("Add Child"),
condition: function(node) { condition: function(node) {
return frappe.boot.user.can_create.indexOf("Account") !== -1 && return frappe.boot.user.can_create.indexOf("Account") !== -1 &&
!frappe.treeview_settings['Account'].treeview.page.fields_dict.parent_company.get_value() && !frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value() &&
node.expandable && !node.hide_add; node.expandable && !node.hide_add;
}, },
click: function(node) { click: function(node) {
var me = frappe.treeview_settings['Account'].treeview; var me = frappe.treeview_settings['Account'].treeview;
me.new_node(node); me.new_node();
}, },
btnClass: "hidden-xs" btnClass: "hidden-xs"
}, },
@@ -143,7 +153,7 @@ frappe.treeview_settings["Account"] = {
"account": node.label, "account": node.label,
"from_date": frappe.sys_defaults.year_start_date, "from_date": frappe.sys_defaults.year_start_date,
"to_date": frappe.sys_defaults.year_end_date, "to_date": frappe.sys_defaults.year_end_date,
"company": frappe.treeview_settings['Account'].page.fields_dict.company.get_value() "company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");
}, },