Merge branch 'hotfix'

bumped to version 9.0.5
Gst doctype roles (#10984 )
2017-10-02 12:09:00 +05:30 · 2017-10-02 12:38:59 +06:00 · 2017-10-02 11:38:40 +05:30 · 2017-10-02 11:37:18 +05:30 · 2017-10-02 11:36:10 +05:30 · 2017-09-30 10:46:56 +05:30
5 changed files with 15 additions and 58 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides

-__version__ = '9.0.4'
+__version__ = '9.0.5'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.json
+++ b/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.json
@@ -84,34 +84,13 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:38:52.220743", 
- "modified_by": "ewdszx@ed.ews", 
+ "modified": "2017-09-29 14:38:52.220743", 
+ "modified_by": "Administrator", 
 "module": "Regional", 
 "name": "GST HSN Code", 
 "name_case": "", 
 "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
+ "permissions": [], 
 "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
--- a/erpnext/regional/doctype/gst_settings/gst_settings.json
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.json
@@ -83,34 +83,13 @@
 "issingle": 1, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:39:15.625952", 
- "modified_by": "ewdszx@ed.ews", 
+ "modified": "2017-09-29 14:39:15.625952", 
+ "modified_by": "Administrator", 
 "module": "Regional", 
 "name": "GST Settings", 
 "name_case": "", 
 "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
+ "permissions": [], 
 "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -72,7 +72,6 @@ def add_custom_roles_for_reports():

 def add_permissions():
 	for doctype in ('GST HSN Code', 'GST Settings'):
-		add_permission(doctype, 'Accounts Manager', 0)
 		add_permission(doctype, 'All', 0)

 def add_print_formats():
--- a/erpnext/setup/setup_wizard/healthcare.py
+++ b/erpnext/setup/setup_wizard/healthcare.py
@@ -191,21 +191,21 @@ def create_healthcare_item_groups():
 def create_lab_test_items():
 	records = [
 		{"doctype": "Item", "item_code": "MCH", "item_name": "MCH", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "LDL", "item_name": "LDL", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "GTT", "item_name": "GTT", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "HDL", "item_name": "HDL", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "BILT", "item_name": "BILT", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "BILD", "item_name": "BILD", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "BP", "item_name": "BP", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
 		{"doctype": "Item", "item_code": "BS", "item_name": "BS", "item_group": "Laboratory",
-			"stock_uom": "Unit", "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1}
+			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1}
 	]
 	insert_record(records)
Author	SHA1	Message	Date
Nabin Hait	00a48ad4e5	Merge branch 'hotfix'	2017-10-02 12:09:00 +05:30
Nabin Hait	def308a433	bumped to version 9.0.5	2017-10-02 12:38:59 +06:00
Nabin Hait	9b98d7fa14	Gst doctype roles (#10984 ) * Removed default permission from GST doctypes * default permission from GST doctypes	2017-10-02 11:38:40 +05:30
Nabin Hait	cb48404bd2	Revert "Fixes for uom in get_item_details (#10986 )" (#11009 ) This reverts commit `5b58e489a8`.	2017-10-02 11:37:18 +05:30
Nabin Hait	5b58e489a8	Fixes for uom in get_item_details (#10986 )	2017-10-02 11:36:10 +05:30
Rushabh Mehta	b9fe14631d	[fix] healthcare setup	2017-09-30 10:46:56 +05:30