nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Formula field description and Rearrange grid view

Browse Source 
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
This commit is contained in:
marination
2021-01-08 09:14:43 +05:30
parent 5cfdd0f503
commit ff6ee9d4e7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
View File

@@ -43,7 +43,7 @@
}, },
{ {
"depends_on": "formula_based_criteria", "depends_on": "formula_based_criteria",
"description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 &gt; 0.2 and reading_1 &lt; 0.5</b><br>\nNumeric eg. 2: <b>mean &gt; 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 &gt; 0.2 and reading_1 &lt; 0.5</b><br>\nNumeric eg. 2: <b>mean &gt; 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C\")</b>",
"fieldname": "acceptance_formula", "fieldname": "acceptance_formula",
"fieldtype": "Code", "fieldtype": "Code",
"label": "Acceptance Criteria Formula" "label": "Acceptance Criteria Formula"
@@ -80,7 +80,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-12-28 17:41:04.350225", "modified": "2021-01-07 21:32:49.866439",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item Quality Inspection Parameter", "name": "Item Quality Inspection Parameter",

8
erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
View File

@@ -49,7 +49,6 @@
"depends_on": "eval:(!doc.formula_based_criteria && doc.non_numeric)", "depends_on": "eval:(!doc.formula_based_criteria && doc.non_numeric)",
"fieldname": "value", "fieldname": "value",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Acceptance Criteria Value", "label": "Acceptance Criteria Value",
"oldfieldname": "value", "oldfieldname": "value",
"oldfieldtype": "Data" "oldfieldtype": "Data"
@@ -76,7 +75,6 @@
"columns": 1, "columns": 1,
"fieldname": "reading_3", "fieldname": "reading_3",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Reading 3", "label": "Reading 3",
"oldfieldname": "reading_3", "oldfieldname": "reading_3",
"oldfieldtype": "Data" "oldfieldtype": "Data"
@@ -153,7 +151,7 @@
}, },
{ {
"depends_on": "formula_based_criteria", "depends_on": "formula_based_criteria",
"description": "Simple Python formula applied on Reading fields.<br> Numeric eg. 1: <b>reading_1 &gt; 0.2 and reading_1 &lt; 0.5</b><br>\nNumeric eg. 2: <b>mean &gt; 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 &gt; 0.2 and reading_1 &lt; 0.5</b><br>\nNumeric eg. 2: <b>mean &gt; 3.5</b> (mean of populated fields)<br>\nValue based eg.: <b>reading_value in (\"A\", \"B\", \"C\")</b>",
"fieldname": "acceptance_formula", "fieldname": "acceptance_formula",
"fieldtype": "Code", "fieldtype": "Code",
"label": "Acceptance Criteria Formula" "label": "Acceptance Criteria Formula"
@@ -190,6 +188,7 @@
"depends_on": "non_numeric", "depends_on": "non_numeric",
"fieldname": "reading_value", "fieldname": "reading_value",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Reading Value" "label": "Reading Value"
}, },
{ {
@@ -202,6 +201,7 @@
"default": "0", "default": "0",
"fieldname": "non_numeric", "fieldname": "non_numeric",
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1,
"label": "Non-Numeric" "label": "Non-Numeric"
}, },
{ {
@@ -215,7 +215,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-12-28 17:40:47.407210", "modified": "2021-01-07 21:56:40.235579",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Quality Inspection Reading", "name": "Quality Inspection Reading",