Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-valuation-errror-customer-provided

Browse Source
This commit is contained in:
Afshan 2021-02-22 14:16:33 +05:30 committed by GitHub
commit 133ebc1d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 141 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
"engine": "InnoDB",
"field_order": [
"specification",
"parameter_group",
"value",
"numeric",
"column_break_3",
@ -75,12 +76,20 @@
"in_list_view": 1,
"label": "Numeric",
"width": "80px"
},
{
"fetch_from": "specification.parameter_group",
"fieldname": "parameter_group",
"fieldtype": "Link",
"label": "Parameter Group",
"options": "Quality Inspection Parameter Group",
"read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2021-02-01 19:18:46.924399",
"modified": "2021-02-04 18:50:02.056173",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Quality Inspection Parameter",

12
erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
View File

@ -7,24 +7,34 @@
"engine": "InnoDB",
"field_order": [
"parameter",
"parameter_group",
"description"
],
"fields": [
{
"fieldname": "parameter",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Parameter",
"reqd": 1,
"unique": 1
},
{
"fieldname": "description",
"fieldtype": "Text Editor",
"label": "Description"
},
{
"fieldname": "parameter_group",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Parameter Group",
"options": "Quality Inspection Parameter Group"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2020-12-28 18:06:54.897317",
"modified": "2021-02-19 20:33:30.657406",
"modified_by": "Administrator",
"module": "Stock",
"name": "Quality Inspection Parameter",

0
erpnext/stock/doctype/quality_inspection_parameter_group/__init__.py Normal file
View File

8
erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.js Normal file
View File

@ -0,0 +1,8 @@
// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Quality Inspection Parameter Group', {
// refresh: function(frm) {
// }
});

82
erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.json Normal file
View File

@ -0,0 +1,82 @@
{
"actions": [],
"autoname": "field:group_name",
"creation": "2021-02-04 18:44:12.223295",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"group_name"
],
"fields": [
{
"fieldname": "group_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Parameter Group Name",
"reqd": 1,
"unique": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2021-02-04 18:44:12.223295",
"modified_by": "Administrator",
"module": "Stock",
"name": "Quality Inspection Parameter Group",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Stock User",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Quality Manager",
"share": 1,
"write": 1
},
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Manufacturing User",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}

10
erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document
class QualityInspectionParameterGroup(Document):
pass

10
erpnext/stock/doctype/quality_inspection_parameter_group/test_quality_inspection_parameter_group.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
# import frappe
import unittest
class TestQualityInspectionParameterGroup(unittest.TestCase):
pass

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

@ -7,6 +7,7 @@
"engine": "InnoDB",
"field_order": [
"specification",
"parameter_group",
"status",
"value",
"numeric",
@ -210,12 +211,20 @@
"fieldtype": "Check",
"in_list_view": 1,
"label": "Numeric"
},
{
"fetch_from": "specification.parameter_group",
"fieldname": "parameter_group",
"fieldtype": "Link",
"label": "Parameter Group",
"options": "Quality Inspection Parameter Group",
"read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2021-02-01 19:46:22.138018",
"modified": "2021-02-04 19:15:37.991221",
"modified_by": "Administrator",
"module": "Stock",
"name": "Quality Inspection Reading",