Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:Add child table for category in smith #166

Merged
merged 1 commit into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions aumms/aumms/doctype/smith/smith.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"warehouse",
"department",
"head_of_smith",
"category",
"hourly_rate",
"section_break_9mmii",
"hourly_rate"
"category"
],
"fields": [
{
Expand Down Expand Up @@ -92,9 +92,9 @@
},
{
"fieldname": "category",
"fieldtype": "Link",
"fieldtype": "Table",
"label": "Category",
"options": "Smith Category"
"options": "Smith Categories"
},
{
"fieldname": "smith_grade",
Expand All @@ -105,7 +105,7 @@
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-10-26 12:11:32.737297",
"modified": "2023-11-02 10:57:11.184968",
"modified_by": "Administrator",
"module": "AuMMS",
"name": "Smith",
Expand Down
Empty file.
40 changes: 40 additions & 0 deletions aumms/aumms/doctype/smith_categories/smith_categories.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"actions": [],
"allow_rename": 1,
"creation": "2023-11-02 10:54:41.645318",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"smith_category",
"description"
],
"fields": [
{
"fieldname": "smith_category",
"fieldtype": "Link",
"in_list_view": 1,
"label": " Smith Category",
"options": "Smith Category"
},
{
"fetch_from": "smith_category.description",
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Description"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2023-11-02 11:01:06.776369",
"modified_by": "Administrator",
"module": "AuMMS",
"name": "Smith Categories",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
8 changes: 8 additions & 0 deletions aumms/aumms/doctype/smith_categories/smith_categories.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright (c) 2023, efeone and contributors
# For license information, please see license.txt

# import frappe
from frappe.model.document import Document

class SmithCategories(Document):
pass
10 changes: 8 additions & 2 deletions aumms/aumms/doctype/smith_category/smith_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,25 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"categories"
"categories",
"description"
],
"fields": [
{
"fieldname": "categories",
"fieldtype": "Data",
"label": "Categories",
"unique": 1
},
{
"fieldname": "description",
"fieldtype": "Small Text",
"label": "Description"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-10-26 11:20:55.759872",
"modified": "2023-11-02 11:25:39.363869",
"modified_by": "Administrator",
"module": "AuMMS",
"name": "Smith Category",
Expand Down
Loading