From c704ad889d1c86b1fc3d94e27ff55851452b0c29 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 23 May 2022 15:18:24 +0200 Subject: [PATCH 1/6] style: format warehouse js --- erpnext/stock/doctype/warehouse/warehouse.js | 111 +++++++++++-------- 1 file changed, 64 insertions(+), 47 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 9243e1ed84fb..6baaf378faf0 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -1,88 +1,105 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt - frappe.ui.form.on("Warehouse", { - onload: function(frm) { - frm.set_query("default_in_transit_warehouse", function() { + onload: function (frm) { + frm.set_query("default_in_transit_warehouse", function () { return { - filters:{ - 'warehouse_type' : 'Transit', - 'is_group': 0, - 'company': frm.doc.company - } + filters: { + warehouse_type: "Transit", + is_group: 0, + company: frm.doc.company, + }, }; }); }, - refresh: function(frm) { - frm.toggle_display('warehouse_name', frm.doc.__islocal); - frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal); + refresh: function (frm) { + frm.toggle_display("warehouse_name", frm.doc.__islocal); + frm.toggle_display( + ["address_html", "contact_html"], + !frm.doc.__islocal + ); - - if(!frm.doc.__islocal) { + if (!frm.doc.__islocal) { frappe.contacts.render_address_and_contact(frm); - } else { frappe.contacts.clear_address_and_contact(frm); } - frm.add_custom_button(__("Stock Balance"), function() { - frappe.set_route("query-report", "Stock Balance", {"warehouse": frm.doc.name}); + frm.add_custom_button(__("Stock Balance"), function () { + frappe.set_route("query-report", "Stock Balance", { + warehouse: frm.doc.name, + }); }); if (cint(frm.doc.is_group) == 1) { - frm.add_custom_button(__('Group to Non-Group'), - function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default') + frm.add_custom_button( + __("Group to Non-Group"), + function () { + convert_to_group_or_ledger(frm); + }, + "fa fa-retweet", + "btn-default" + ); } else if (cint(frm.doc.is_group) == 0) { - if(frm.doc.__onload && frm.doc.__onload.account) { - frm.add_custom_button(__("General Ledger"), function() { + 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 - } + account: frm.doc.__onload.account, + company: frm.doc.company, + }; frappe.set_route("query-report", "General Ledger"); }); } - frm.add_custom_button(__('Non-Group to Group'), - function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default') + 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 = {doc: frm.doc, fieldname: 'name', doctype: 'Warehouse'}; + frappe.dynamic_link = { + doc: frm.doc, + fieldname: "name", + doctype: "Warehouse", + }; - frm.fields_dict['parent_warehouse'].get_query = function(doc) { + frm.fields_dict["parent_warehouse"].get_query = function (doc) { return { filters: { - "is_group": 1, - } - } - } + is_group: 1, + }, + }; + }; - frm.fields_dict['account'].get_query = function(doc) { + frm.fields_dict["account"].get_query = function (doc) { return { filters: { - "is_group": 0, - "account_type": "Stock", - "company": frm.doc.company - } - } - } - } + is_group: 0, + account_type: "Stock", + company: frm.doc.company, + }, + }; + }; + }, }); -function convert_to_group_or_ledger(frm){ +function convert_to_group_or_ledger(frm) { frappe.call({ - method:"erpnext.stock.doctype.warehouse.warehouse.convert_to_group_or_ledger", + method: "erpnext.stock.doctype.warehouse.warehouse.convert_to_group_or_ledger", args: { docname: frm.doc.name, - is_group: frm.doc.is_group + is_group: frm.doc.is_group, }, - callback: function(){ + callback: function () { frm.refresh(); - } - - }) + }, + }); } From a6ddd86d31c2c2693e43be9a920810ffedeabb0e Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 23 May 2022 15:25:00 +0200 Subject: [PATCH 2/6] fix: improve labels, simplify logic --- erpnext/stock/doctype/warehouse/warehouse.js | 47 ++++++++------------ 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 6baaf378faf0..6a6ed1dffca7 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -33,34 +33,25 @@ frappe.ui.form.on("Warehouse", { }); }); - if (cint(frm.doc.is_group) == 1) { - frm.add_custom_button( - __("Group to Non-Group"), - function () { - convert_to_group_or_ledger(frm); - }, - "fa fa-retweet", - "btn-default" - ); - } else if (cint(frm.doc.is_group) == 0) { - 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"); - }); - } + frm.add_custom_button( + frm.doc.is_group + ? __("Convert to Ledger", null, "Warehouse") + : __("Convert to Group", null, "Warehouse"), + function () { + convert_to_group_or_ledger(frm); + }, + "fa fa-retweet", + "btn-default" + ); - frm.add_custom_button( - __("Non-Group to Group"), - function () { - convert_to_group_or_ledger(frm); - }, - "fa fa-retweet", - "btn-default" - ); + if (!frm.doc.is_group && frm.doc.__onload && frm.doc.__onload.account) { + frm.add_custom_button(__("General Ledger", null, "Warehouse"), function () { + frappe.route_options = { + account: frm.doc.__onload.account, + company: frm.doc.company, + }; + frappe.set_route("query-report", "General Ledger"); + }); } frm.toggle_enable(["is_group", "company"], false); @@ -84,7 +75,7 @@ frappe.ui.form.on("Warehouse", { filters: { is_group: 0, account_type: "Stock", - company: frm.doc.company, + company: doc.company, }, }; }; From 9356eb11de90f9675fced9d0e9828251d2b8845f Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 23 May 2022 15:35:15 +0200 Subject: [PATCH 3/6] fix: german translations --- erpnext/translations/de.csv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index 8730c4ecd3a8..61b6f05eead5 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -1178,7 +1178,7 @@ Group by Party,Gruppieren nach Partei, Group by Voucher,Gruppieren nach Beleg, Group by Voucher (Consolidated),Gruppieren nach Beleg (konsolidiert), Group node warehouse is not allowed to select for transactions,Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt, -Group to Non-Group,Gruppe an konzernfremde, +Convert to Ledger,In Lagerbuch umwandeln,Warehouse Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen, Groups,Gruppen, Guardian1 Email ID,Guardian1 E-Mail-ID, @@ -1735,7 +1735,6 @@ Non GST Inward Supplies,Nicht GST Inward Supplies, Non Profit,Gemeinnützig, Non Profit (beta),Non-Profit (Beta), Non-GST outward supplies,Nicht-GST-Lieferungen nach außen, -Non-Group to Group,Non-Group-Gruppe, None,Keiner, None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten., Nos,Stk, From e77c379cbbe9ae890efc6a652a9406540633e998 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 24 May 2022 11:52:23 +0200 Subject: [PATCH 4/6] fix: remove unsupported arguments Co-authored-by: Ankush Menat --- erpnext/stock/doctype/warehouse/warehouse.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 6a6ed1dffca7..3d7f59215320 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -40,8 +40,6 @@ frappe.ui.form.on("Warehouse", { function () { convert_to_group_or_ledger(frm); }, - "fa fa-retweet", - "btn-default" ); if (!frm.doc.is_group && frm.doc.__onload && frm.doc.__onload.account) { From 1b16eb766791a9cd0f3c402efbf8f28a34922180 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 24 May 2022 13:30:59 +0200 Subject: [PATCH 5/6] refactor: set queries during setup --- erpnext/stock/doctype/warehouse/warehouse.js | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index 3d7f59215320..c902abf2e0b7 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -2,13 +2,31 @@ // License: GNU General Public License v3. See license.txt frappe.ui.form.on("Warehouse", { - onload: function (frm) { - frm.set_query("default_in_transit_warehouse", function () { + setup: function (frm) { + frm.set_query("default_in_transit_warehouse", function (doc) { return { filters: { warehouse_type: "Transit", is_group: 0, - company: frm.doc.company, + company: doc.company, + }, + }; + }); + + frm.set_query("parent_warehouse", function () { + return { + filters: { + is_group: 1, + }, + }; + }); + + frm.set_query("account", function (doc) { + return { + filters: { + is_group: 0, + account_type: "Stock", + company: doc.company, }, }; }); @@ -59,24 +77,6 @@ frappe.ui.form.on("Warehouse", { fieldname: "name", doctype: "Warehouse", }; - - frm.fields_dict["parent_warehouse"].get_query = function (doc) { - return { - filters: { - is_group: 1, - }, - }; - }; - - frm.fields_dict["account"].get_query = function (doc) { - return { - filters: { - is_group: 0, - account_type: "Stock", - company: doc.company, - }, - }; - }; }, }); From 1e9f9c452f48bc2964d609e9f4a5e1a283519653 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 24 May 2022 13:31:29 +0200 Subject: [PATCH 6/6] style: format --- erpnext/stock/doctype/warehouse/warehouse.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js index c902abf2e0b7..d69c624fba3d 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.js +++ b/erpnext/stock/doctype/warehouse/warehouse.js @@ -61,13 +61,16 @@ frappe.ui.form.on("Warehouse", { ); if (!frm.doc.is_group && frm.doc.__onload && frm.doc.__onload.account) { - frm.add_custom_button(__("General Ledger", null, "Warehouse"), function () { - frappe.route_options = { - account: frm.doc.__onload.account, - company: frm.doc.company, - }; - frappe.set_route("query-report", "General Ledger"); - }); + frm.add_custom_button( + __("General Ledger", null, "Warehouse"), + function () { + frappe.route_options = { + account: frm.doc.__onload.account, + company: frm.doc.company, + }; + frappe.set_route("query-report", "General Ledger"); + } + ); } frm.toggle_enable(["is_group", "company"], false);