nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-41659

Browse Source
This commit is contained in:
mergify[bot]
2024-06-12 12:13:11 +00:00
committed by GitHub
parent a53a80f01d 245c6d8672
commit e33416a4a7
17 changed files with 323 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/setup/doctype/company/company.js
View File

@@ -12,10 +12,11 @@ frappe.ui.form.on("Company", {
}
});
}
frm.call("check_if_transactions_exist").then((r) => {
frm.toggle_enable("default_currency", !r.message);
});
if (!frm.doc.__islocal) {
frm.call("check_if_transactions_exist").then((r) => {
frm.toggle_enable("default_currency", !r.message);
});
}
},
setup: function (frm) {
frm.__rename_queue = "long";

6
erpnext/setup/doctype/department/department.json
View File

@@ -90,7 +90,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2023-08-28 17:26:46.826501",
"modified": "2024-06-12 16:10:31.451257",
"modified_by": "Administrator",
"module": "Setup",
"name": "Department",
@@ -132,6 +132,10 @@
"role": "HR Manager",
"share": 1,
"write": 1
},
{
"role": "Employee",
"select": 1
}
],
"show_name_in_global_search": 1,