diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json index 409f59ca90..6177d35ced 100644 --- a/erpnext/accounts/doctype/cost_center/cost_center.json +++ b/erpnext/accounts/doctype/cost_center/cost_center.json @@ -139,7 +139,7 @@ "icon": "icon-money", "idx": 1, "in_create": 0, - "modified": "2015-04-23 02:54:26.934607", + "modified": "2015-07-13 05:28:25.504801", "modified_by": "Administrator", "module": "Accounts", "name": "Cost Center", @@ -189,7 +189,7 @@ "apply_user_permissions": 1, "permlevel": 0, "read": 1, - "role": "Material User" + "role": "Stock User" } ], "search_fields": "parent_cost_center, is_group" diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json index 0057d6d5a2..8f887c894f 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json @@ -56,7 +56,7 @@ ], "icon": "icon-calendar", "idx": 1, - "modified": "2015-04-18 07:33:23.922518", + "modified": "2015-07-13 05:28:27.745408", "modified_by": "Administrator", "module": "Accounts", "name": "Fiscal Year", @@ -78,11 +78,63 @@ { "apply_user_permissions": 1, "delete": 0, - "email": 1, + "email": 0, "permlevel": 0, - "print": 1, + "print": 0, "read": 1, - "role": "All" + "role": "Sales User" + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Purchase User", + "share": 0, + "write": 0 + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Accounts User", + "share": 0, + "write": 0 + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Stock User", + "share": 0, + "write": 0 + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Employee", + "share": 0, + "write": 0 } ], "sort_field": "name", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 8ca8ed08c1..307663269b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -882,7 +882,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-07-03 03:26:43.080551", + "modified": "2015-07-13 05:28:29.397705", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", @@ -899,7 +899,7 @@ "print": 0, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json index 27ca393541..a1a38d5ccd 100644 --- a/erpnext/buying/doctype/supplier/supplier.json +++ b/erpnext/buying/doctype/supplier/supplier.json @@ -1,247 +1,247 @@ { - "allow_import": 1, - "allow_rename": 1, - "autoname": "naming_series:", - "creation": "2013-01-10 16:34:11", - "description": "Supplier of Goods or Services.", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", + "allow_import": 1, + "allow_rename": 1, + "autoname": "naming_series:", + "creation": "2013-01-10 16:34:11", + "description": "Supplier of Goods or Services.", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Master", "fields": [ { - "fieldname": "basic_info", - "fieldtype": "Section Break", - "label": "", - "oldfieldtype": "Section Break", - "options": "icon-user", + "fieldname": "basic_info", + "fieldtype": "Section Break", + "label": "", + "oldfieldtype": "Section Break", + "options": "icon-user", "permlevel": 0 - }, + }, { - "fieldname": "naming_series", - "fieldtype": "Select", - "label": "Series", - "no_copy": 1, - "oldfieldname": "naming_series", - "oldfieldtype": "Select", - "options": "SUPP-", + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Series", + "no_copy": 1, + "oldfieldname": "naming_series", + "oldfieldtype": "Select", + "options": "SUPP-", "permlevel": 0 - }, + }, { - "fieldname": "supplier_name", - "fieldtype": "Data", - "in_list_view": 0, - "label": "Supplier Name", - "no_copy": 1, - "oldfieldname": "supplier_name", - "oldfieldtype": "Data", - "permlevel": 0, + "fieldname": "supplier_name", + "fieldtype": "Data", + "in_list_view": 0, + "label": "Supplier Name", + "no_copy": 1, + "oldfieldname": "supplier_name", + "oldfieldtype": "Data", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "column_break0", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break0", + "fieldtype": "Column Break", + "permlevel": 0, "width": "50%" - }, + }, { - "fieldname": "supplier_type", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Supplier Type", - "oldfieldname": "supplier_type", - "oldfieldtype": "Link", - "options": "Supplier Type", - "permlevel": 0, + "fieldname": "supplier_type", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Supplier Type", + "oldfieldname": "supplier_type", + "oldfieldtype": "Link", + "options": "Supplier Type", + "permlevel": 0, "reqd": 1 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "address_contacts", - "fieldtype": "Section Break", - "label": "Address & Contacts", - "oldfieldtype": "Column Break", - "options": "icon-map-marker", + "depends_on": "eval:!doc.__islocal", + "fieldname": "address_contacts", + "fieldtype": "Section Break", + "label": "Address & Contacts", + "oldfieldtype": "Column Break", + "options": "icon-map-marker", "permlevel": 0 - }, + }, { - "fieldname": "address_html", - "fieldtype": "HTML", - "label": "Address HTML", - "permlevel": 0, + "fieldname": "address_html", + "fieldtype": "HTML", + "label": "Address HTML", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "column_break1", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break1", + "fieldtype": "Column Break", + "permlevel": 0, "width": "50%" - }, + }, { - "fieldname": "contact_html", - "fieldtype": "HTML", - "label": "Contact HTML", - "permlevel": 0, + "fieldname": "contact_html", + "fieldtype": "HTML", + "label": "Contact HTML", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "default_payable_accounts", - "fieldtype": "Section Break", - "label": "Default Payable Accounts", + "fieldname": "default_payable_accounts", + "fieldtype": "Section Break", + "label": "Default Payable Accounts", "permlevel": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "description": "Mention if non-standard receivable account applicable", - "fieldname": "accounts", - "fieldtype": "Table", - "label": "Accounts", - "options": "Party Account", + "depends_on": "eval:!doc.__islocal", + "description": "Mention if non-standard receivable account applicable", + "fieldname": "accounts", + "fieldtype": "Table", + "label": "Accounts", + "options": "Party Account", "permlevel": 0 - }, + }, { - "fieldname": "more_info", - "fieldtype": "Section Break", - "label": "More Info", - "oldfieldtype": "Section Break", - "options": "icon-file-text", + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "oldfieldtype": "Section Break", + "options": "icon-file-text", "permlevel": 0 - }, + }, { - "fieldname": "default_currency", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Currency", - "no_copy": 1, - "options": "Currency", + "fieldname": "default_currency", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Currency", + "no_copy": 1, + "options": "Currency", "permlevel": 0 - }, + }, { - "fieldname": "default_price_list", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Price List", - "options": "Price List", + "fieldname": "default_price_list", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Price List", + "options": "Price List", "permlevel": 0 - }, + }, { - "fieldname": "default_taxes_and_charges", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Taxes and Charges", - "options": "Purchase Taxes and Charges Template", + "fieldname": "default_taxes_and_charges", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Taxes and Charges", + "options": "Purchase Taxes and Charges Template", "permlevel": 0 - }, + }, { - "fieldname": "credit_days", - "fieldtype": "Int", - "label": "Credit Days", + "fieldname": "credit_days", + "fieldtype": "Int", + "label": "Credit Days", "permlevel": 0 - }, + }, { - "fieldname": "column_break2", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break2", + "fieldtype": "Column Break", + "permlevel": 0, "width": "50%" - }, + }, { - "fieldname": "website", - "fieldtype": "Data", - "label": "Website", - "oldfieldname": "website", - "oldfieldtype": "Data", + "fieldname": "website", + "fieldtype": "Data", + "label": "Website", + "oldfieldname": "website", + "oldfieldtype": "Data", "permlevel": 0 - }, + }, { - "description": "Statutory info and other general information about your Supplier", - "fieldname": "supplier_details", - "fieldtype": "Text", - "label": "Supplier Details", - "oldfieldname": "supplier_details", - "oldfieldtype": "Code", + "description": "Statutory info and other general information about your Supplier", + "fieldname": "supplier_details", + "fieldtype": "Text", + "label": "Supplier Details", + "oldfieldname": "supplier_details", + "oldfieldtype": "Code", "permlevel": 0 - }, + }, { - "fieldname": "communications", - "fieldtype": "Table", - "hidden": 1, - "label": "Communications", - "options": "Communication", - "permlevel": 0, + "fieldname": "communications", + "fieldtype": "Table", + "hidden": 1, + "label": "Communications", + "options": "Communication", + "permlevel": 0, "print_hide": 1 } - ], - "icon": "icon-user", - "idx": 1, - "modified": "2015-02-24 17:35:03.821319", - "modified_by": "Administrator", - "module": "Buying", - "name": "Supplier", - "owner": "Administrator", + ], + "icon": "icon-user", + "idx": 1, + "modified": "2015-07-13 05:28:29.121285", + "modified_by": "Administrator", + "module": "Buying", + "name": "Supplier", + "owner": "Administrator", "permissions": [ { - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, "role": "Purchase User" - }, + }, { - "amend": 0, - "create": 0, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase Manager", - "submit": 0, + "amend": 0, + "create": 0, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Purchase Manager", + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase Master Manager", - "share": 1, - "submit": 0, + "amend": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Purchase Master Manager", + "share": 1, + "submit": 0, "write": 1 - }, + }, { - "apply_user_permissions": 1, - "permlevel": 0, - "read": 1, - "role": "Material User" - }, + "apply_user_permissions": 1, + "permlevel": 0, + "read": 1, + "role": "Stock User" + }, { - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Material Manager" - }, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Stock Manager" + }, { - "apply_user_permissions": 1, - "permlevel": 0, - "read": 1, + "apply_user_permissions": 1, + "permlevel": 0, + "read": 1, "role": "Accounts User" - }, + }, { - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, "role": "Accounts Manager" } - ], - "search_fields": "supplier_name, supplier_type", + ], + "search_fields": "supplier_name, supplier_type", "title_field": "supplier_name" -} +} \ No newline at end of file diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index e51b2526d3..02d24c7fea 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -660,7 +660,7 @@ "icon": "icon-shopping-cart", "idx": 1, "is_submittable": 1, - "modified": "2015-06-15 15:39:08.954248", + "modified": "2015-07-13 05:28:30.252636", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", @@ -723,7 +723,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/change_log/current/readme.md b/erpnext/change_log/current/readme.md new file mode 100644 index 0000000000..e93bb75396 --- /dev/null +++ b/erpnext/change_log/current/readme.md @@ -0,0 +1,3 @@ +Leave change log files in this folder for user release notes. + +(this file is just a place holder, don't delete it) diff --git a/erpnext/change_log/current/rename.md b/erpnext/change_log/current/rename.md new file mode 100644 index 0000000000..54efb50678 --- /dev/null +++ b/erpnext/change_log/current/rename.md @@ -0,0 +1,3 @@ +- Role rename: **Material User** is now **Stock User** +- Role rename: **Material Manager** is now **Stock Manager** +- Role rename: **Material Master Manager** is now **Item Manager** diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json index 688fa39354..fc7e604dba 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json @@ -29,7 +29,7 @@ ], "icon": "icon-flag", "idx": 1, - "modified": "2015-04-19 06:47:51.860833", + "modified": "2015-07-13 04:46:38.897484", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim Type", @@ -55,7 +55,7 @@ "print": 0, "read": 1, "report": 0, - "role": "All", + "role": "Employee", "share": 0, "write": 0 } diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json index ccf3f68133..75aab9963e 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.json +++ b/erpnext/manufacturing/doctype/production_order/production_order.json @@ -368,7 +368,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2015-07-09 03:31:01.291811", + "modified": "2015-07-13 05:28:23.259016", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order", @@ -395,7 +395,7 @@ "permlevel": 0, "read": 1, "report": 1, - "role": "Material User" + "role": "Stock User" } ], "title_field": "production_item" diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 26c1d7be3c..0e0598f5e9 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -175,3 +175,6 @@ erpnext.patches.v5_1.fix_credit_days_based_on erpnext.patches.v5_1.track_operations erpnext.patches.v5_1.sales_bom_rename execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True) +execute:frappe.rename_doc("Role", "Material User", "Stock User") +execute:frappe.rename_doc("Role", "Material Manager", "Stock Manager") +execute:frappe.rename_doc("Role", "Material Master Manager", "Item Manager") diff --git a/erpnext/patches/v5_1/fix_credit_days_based_on.py b/erpnext/patches/v5_1/fix_credit_days_based_on.py index f9c91f8ebc..6df19f201a 100644 --- a/erpnext/patches/v5_1/fix_credit_days_based_on.py +++ b/erpnext/patches/v5_1/fix_credit_days_based_on.py @@ -4,6 +4,6 @@ import frappe def execute(): for dt in ("Customer", "Customer Group", "Company"): - frappe.reload_doctype(dt) + frappe.reload_doctype(dt, force=True) frappe.db.sql("""update `tab{0}` set credit_days_based_on='Fixed Days' - where ifnull(credit_days, 0) > 0""".format(dt)) \ No newline at end of file + where ifnull(credit_days, 0) > 0""".format(dt)) diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json index edae9b4ee5..cced319cf5 100644 --- a/erpnext/selling/doctype/customer/customer.json +++ b/erpnext/selling/doctype/customer/customer.json @@ -278,7 +278,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2015-07-09 12:41:31.037121", + "modified": "2015-07-13 05:28:25.753684", "modified_by": "Administrator", "module": "Selling", "name": "Customer", @@ -343,7 +343,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User" + "role": "Stock User" }, { "email": 1, @@ -351,7 +351,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager" + "role": "Stock Manager" }, { "email": 1, diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json index c998b23c12..3f4e2965d6 100644 --- a/erpnext/selling/doctype/product_bundle/product_bundle.json +++ b/erpnext/selling/doctype/product_bundle/product_bundle.json @@ -46,7 +46,7 @@ "icon": "icon-sitemap", "idx": 1, "is_submittable": 0, - "modified": "2015-07-06 06:11:10.534423", + "modified": "2015-07-13 05:28:28.140327", "modified_by": "Administrator", "module": "Selling", "name": "Product Bundle", @@ -61,7 +61,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 0, "write": 1 @@ -76,7 +76,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 28f98e4330..4ce961dc84 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1089,7 +1089,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2015-07-03 03:25:20.180721", + "modified": "2015-07-13 05:28:26.889049", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", @@ -1170,7 +1170,7 @@ "permlevel": 0, "read": 1, "report": 1, - "role": "Material User" + "role": "Stock User" }, { "permlevel": 1, diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 91daa3f1cb..59e58b0c78 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -192,11 +192,11 @@ class TestSalesOrder(unittest.TestCase): frappe.permissions.add_user_permission("Company", "_Test Company 1", "test2@example.com") test_user = frappe.get_doc("User", "test@example.com") - test_user.add_roles("Sales User", "Material User") + test_user.add_roles("Sales User", "Stock User") test_user.remove_roles("Sales Manager") test_user_2 = frappe.get_doc("User", "test2@example.com") - test_user_2.add_roles("Sales User", "Material User") + test_user_2.add_roles("Sales User", "Stock User") test_user_2.remove_roles("Sales Manager") frappe.set_user("test@example.com") diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json index 2b20b1011b..288bdd7602 100644 --- a/erpnext/setup/doctype/brand/brand.json +++ b/erpnext/setup/doctype/brand/brand.json @@ -33,7 +33,7 @@ "icon": "icon-certificate", "idx": 1, "in_dialog": 0, - "modified": "2015-02-05 05:11:35.319683", + "modified": "2015-07-13 05:28:24.597639", "modified_by": "Administrator", "module": "Setup", "name": "Brand", @@ -47,7 +47,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "write": 1 }, @@ -61,7 +61,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index ca8e694b31..9a84f8993e 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -1,473 +1,512 @@ { - "allow_import": 1, - "allow_rename": 1, - "autoname": "field:company_name", - "creation": "2013-04-10 08:35:39", - "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Master", + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:company_name", + "creation": "2013-04-10 08:35:39", + "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Master", "fields": [ { - "fieldname": "details", - "fieldtype": "Section Break", - "label": "", - "oldfieldtype": "Section Break", - "permlevel": 0, + "fieldname": "details", + "fieldtype": "Section Break", + "label": "", + "oldfieldtype": "Section Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "company_name", - "fieldtype": "Data", - "label": "Company", - "no_copy": 0, - "oldfieldname": "company_name", - "oldfieldtype": "Data", - "permlevel": 0, - "read_only": 0, + "fieldname": "company_name", + "fieldtype": "Data", + "label": "Company", + "no_copy": 0, + "oldfieldname": "company_name", + "oldfieldtype": "Data", + "permlevel": 0, + "read_only": 0, "reqd": 1 - }, + }, { - "description": "", - "fieldname": "abbr", - "fieldtype": "Data", - "label": "Abbr", - "no_copy": 0, - "oldfieldname": "abbr", - "oldfieldtype": "Data", - "permlevel": 0, - "read_only": 0, + "description": "", + "fieldname": "abbr", + "fieldtype": "Data", + "label": "Abbr", + "no_copy": 0, + "oldfieldname": "abbr", + "oldfieldtype": "Data", + "permlevel": 0, + "read_only": 0, "reqd": 1 - }, + }, { - "depends_on": "eval:!doc.__islocal && in_list(user_roles, \"System Manager\")", - "fieldname": "change_abbr", - "fieldtype": "Button", - "label": "Change Abbreviation", + "depends_on": "eval:!doc.__islocal && in_list(user_roles, \"System Manager\")", + "fieldname": "change_abbr", + "fieldtype": "Button", + "label": "Change Abbreviation", "permlevel": 0 - }, + }, { - "fieldname": "cb0", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "cb0", + "fieldtype": "Column Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "domain", - "fieldtype": "Select", - "label": "Domain", - "options": "Distribution\nManufacturing\nRetail\nServices", - "permlevel": 0, + "fieldname": "domain", + "fieldtype": "Select", + "label": "Domain", + "options": "Distribution\nManufacturing\nRetail\nServices", + "permlevel": 0, "reqd": 0 - }, + }, { - "fieldname": "charts_section", - "fieldtype": "Section Break", - "hidden": 0, - "label": "Default Values", + "fieldname": "charts_section", + "fieldtype": "Section Break", + "hidden": 0, + "label": "Default Values", "permlevel": 0 - }, + }, { - "fieldname": "default_letter_head", - "fieldtype": "Link", - "label": "Default Letter Head", - "options": "Letter Head", - "permlevel": 0, + "fieldname": "default_letter_head", + "fieldtype": "Link", + "label": "Default Letter Head", + "options": "Letter Head", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "default_holiday_list", - "fieldtype": "Link", - "label": "Default Holiday List", - "options": "Holiday List", - "permlevel": 0, + "fieldname": "default_holiday_list", + "fieldtype": "Link", + "label": "Default Holiday List", + "options": "Holiday List", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "country", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Country", - "options": "Country", - "permlevel": 0, + "fieldname": "country", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Country", + "options": "Country", + "permlevel": 0, "reqd": 1 - }, + }, { - "fieldname": "column_break_10", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break_10", + "fieldtype": "Column Break", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "default_currency", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Currency", - "options": "Currency", - "permlevel": 0, - "read_only": 0, + "fieldname": "default_currency", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Currency", + "options": "Currency", + "permlevel": 0, + "read_only": 0, "reqd": 1 - }, + }, { - "fieldname": "chart_of_accounts", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 1, - "label": "Chart of Accounts", - "options": "", + "fieldname": "chart_of_accounts", + "fieldtype": "Select", + "hidden": 0, + "ignore_user_permissions": 1, + "label": "Chart of Accounts", + "options": "", "permlevel": 0 - }, + }, { - "fieldname": "default_terms", - "fieldtype": "Link", - "label": "Default Terms", - "options": "Terms and Conditions", - "permlevel": 0, + "fieldname": "default_terms", + "fieldtype": "Link", + "label": "Default Terms", + "options": "Terms and Conditions", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "default_settings", - "fieldtype": "Section Break", - "label": "Accounts Settings", - "oldfieldtype": "Section Break", - "permlevel": 0, + "fieldname": "default_settings", + "fieldtype": "Section Break", + "label": "Accounts Settings", + "oldfieldtype": "Section Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_bank_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Bank Account", - "no_copy": 1, - "oldfieldname": "default_bank_account", - "oldfieldtype": "Link", - "options": "Account", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_bank_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Bank Account", + "no_copy": 1, + "oldfieldname": "default_bank_account", + "oldfieldtype": "Link", + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_cash_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Cash Account", - "no_copy": 1, - "options": "Account", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_cash_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Cash Account", + "no_copy": 1, + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_receivable_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Receivable Account", - "no_copy": 1, - "oldfieldname": "receivables_group", - "oldfieldtype": "Link", - "options": "Account", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_receivable_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Receivable Account", + "no_copy": 1, + "oldfieldname": "receivables_group", + "oldfieldtype": "Link", + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "round_off_account", - "fieldtype": "Link", - "ignore_user_permissions": 0, - "label": "Round Off Account", - "options": "Account", - "permlevel": 0, + "fieldname": "round_off_account", + "fieldtype": "Link", + "ignore_user_permissions": 0, + "label": "Round Off Account", + "options": "Account", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "column_break0", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "fieldname": "column_break0", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_payable_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Payable Account", - "no_copy": 1, - "oldfieldname": "payables_group", - "oldfieldtype": "Link", - "options": "Account", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_payable_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Payable Account", + "no_copy": 1, + "oldfieldname": "payables_group", + "oldfieldtype": "Link", + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_expense_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Cost of Goods Sold Account", - "no_copy": 1, - "options": "Account", + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_expense_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Cost of Goods Sold Account", + "no_copy": 1, + "options": "Account", "permlevel": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "default_income_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Default Income Account", - "no_copy": 1, - "options": "Account", + "depends_on": "eval:!doc.__islocal", + "fieldname": "default_income_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Default Income Account", + "no_copy": 1, + "options": "Account", "permlevel": 0 - }, + }, { - "fieldname": "round_off_cost_center", - "fieldtype": "Link", - "ignore_user_permissions": 0, - "label": "Round Off Cost Center", - "options": "Cost Center", - "permlevel": 0, + "fieldname": "round_off_cost_center", + "fieldtype": "Link", + "ignore_user_permissions": 0, + "label": "Round Off Cost Center", + "options": "Cost Center", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "section_break_22", - "fieldtype": "Section Break", - "permlevel": 0, + "fieldname": "section_break_22", + "fieldtype": "Section Break", + "permlevel": 0, "precision": "" - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "cost_center", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Cost Center", - "no_copy": 1, - "options": "Cost Center", + "depends_on": "eval:!doc.__islocal", + "fieldname": "cost_center", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Cost Center", + "no_copy": 1, + "options": "Cost Center", "permlevel": 0 - }, + }, { "fieldname": "credit_days_based_on", - "fieldtype": "Select", - "label": "Credit Days Based On", - "options": "\nFixed Days\nLast Day of the Next Month", - "permlevel": 0, + "fieldtype": "Select", + "label": "Credit Days Based On", + "options": "\nFixed Days\nLast Day of the Next Month", + "permlevel": 0, "precision": "" - }, + }, { - "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", - "fieldname": "credit_days", - "fieldtype": "Int", - "label": "Credit Days", - "oldfieldname": "credit_days", - "oldfieldtype": "Int", - "permlevel": 0, + "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", + "fieldname": "credit_days", + "fieldtype": "Int", + "label": "Credit Days", + "oldfieldname": "credit_days", + "oldfieldtype": "Int", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "credit_limit", - "fieldtype": "Currency", - "label": "Credit Limit", - "oldfieldname": "credit_limit", - "oldfieldtype": "Currency", - "options": "default_currency", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "credit_limit", + "fieldtype": "Currency", + "label": "Credit Limit", + "oldfieldname": "credit_limit", + "oldfieldtype": "Currency", + "options": "default_currency", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "column_break_26", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break_26", + "fieldtype": "Column Break", + "permlevel": 0, "precision": "" - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "yearly_bgt_flag", - "fieldtype": "Select", - "label": "If Yearly Budget Exceeded", - "oldfieldname": "yearly_bgt_flag", - "oldfieldtype": "Select", - "options": "\nWarn\nIgnore\nStop", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "yearly_bgt_flag", + "fieldtype": "Select", + "label": "If Yearly Budget Exceeded", + "oldfieldname": "yearly_bgt_flag", + "oldfieldtype": "Select", + "options": "\nWarn\nIgnore\nStop", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "monthly_bgt_flag", - "fieldtype": "Select", - "label": "If Monthly Budget Exceeded", - "oldfieldname": "monthly_bgt_flag", - "oldfieldtype": "Select", - "options": "\nWarn\nIgnore\nStop", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "monthly_bgt_flag", + "fieldtype": "Select", + "label": "If Monthly Budget Exceeded", + "oldfieldname": "monthly_bgt_flag", + "oldfieldtype": "Select", + "options": "\nWarn\nIgnore\nStop", + "permlevel": 0, "read_only": 0 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "fieldname": "auto_accounting_for_stock_settings", - "fieldtype": "Section Break", - "label": "Stock Settings", - "permlevel": 0, + "depends_on": "eval:!doc.__islocal", + "fieldname": "auto_accounting_for_stock_settings", + "fieldtype": "Section Break", + "label": "Stock Settings", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "stock_received_but_not_billed", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Stock Received But Not Billed", - "no_copy": 1, - "options": "Account", - "permlevel": 0, + "fieldname": "stock_received_but_not_billed", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Stock Received But Not Billed", + "no_copy": 1, + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "stock_adjustment_account", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Stock Adjustment Account", - "no_copy": 1, - "options": "Account", - "permlevel": 0, + "fieldname": "stock_adjustment_account", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Stock Adjustment Account", + "no_copy": 1, + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "column_break_32", - "fieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break_32", + "fieldtype": "Column Break", + "permlevel": 0, "precision": "" - }, + }, { - "fieldname": "expenses_included_in_valuation", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Expenses Included In Valuation", - "no_copy": 1, - "options": "Account", - "permlevel": 0, + "fieldname": "expenses_included_in_valuation", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Expenses Included In Valuation", + "no_copy": 1, + "options": "Account", + "permlevel": 0, "read_only": 0 - }, + }, { - "description": "For reference only.", - "fieldname": "company_info", - "fieldtype": "Section Break", - "label": "Company Info", - "permlevel": 0, + "description": "For reference only.", + "fieldname": "company_info", + "fieldtype": "Section Break", + "label": "Company Info", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "address", - "fieldtype": "Small Text", - "label": "Address", - "oldfieldname": "address", - "oldfieldtype": "Small Text", - "permlevel": 0, + "fieldname": "address", + "fieldtype": "Small Text", + "label": "Address", + "oldfieldname": "address", + "oldfieldtype": "Small Text", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "column_break1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "fieldname": "column_break1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "phone_no", - "fieldtype": "Data", - "label": "Phone No", - "oldfieldname": "phone_no", - "oldfieldtype": "Data", - "options": "Phone", - "permlevel": 0, + "fieldname": "phone_no", + "fieldtype": "Data", + "label": "Phone No", + "oldfieldname": "phone_no", + "oldfieldtype": "Data", + "options": "Phone", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "fax", - "fieldtype": "Data", - "label": "Fax", - "oldfieldname": "fax", - "oldfieldtype": "Data", - "options": "Phone", - "permlevel": 0, + "fieldname": "fax", + "fieldtype": "Data", + "label": "Fax", + "oldfieldname": "fax", + "oldfieldtype": "Data", + "options": "Phone", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "email", - "fieldtype": "Data", - "label": "Email", - "oldfieldname": "email", - "oldfieldtype": "Data", - "options": "Email", - "permlevel": 0, + "fieldname": "email", + "fieldtype": "Data", + "label": "Email", + "oldfieldname": "email", + "oldfieldtype": "Data", + "options": "Email", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "website", - "fieldtype": "Data", - "label": "Website", - "oldfieldname": "website", - "oldfieldtype": "Data", - "permlevel": 0, + "fieldname": "website", + "fieldtype": "Data", + "label": "Website", + "oldfieldname": "website", + "oldfieldtype": "Data", + "permlevel": 0, "read_only": 0 - }, + }, { - "description": "", - "fieldname": "registration_info", - "fieldtype": "Section Break", - "label": "", - "oldfieldtype": "Section Break", - "permlevel": 0, - "read_only": 0, + "description": "", + "fieldname": "registration_info", + "fieldtype": "Section Break", + "label": "", + "oldfieldtype": "Section Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "description": "Company registration numbers for your reference. Tax numbers etc.", - "fieldname": "registration_details", - "fieldtype": "Code", - "label": "Registration Details", - "oldfieldname": "registration_details", - "oldfieldtype": "Code", - "permlevel": 0, + "description": "Company registration numbers for your reference. Tax numbers etc.", + "fieldname": "registration_details", + "fieldtype": "Code", + "label": "Registration Details", + "oldfieldname": "registration_details", + "oldfieldtype": "Code", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "delete_company_transactions", - "fieldtype": "Button", - "label": "Delete Company Transactions", - "permlevel": 0, + "fieldname": "delete_company_transactions", + "fieldtype": "Button", + "label": "Delete Company Transactions", + "permlevel": 0, "precision": "" } - ], - "icon": "icon-building", - "idx": 1, - "modified": "2015-07-09 14:20:56.619890", - "modified_by": "Administrator", - "module": "Setup", - "name": "Company", - "owner": "Administrator", + ], + "icon": "icon-building", + "idx": 1, + "modified": "2015-07-13 05:00:14.678471", + "modified_by": "Administrator", + "module": "Setup", + "name": "Company", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "submit": 0, + "amend": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "submit": 0, "write": 1 - }, + }, { - "apply_user_permissions": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "role": "All" + "apply_user_permissions": 1, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "role": "Accounts User" + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Employee", + "share": 0, + "write": 0 + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Sales User", + "share": 0, + "write": 0 + }, + { + "create": 0, + "delete": 0, + "email": 0, + "export": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 0, + "role": "Purchase User", + "share": 0, + "write": 0 } ] -} \ No newline at end of file +} diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json index 32d0bb656e..1a8c5fa972 100644 --- a/erpnext/setup/doctype/item_group/item_group.json +++ b/erpnext/setup/doctype/item_group/item_group.json @@ -190,7 +190,7 @@ "in_create": 1, "issingle": 0, "max_attachments": 3, - "modified": "2015-02-16 23:50:48.113171", + "modified": "2015-07-13 05:28:26.719060", "modified_by": "Administrator", "module": "Setup", "name": "Item Group", @@ -205,7 +205,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "submit": 0, "write": 0 }, @@ -219,7 +219,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, @@ -231,7 +231,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json index cb1b6e158f..c1665904b8 100644 --- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json +++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json @@ -32,7 +32,7 @@ ], "icon": "icon-legal", "idx": 1, - "modified": "2015-02-05 05:11:48.092112", + "modified": "2015-07-13 05:28:25.035649", "modified_by": "Administrator", "module": "Setup", "name": "Terms and Conditions", @@ -103,7 +103,7 @@ "apply_user_permissions": 1, "permlevel": 0, "read": 1, - "role": "Material User" + "role": "Stock User" } ] } \ No newline at end of file diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json index ab1d7e75ea..256b3287c7 100644 --- a/erpnext/setup/doctype/territory/territory.json +++ b/erpnext/setup/doctype/territory/territory.json @@ -136,7 +136,7 @@ "icon": "icon-map-marker", "idx": 1, "in_create": 0, - "modified": "2015-02-05 05:11:48.158225", + "modified": "2015-07-13 05:28:25.602509", "modified_by": "Administrator", "module": "Setup", "name": "Territory", @@ -188,7 +188,7 @@ "apply_user_permissions": 1, "permlevel": 0, "read": 1, - "role": "Material User" + "role": "Stock User" }, { "apply_user_permissions": 1, diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json index c0bb4e1b0a..9a1bef4a1a 100644 --- a/erpnext/setup/doctype/uom/uom.json +++ b/erpnext/setup/doctype/uom/uom.json @@ -27,7 +27,7 @@ ], "icon": "icon-compass", "idx": 1, - "modified": "2015-02-05 05:11:48.493718", + "modified": "2015-07-13 05:28:23.143040", "modified_by": "Administrator", "module": "Setup", "name": "UOM", @@ -42,7 +42,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 @@ -56,7 +56,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "submit": 0, "write": 0 }, @@ -70,7 +70,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 } diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py index feb55c7222..824786b1c4 100644 --- a/erpnext/stock/__init__.py +++ b/erpnext/stock/__init__.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals install_docs = [ - {"doctype":"Role", "role_name":"Material Manager", "name":"Material Manager"}, - {"doctype":"Role", "role_name":"Material Master Manager", "name":"Material Master Manager"}, - {"doctype":"Role", "role_name":"Material User", "name":"Material User"}, + {"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"}, + {"doctype":"Role", "role_name":"Item Manager", "name":"Item Manager"}, + {"doctype":"Role", "role_name":"Stock User", "name":"Stock User"}, {"doctype":"Role", "role_name":"Quality Manager", "name":"Quality Manager"}, {"doctype":"Item Group", "item_group_name":"All Item Groups", "is_group":"Yes"}, {"doctype":"Item Group", "item_group_name":"Default", diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json index 756955b139..3430ee1fa9 100644 --- a/erpnext/stock/doctype/batch/batch.json +++ b/erpnext/stock/doctype/batch/batch.json @@ -62,7 +62,7 @@ "icon": "icon-archive", "idx": 1, "max_attachments": 5, - "modified": "2015-02-05 05:11:34.824412", + "modified": "2015-07-13 05:28:24.973774", "modified_by": "Administrator", "module": "Stock", "name": "Batch", @@ -77,7 +77,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json index 2160ca4c03..11a86ef336 100644 --- a/erpnext/stock/doctype/bin/bin.json +++ b/erpnext/stock/doctype/bin/bin.json @@ -162,7 +162,7 @@ "hide_toolbar": 1, "idx": 1, "in_create": 1, - "modified": "2014-05-27 03:49:07.654364", + "modified": "2015-07-13 05:28:24.087304", "modified_by": "Administrator", "module": "Stock", "name": "Bin", @@ -197,7 +197,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 } diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 3859d63b2c..72a72278a0 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -1070,7 +1070,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2015-07-07 02:37:08.064584", + "modified": "2015-07-13 05:28:29.814096", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", @@ -1087,7 +1087,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "share": 1, "submit": 1, "write": 1 @@ -1102,7 +1102,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 @@ -1151,7 +1151,7 @@ { "permlevel": 1, "read": 1, - "role": "Material Manager", + "role": "Stock Manager", "write": 1 } ], diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 8fdb52bf23..1012cdab89 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -903,7 +903,7 @@ "icon": "icon-tag", "idx": 1, "max_attachments": 1, - "modified": "2015-07-09 02:23:47.669199", + "modified": "2015-07-13 05:28:28.698107", "modified_by": "Administrator", "module": "Stock", "name": "Item", @@ -918,7 +918,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 @@ -932,7 +932,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "submit": 0, "write": 0 }, @@ -946,7 +946,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json index 3b2bd0eff1..1824fb68f5 100644 --- a/erpnext/stock/doctype/item_attribute/item_attribute.json +++ b/erpnext/stock/doctype/item_attribute/item_attribute.json @@ -54,7 +54,7 @@ "is_submittable": 0, "issingle": 0, "istable": 0, - "modified": "2015-02-05 05:11:39.794192", + "modified": "2015-07-13 05:28:20.561939", "modified_by": "Administrator", "module": "Stock", "name": "Item Attribute", @@ -74,7 +74,7 @@ "print": 0, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "set_user_permissions": 0, "share": 1, "submit": 0, diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json index 9575ce9446..1d31f03b90 100644 --- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json @@ -102,7 +102,7 @@ ], "icon": "icon-usd", "is_submittable": 1, - "modified": "2015-02-11 16:21:49.528566", + "modified": "2015-07-13 05:28:22.039577", "modified_by": "Administrator", "module": "Stock", "name": "Landed Cost Voucher", @@ -118,7 +118,7 @@ "permlevel": 0, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 diff --git a/erpnext/stock/doctype/manage_variants/manage_variants.json b/erpnext/stock/doctype/manage_variants/manage_variants.json index 7c61620b08..ff4f4367ef 100644 --- a/erpnext/stock/doctype/manage_variants/manage_variants.json +++ b/erpnext/stock/doctype/manage_variants/manage_variants.json @@ -75,7 +75,7 @@ "is_submittable": 0, "issingle": 1, "istable": 0, - "modified": "2015-06-30 13:40:59.946655", + "modified": "2015-07-13 05:28:29.057918", "modified_by": "Administrator", "module": "Stock", "name": "Manage Variants", @@ -91,7 +91,7 @@ "print": 1, "read": 1, "report": 0, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "write": 1 } diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index a3026c4ca4..8c808c7a73 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -221,7 +221,7 @@ "icon": "icon-ticket", "idx": 1, "is_submittable": 1, - "modified": "2015-06-09 05:47:05.934432", + "modified": "2015-07-13 05:28:25.935998", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", @@ -252,7 +252,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 @@ -268,7 +268,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "share": 1, "submit": 1, "write": 1 diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json index 431ac9b023..1ba25c9749 100644 --- a/erpnext/stock/doctype/packing_slip/packing_slip.json +++ b/erpnext/stock/doctype/packing_slip/packing_slip.json @@ -197,7 +197,7 @@ "icon": "icon-suitcase", "idx": 1, "is_submittable": 1, - "modified": "2015-02-20 05:09:24.405911", + "modified": "2015-07-13 05:28:24.850528", "modified_by": "Administrator", "module": "Stock", "name": "Packing Slip", @@ -214,7 +214,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "share": 1, "submit": 1, "write": 1 @@ -245,7 +245,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 1, "write": 1 @@ -260,7 +260,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index c1a3538aea..6e344b61e0 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -854,7 +854,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2015-06-15 15:38:43.754869", + "modified": "2015-07-13 05:28:27.389559", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", @@ -870,7 +870,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 @@ -886,7 +886,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "share": 1, "submit": 1, "write": 1 @@ -928,7 +928,7 @@ { "permlevel": 1, "read": 1, - "role": "Material Manager", + "role": "Stock Manager", "write": 1 } ], diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 3ef2e15085..8ffe7ed9dd 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -418,7 +418,7 @@ "icon": "icon-barcode", "idx": 1, "in_create": 0, - "modified": "2015-05-28 21:35:58.378231", + "modified": "2015-07-13 05:28:27.961178", "modified_by": "Administrator", "module": "Stock", "name": "Serial No", @@ -432,7 +432,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 @@ -446,7 +446,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "submit": 0, "write": 0 }, @@ -460,7 +460,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 } diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index 11898cee1e..06dec5808b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -678,7 +678,7 @@ "is_submittable": 1, "issingle": 0, "max_attachments": 0, - "modified": "2015-05-20 07:58:59.025553", + "modified": "2015-07-13 05:28:26.085266", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", @@ -695,7 +695,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "share": 1, "submit": 1, "write": 1 @@ -741,7 +741,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 81c07fbf1e..70d6413ce1 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -704,7 +704,7 @@ class TestStockEntry(unittest.TestCase): def test_warehouse_company_validation(self): set_perpetual_inventory(0) frappe.get_doc("User", "test2@example.com")\ - .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager") + .add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager") frappe.set_user("test2@example.com") from erpnext.stock.utils import InvalidWarehouseCompany @@ -720,11 +720,11 @@ class TestStockEntry(unittest.TestCase): frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "User Permission") frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "User Permission") test_user = frappe.get_doc("User", "test@example.com") - test_user.add_roles("Sales User", "Sales Manager", "Material User") - test_user.remove_roles("Material Manager") + test_user.add_roles("Sales User", "Sales Manager", "Stock User") + test_user.remove_roles("Stock Manager") frappe.get_doc("User", "test2@example.com")\ - .add_roles("Sales User", "Sales Manager", "Material User", "Material Manager") + .add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager") frappe.set_user("test@example.com") st1 = frappe.copy_doc(test_records[0]) diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json index f6bd010ba8..780bcc9c33 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json @@ -266,7 +266,7 @@ "icon": "icon-list", "idx": 1, "in_create": 1, - "modified": "2014-06-23 08:07:56.370276", + "modified": "2015-07-13 05:28:27.826340", "modified_by": "Administrator", "module": "Stock", "name": "Stock Ledger Entry", @@ -280,7 +280,7 @@ "permlevel": 0, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json index db09565442..72d0f66f6d 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json @@ -149,7 +149,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2015-07-06 03:13:52.054017", + "modified": "2015-07-13 05:28:29.255124", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reconciliation", @@ -163,7 +163,7 @@ "permlevel": 0, "read": 1, "report": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 1, "write": 1 diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 2a8b54cc89..4907e45c96 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -103,7 +103,7 @@ "icon": "icon-cog", "idx": 1, "issingle": 1, - "modified": "2015-02-18 08:37:18.229705", + "modified": "2015-07-13 05:28:23.839277", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", @@ -115,7 +115,7 @@ "permlevel": 0, "print": 1, "read": 1, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "write": 1 } diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json index 97826066e8..3747f5c449 100644 --- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json +++ b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json @@ -43,7 +43,7 @@ "idx": 1, "in_create": 0, "issingle": 1, - "modified": "2015-02-05 05:11:47.290476", + "modified": "2015-07-13 05:28:25.689187", "modified_by": "Administrator", "module": "Stock", "name": "Stock UOM Replace Utility", @@ -56,7 +56,7 @@ "print": 1, "read": 1, "report": 0, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 @@ -68,7 +68,7 @@ "print": 1, "read": 1, "report": 0, - "role": "Material Manager", + "role": "Stock Manager", "share": 1, "submit": 0, "write": 1 diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json index e9bb900867..670aa1bcfe 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.json +++ b/erpnext/stock/doctype/warehouse/warehouse.json @@ -151,7 +151,7 @@ ], "icon": "icon-building", "idx": 1, - "modified": "2015-02-05 05:11:48.803063", + "modified": "2015-07-13 05:28:25.214824", "modified_by": "Administrator", "module": "Stock", "name": "Warehouse", @@ -166,7 +166,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material Master Manager", + "role": "Item Manager", "share": 1, "submit": 0, "write": 1 @@ -181,7 +181,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Material User", + "role": "Stock User", "submit": 0, "write": 0 }, diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index f5b612c53c..f739f94556 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -147,7 +147,7 @@ def send_email_notification(mr_list): email_list = frappe.db.sql_list("""select distinct r.parent from tabUserRole r, tabUser p where p.name = r.parent and p.enabled = 1 and p.docstatus < 2 - and r.role in ('Purchase Manager','Material Manager') + and r.role in ('Purchase Manager','Stock Manager') and p.name not in ('Administrator', 'All', 'Guest')""") msg="""

Following Material Requests has been raised automatically \