fix: Formula field description and Rearrange grid view
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
diff --git a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
index fc06e89..3e81619 100644
--- a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
@@ -43,7 +43,7 @@
},
{
"depends_on": "formula_based_criteria",
- "description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 > 0.2 and reading_1 < 0.5</b><br>\nNumeric eg. 2: <b>mean > 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C)</b>",
+ "description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 > 0.2 and reading_1 < 0.5</b><br>\nNumeric eg. 2: <b>mean > 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C\")</b>",
"fieldname": "acceptance_formula",
"fieldtype": "Code",
"label": "Acceptance Criteria Formula"
@@ -80,7 +80,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-12-28 17:41:04.350225",
+ "modified": "2021-01-07 21:32:49.866439",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Quality Inspection Parameter",
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 739845b..dddb3d5 100644
--- a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -49,7 +49,6 @@
"depends_on": "eval:(!doc.formula_based_criteria && doc.non_numeric)",
"fieldname": "value",
"fieldtype": "Data",
- "in_list_view": 1,
"label": "Acceptance Criteria Value",
"oldfieldname": "value",
"oldfieldtype": "Data"
@@ -76,7 +75,6 @@
"columns": 1,
"fieldname": "reading_3",
"fieldtype": "Data",
- "in_list_view": 1,
"label": "Reading 3",
"oldfieldname": "reading_3",
"oldfieldtype": "Data"
@@ -153,7 +151,7 @@
},
{
"depends_on": "formula_based_criteria",
- "description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 > 0.2 and reading_1 < 0.5</b><br>\nNumeric eg. 2: <b>mean > 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C)</b>",
+ "description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 > 0.2 and reading_1 < 0.5</b><br>\nNumeric eg. 2: <b>mean > 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C\")</b>",
"fieldname": "acceptance_formula",
"fieldtype": "Code",
"label": "Acceptance Criteria Formula"
@@ -190,6 +188,7 @@
"depends_on": "non_numeric",
"fieldname": "reading_value",
"fieldtype": "Data",
+ "in_list_view": 1,
"label": "Reading Value"
},
{
@@ -202,6 +201,7 @@
"default": "0",
"fieldname": "non_numeric",
"fieldtype": "Check",
+ "in_list_view": 1,
"label": "Non-Numeric"
},
{
@@ -215,7 +215,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-12-28 17:40:47.407210",
+ "modified": "2021-01-07 21:56:40.235579",
"modified_by": "Administrator",
"module": "Stock",
"name": "Quality Inspection Reading",