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

Merge branch 'develop' into improve_taxes_setup

Browse Source
This commit is contained in:
Raffael Meyer 2021-03-15 13:27:56 +01:00 committed by GitHub
commit db24b13a7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/item_group/item_group.json
View File

@ -214,7 +214,7 @@
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"max_attachments": 3, "max_attachments": 3,
"modified": "2021-02-08 17:02:44.951572", "modified": "2021-02-18 13:40:30.049650",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Item Group", "name": "Item Group",
@ -277,7 +277,7 @@
"export": 1, "export": 1,
"print": 1, "print": 1,
"report": 1, "report": 1,
"role": "Customer", "role": "All",
"select": 1, "select": 1,
"share": 1 "share": 1
} }

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

@ -1066,7 +1066,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"max_attachments": 1, "max_attachments": 1,
"modified": "2021-02-18 14:00:19.668049", "modified": "2021-03-15 13:41:04.108932",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",
@ -1118,6 +1118,15 @@
{ {
"read": 1, "read": 1,
"role": "Manufacturing User" "role": "Manufacturing User"
},
{
"email": 1,
"export": 1,
"print": 1,
"report": 1,
"role": "All",
"select": 1,
"share": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,