Merge branch 'develop'

mntechnique · Nov 8, 2016 · de15ee5 · de15ee5
2 parents 179f900 + 544c77e
commit de15ee5
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 2 deletions.
diff --git a/awfis_erpnext/__init__.py b/awfis_erpnext/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.3.7'
+__version__ = '1.3.8'
diff --git a/awfis_erpnext/fixtures/custom_field.json b/awfis_erpnext/fixtures/custom_field.json
@@ -1748,5 +1748,40 @@
   "search_index": 0, 
   "unique": 0, 
   "width": null
+ }, 
+ {
+  "allow_on_submit": 0, 
+  "collapsible": 0, 
+  "collapsible_depends_on": null, 
+  "default": null, 
+  "depends_on": null, 
+  "description": null, 
+  "docstatus": 0, 
+  "doctype": "Custom Field", 
+  "dt": "Employee", 
+  "fieldname": "awfis_employee_territory", 
+  "fieldtype": "Link", 
+  "hidden": 0, 
+  "ignore_user_permissions": 0, 
+  "ignore_xss_filter": 0, 
+  "in_filter": 0, 
+  "in_list_view": 0, 
+  "insert_after": "employee_name", 
+  "label": "Territory", 
+  "modified": "2016-11-08 18:26:32.337175", 
+  "name": "Employee-awfis_employee_territory", 
+  "no_copy": 0, 
+  "options": "Territory", 
+  "permlevel": 0, 
+  "precision": "", 
+  "print_hide": 0, 
+  "print_hide_if_no_value": 0, 
+  "print_width": null, 
+  "read_only": 0, 
+  "report_hide": 0, 
+  "reqd": 0, 
+  "search_index": 0, 
+  "unique": 0, 
+  "width": null
  }
 ]
diff --git a/awfis_erpnext/fixtures/property_setter.json b/awfis_erpnext/fixtures/property_setter.json
@@ -1885,5 +1885,22 @@
   "property": "read_only_onload", 
   "property_type": "Check", 
   "value": null
+ }, 
+ {
+  "_assign": null, 
+  "_comments": null, 
+  "_liked_by": null, 
+  "_user_tags": null, 
+  "default_value": null, 
+  "doc_type": "Employee", 
+  "docstatus": 0, 
+  "doctype": "Property Setter", 
+  "doctype_or_field": "DocType", 
+  "field_name": null, 
+  "modified": "2016-11-08 18:26:42.200950", 
+  "name": "Employee-read_only_onload", 
+  "property": "read_only_onload", 
+  "property_type": "Check", 
+  "value": null
  }
 ]
diff --git a/awfis_erpnext/hooks.py b/awfis_erpnext/hooks.py
@@ -129,7 +129,8 @@
 					'Contact-col_break_custom_1', 'Contact-contact_type', 'Customer-number_of_employees', 'Customer-industry',
 					'Customer-company_website', 'Item Attribute Value-awfis_centre', 'Item Attribute Value-col_break_1',
 					'Issue-awfis_channel', 'Communication-awfis_channel', 'Warehouse-awfis_warehouse_territory',
-					'Item Group-sb1_expiry_warning_period', 'Item Group-expiry_warning_period']]]},
+					'Item Group-sb1_expiry_warning_period', 'Item Group-expiry_warning_period', 
+					'Employee-awfis_employee_territory']]]},
 			 "Property Setter",
 			 {"dt":"Print Format", "filters": [["name", "in", ["Awfis Purchase Order"]]]},
 			 {"dt":"Lead Source", "filters":[["name", "in", ["IPC",