diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.js b/erpnext/stock/doctype/quality_inspection/quality_inspection.js index efc8aecb2398b6bf306a0071d999811d3db1bf54..2a087cea88069bdcc0a00fe8ad2e59b9bd5b5d11 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.js +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.js @@ -4,14 +4,27 @@ cur_frm.cscript.refresh = cur_frm.cscript.inspection_type; frappe.ui.form.on("Quality Inspection", { + onload(frm) { + frm.trigger("set_default_company"); + }, - setup: function(frm) { - frm.set_query("reference_name", function() { - return { - filters: { - "docstatus": ["!=", 2], - } + set_default_company(frm) { + if (!frm.doc.company) { + frm.set_value("company", frappe.defaults.get_default("company")); + } + }, + + setup: function (frm) { + frm.set_query("reference_name", function (doc) { + let filters = { docstatus: ["!=", 2] }; + + if (doc.company) { + filters["company"] = doc.company; } + + return { + filters: filters, + }; }); frm.set_query("batch_no", function() { diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json index ab699f3a9b344ce93ebee7bed72c5c193ad797d1..1253577f17bc38a1e7446f6025858c24fefc2e23 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.json +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json @@ -8,14 +8,14 @@ "engine": "InnoDB", "field_order": [ "naming_series", + "company", "report_date", "status", - "manual_inspection", + "child_row_reference", "column_break_4", "inspection_type", "reference_type", "reference_name", - "child_row_reference", "section_break_7", "item_code", "item_serial_no", @@ -27,6 +27,7 @@ "bom_no", "specification_details", "quality_inspection_template", + "manual_inspection", "readings", "section_break_14", "inspected_by", @@ -248,6 +249,12 @@ "no_copy": 1, "print_hide": 1, "read_only": 1 + }, + { + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company" } ], "icon": "fa fa-search", @@ -255,7 +262,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-12-30 19:08:16.611192", + "modified": "2025-01-16 17:00:48.774532", "modified_by": "Administrator", "module": "Stock", "name": "Quality Inspection", diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index 7a8a54960cbb8df294a10274d490af73b01206e6..af0831384fba9efef34c237cc5a64d6d9d56ba70 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -30,6 +30,7 @@ class QualityInspection(Document): batch_no: DF.Link | None bom_no: DF.Link | None child_row_reference: DF.Data | None + company: DF.Link | None description: DF.SmallText | None inspected_by: DF.Link inspection_type: DF.Literal["", "Incoming", "Outgoing", "In Process"] @@ -76,6 +77,13 @@ class QualityInspection(Document): self.validate_inspection_required() self.set_child_row_reference() + self.set_company() + + def set_company(self): + if self.reference_type and self.reference_name: + company = frappe.get_cached_value(self.reference_type, self.reference_name, "company") + if company != self.company: + self.company = company def set_child_row_reference(self): if self.child_row_reference: