schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #45718 from frappe/mergify/bp/version-15-hotfix/pr-45710

Browse Source 
fix: show only items with inspection enabled on create QI dialog (backport #45710)
This commit is contained in:
rohitwaghchaure
2025-02-05 13:05:16 +05:30
committed by GitHub
parent 5a7b901327 3689a2deae
commit efa7602fae
2 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/controllers/stock_controller.py
View File

@@ -1564,6 +1564,27 @@ def repost_required_for_queue(doc: StockController) -> bool:
return False
def check_item_quality_inspection(doctype, items):
if isinstance(items, str):
items = json.loads(items)
inspection_fieldname_map = {
"Purchase Receipt": "inspection_required_before_purchase",
"Purchase Invoice": "inspection_required_before_purchase",
"Subcontracting Receipt": "inspection_required_before_purchase",
"Sales Invoice": "inspection_required_before_delivery",
"Delivery Note": "inspection_required_before_delivery",
}
items_to_remove = []
for item in items:
if not frappe.db.get_value("Item", item.get("item_code"), inspection_fieldname_map.get(doctype)):
items_to_remove.append(item)
items = [item for item in items if item not in items_to_remove]
return items
@frappe.whitelist()
def make_quality_inspections(doctype, docname, items):
if isinstance(items, str):

50
erpnext/public/js/controllers/transaction.js
View File

@@ -2367,29 +2367,39 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
primary_action_label: __("Create")
});
this.frm.doc.items.forEach(item => {
if (this.has_inspection_required(item)) {
let dialog_items = dialog.fields_dict.items;
dialog_items.df.data.push({
"item_code": item.item_code,
"item_name": item.item_name,
"qty": item.qty,
"description": item.description,
"serial_no": item.serial_no,
"batch_no": item.batch_no,
"sample_size": item.sample_quantity,
"child_row_reference": item.name,
frappe.call({
method: "erpnext.controllers.stock_controller.check_item_quality_inspection",
args: {
doctype: this.frm.doc.doctype,
items: this.frm.doc.items
},
freeze: true,
callback: function (r) {
r.message.forEach(item => {
if (me.has_inspection_required(item)) {
let dialog_items = dialog.fields_dict.items;
dialog_items.df.data.push({
"item_code": item.item_code,
"item_name": item.item_name,
"qty": item.qty,
"description": item.description,
"serial_no": item.serial_no,
"batch_no": item.batch_no,
"sample_size": item.sample_quantity,
"child_row_reference": item.name,
});
dialog_items.grid.refresh();
}
});
dialog_items.grid.refresh();
data = dialog.fields_dict.items.df.data;
if (!data.length) {
frappe.msgprint(__("All items in this document already have a linked Quality Inspection."));
} else {
dialog.show();
}
}
});
data = dialog.fields_dict.items.df.data;
if (!data.length) {
frappe.msgprint(__("All items in this document already have a linked Quality Inspection."));
} else {
dialog.show();
}
}
has_inspection_required(item) {