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

fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942) (#38944)

Browse Source 
* fix(ux): make PI Item rate field editable

(cherry picked from commit eb5bb9f9a99e54be71c7ae5e24235b5b44692444)

* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit cb9114442b936f03c9c975900282b3b9db62e453)

* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit b1ba2103323c8bfe066c288b4c285cf1f3c5b20b)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
This commit is contained in:
mergify[bot] 2023-12-26 14:45:05 +05:30 committed by GitHub
parent 1ea8574be9
commit f704ccbb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -163,6 +163,18 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
} }
}) })
}, __("Get Items From")); }, __("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); this.frm.toggle_reqd("supplier_warehouse", this.frm.doc.is_subcontracted);

3
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -288,7 +288,6 @@
"oldfieldname": "import_rate", "oldfieldname": "import_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "currency", "options": "currency",
"read_only_depends_on": "eval: (!parent.is_return && doc.purchase_receipt && doc.pr_detail)",
"reqd": 1 "reqd": 1
}, },
{ {
@ -919,7 +918,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-11-30 16:26:05.629780", "modified": "2023-12-25 22:00:28.043555",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

14
erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
View File

@ -88,6 +88,20 @@ frappe.ui.form.on("Purchase Receipt", {
}, __('Create')); }, __('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); frm.events.add_custom_buttons(frm);
}, },

3
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -359,7 +359,6 @@
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "currency", "options": "currency",
"print_width": "100px", "print_width": "100px",
"read_only_depends_on": "eval: (!parent.is_return && doc.purchase_order && doc.purchase_order_item)",
"width": "100px" "width": "100px"
}, },
{ {
@ -1104,7 +1103,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-11-30 16:12:02.364608", "modified": "2023-12-25 22:32:09.801965",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",