Merge pull request #38942 from s-aga-r/FIX-38151-2
fix(ux): make PR and PI Item rate field readonly based on `Maintain Same Rate`
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index cebd61a..215d8ec 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -163,6 +163,18 @@
}
})
}, __("Get Items From"));
+
+ if (!this.frm.doc.is_return) {
+ frappe.db.get_single_value("Buying Settings", "maintain_same_rate").then((value) => {
+ if (value) {
+ this.frm.doc.items.forEach((item) => {
+ this.frm.fields_dict.items.grid.update_docfield_property(
+ "rate", "read_only", (item.purchase_receipt && item.pr_detail)
+ );
+ });
+ }
+ });
+ }
}
this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted);
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 7cad3ae..9cf4e4f 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -288,7 +288,6 @@
"oldfieldname": "import_rate",
"oldfieldtype": "Currency",
"options": "currency",
- "read_only_depends_on": "eval: (!parent.is_return && doc.purchase_receipt && doc.pr_detail)",
"reqd": 1
},
{
@@ -919,7 +918,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-11-30 16:26:05.629780",
+ "modified": "2023-12-25 22:00:28.043555",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 6c9d339..2cbccb0 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -88,6 +88,20 @@
}, __('Create'));
}
+ if (frm.doc.docstatus === 0) {
+ if (!frm.doc.is_return) {
+ frappe.db.get_single_value("Buying Settings", "maintain_same_rate").then((value) => {
+ if (value) {
+ frm.doc.items.forEach((item) => {
+ frm.fields_dict.items.grid.update_docfield_property(
+ "rate", "read_only", (item.purchase_order && item.purchase_order_item)
+ );
+ });
+ }
+ });
+ }
+ }
+
frm.events.add_custom_buttons(frm);
},
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 7344d2a..9bd692a 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -359,7 +359,6 @@
"oldfieldtype": "Currency",
"options": "currency",
"print_width": "100px",
- "read_only_depends_on": "eval: (!parent.is_return && doc.purchase_order && doc.purchase_order_item)",
"width": "100px"
},
{
@@ -1104,7 +1103,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2023-11-30 16:12:02.364608",
+ "modified": "2023-12-25 22:32:09.801965",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",