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

fix: improve labels, simplify logic

Browse Source
This commit is contained in:
barredterra 2022-05-23 15:25:00 +02:00
parent c704ad889d
commit a6ddd86d31
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,18 +33,19 @@ frappe.ui.form.on("Warehouse", {
}); });
}); });
if (cint(frm.doc.is_group) == 1) {
frm.add_custom_button( frm.add_custom_button(
__("Group to Non-Group"), frm.doc.is_group
? __("Convert to Ledger", null, "Warehouse")
: __("Convert to Group", null, "Warehouse"),
function () { function () {
convert_to_group_or_ledger(frm); convert_to_group_or_ledger(frm);
}, },
"fa fa-retweet", "fa fa-retweet",
"btn-default" "btn-default"
); );
} else if (cint(frm.doc.is_group) == 0) {
if (frm.doc.__onload && frm.doc.__onload.account) { if (!frm.doc.is_group && frm.doc.__onload && frm.doc.__onload.account) {
frm.add_custom_button(__("General Ledger"), function () { frm.add_custom_button(__("General Ledger", null, "Warehouse"), function () {
frappe.route_options = { frappe.route_options = {
account: frm.doc.__onload.account, account: frm.doc.__onload.account,
company: frm.doc.company, company: frm.doc.company,
@ -53,16 +54,6 @@ frappe.ui.form.on("Warehouse", {
}); });
} }
frm.add_custom_button(
__("Non-Group to Group"),
function () {
convert_to_group_or_ledger(frm);
},
"fa fa-retweet",
"btn-default"
);
}
frm.toggle_enable(["is_group", "company"], false); frm.toggle_enable(["is_group", "company"], false);
frappe.dynamic_link = { frappe.dynamic_link = {
@ -84,7 +75,7 @@ frappe.ui.form.on("Warehouse", {
filters: { filters: {
is_group: 0, is_group: 0,
account_type: "Stock", account_type: "Stock",
company: frm.doc.company, company: doc.company,
}, },
}; };
}; };