feat: Add 'Manual Inspection' checkbox
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.js b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
index 544bc2c..f7565fd 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.js
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
@@ -51,6 +51,7 @@
};
}
});
+ },
refresh: function(frm) {
// Ignore cancellation of reference doctype on cancel all.
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
index f582658..9672b62 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
@@ -76,11 +76,12 @@
def inspect_and_set_status(self):
for reading in self.readings:
- if reading.formula_based_criteria:
- self.set_status_based_on_acceptance_formula(reading)
- else:
- # if not formula based check acceptance values set
- self.set_status_based_on_acceptance_values(reading)
+ if not reading.manual_inspection: # dont auto set status if manual
+ if reading.formula_based_criteria:
+ self.set_status_based_on_acceptance_formula(reading)
+ else:
+ # if not formula based check acceptance values set
+ self.set_status_based_on_acceptance_values(reading)
def set_status_based_on_acceptance_values(self, reading):
if cint(reading.non_numeric):
diff --git a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
index 0792f26..264a6ea 100644
--- a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -10,6 +10,7 @@
"status",
"value",
"non_numeric",
+ "manual_inspection",
"column_break_4",
"min_value",
"max_value",
@@ -201,12 +202,19 @@
"fieldname": "non_numeric",
"fieldtype": "Check",
"label": "Non-Numeric"
+ },
+ {
+ "default": "0",
+ "description": "Set the status manually.",
+ "fieldname": "manual_inspection",
+ "fieldtype": "Check",
+ "label": "Manual Inspection"
}
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-12-21 11:36:24.885019",
+ "modified": "2020-12-28 16:40:47.586382",
"modified_by": "Administrator",
"module": "Stock",
"name": "Quality Inspection Reading",