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

fix: Select both account number and company in the account form (backport #41731) (#41737)

Browse Source 
fix: Select both account number and company in the account form (#41731)

* fix: Both the account number and the company should be selected in the account form

* fix: select both account number and company in the account form

(cherry picked from commit 5a75c847fe)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2024-06-03 18:36:58 +05:30
committed by GitHub
parent dd0cd8c4f8
commit c5d72cd934
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/account/account.js
View File

@@ -22,8 +22,7 @@ frappe.ui.form.on("Account", {
// hide fields if group // hide fields if group
frm.toggle_display(["tax_rate"], cint(frm.doc.is_group) == 0); frm.toggle_display(["tax_rate"], cint(frm.doc.is_group) == 0);
// disable fields frm.toggle_enable(["is_group", "company", "account_number"], frm.is_new());
frm.toggle_enable(["is_group", "company"], false);
if (cint(frm.doc.is_group) == 0) { if (cint(frm.doc.is_group) == 0) {
frm.toggle_display("freeze_account", frm.doc.__onload && frm.doc.__onload.can_freeze_account); frm.toggle_display("freeze_account", frm.doc.__onload && frm.doc.__onload.can_freeze_account);

4
erpnext/accounts/doctype/account/account.json
View File

@@ -55,8 +55,7 @@
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Account Number", "label": "Account Number"
"read_only": 1
}, },
{ {
"default": "0", "default": "0",
@@ -72,7 +71,6 @@
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Company", "options": "Company",
"read_only": 1,
"remember_last_selected_value": 1, "remember_last_selected_value": 1,
"reqd": 1 "reqd": 1
}, },