Merge branch 'develop'

bumped to version 7.0.7
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
2016-07-27 15:19:58 +05:30 · 2016-07-27 15:49:58 +06:00 · 2016-07-27 15:19:12 +05:30 · 2016-07-27 15:09:03 +05:30 · 2016-07-27 15:39:03 +06:00 · 2016-07-27 12:43:41 +05:30
157 changed files with 74287 additions and 73288 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ script:
  - cd ~/frappe-bench
  - bench get-app erpnext $TRAVIS_BUILD_DIR
  - bench use test_site
-  - bench reinstall
+  - bench reinstall --yes
  - bench build
  - bench start &
  - sleep 10
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '7.0.0'
+__version__ = '7.0.7'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Payment Gateway', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
+++ b/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
@@ -3,11 +3,13 @@
 "allow_import": 0, 
 "allow_rename": 0, 
 "autoname": "field:gateway", 
+ "beta": 0, 
 "creation": "2015-12-15 22:26:45.221162", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 1, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Gateway", 
@@ -37,39 +40,20 @@
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 1, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-01-18 03:58:22.588834", 
+ "modified": "2016-07-25 05:24:22.726993", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Gateway", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
@@ -111,8 +95,10 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 1, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -2,11 +2,13 @@
 "allow_copy": 0, 
 "allow_import": 0, 
 "allow_rename": 0, 
+ "beta": 0, 
 "creation": "2015-12-23 21:31:52.699821", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 1, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -216,39 +218,20 @@
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-04-27 17:47:53.979690", 
+ "modified": "2016-07-25 01:35:06.341291", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Gateway Account", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -585,7 +585,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-21 19:11:57.517964", 
+ "modified": "2016-07-25 01:34:44.372161", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Payment Request", 
@@ -631,26 +631,6 @@
   "share": 1, 
   "submit": 1, 
   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
  }
 ], 
 "quick_entry": 0, 
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -69,13 +69,13 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		var me = this;
 		// navigator.onLine
 		this.connection_status = false;
-		this.page.set_indicator("Offline", "grey")
+		this.page.set_indicator(__("Offline"), "grey")
 		frappe.call({
 			method:"frappe.handler.ping",
 			callback: function(r){
 				if(r.message){
 					me.connection_status = true;
-					me.page.set_indicator("Online", "green")
+					me.page.set_indicator(__("Online"), "green")
 				}
 			}
 		})
@@ -278,7 +278,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 				"fieldtype": "Data",
 				"label": "Item",
 				"fieldname": "pos_item",
-				"placeholder": "Search Item"
+				"placeholder": __("Search Item")
 			},
 			parent: this.wrapper.find(".search-area"),
 			only_input: true,
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -1,12 +1,24 @@
 from frappe import _

 data = {
-	'docstatus': 1,
 	'fieldname': 'purchase_order',
+	'internal_links': {
+		'Material Request': ['items', 'material_request'],
+		'Supplier Quotation': ['items', 'supplier_quotation'],
+		'Project': ['project'],
+	},
 	'transactions': [
 		{
 			'label': _('Related'),
-			'items': ['Purchase Receipt', 'Purchase Invoice', 'Stock Entry']
+			'items': ['Purchase Receipt', 'Purchase Invoice']
+		},
+		{
+			'label': _('Reference'),
+			'items': ['Material Request', 'Supplier Quotation', 'Project']
+		},
+		{
+			'label': _('Sub-contracting'),
+			'items': ['Stock Entry']
 		},
 	]
 }
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -3,12 +3,14 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "naming_series:", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:11", 
 "custom": 0, 
 "description": "Supplier of Goods or Services.", 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -705,16 +707,18 @@
 "icon": "icon-user", 
 "idx": 370, 
 "image_field": "image", 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-04-28 17:36:44.742525", 
+ "modified": "2016-07-25 05:20:29.238820", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Supplier", 
+ "name_case": "Title Case", 
 "owner": "Administrator", 
 "permissions": [
  {
@@ -858,7 +862,7 @@
   "write": 0
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "supplier_name, supplier_type", 
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -11,10 +11,24 @@ def get_data():
 					"type": "doctype",
 					"name": "Student"
 				},
+				{
+					"type": "doctype",
+					"name": "Student Batch"
+				},
 				{
 					"type": "doctype",
 					"name": "Student Group"
 				},
+				{
+					"type": "doctype",
+					"name": "Student Group Creation Tool"
+				}
+			]
+		},
+		{
+			"label": _("Admission"),
+			"items": [
+
 				{
 					"type": "doctype",
 					"name": "Student Applicant"
@@ -26,10 +40,6 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Program Enrollment Tool"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Group Creation Tool"
 				}
 			]
 		},
@@ -47,11 +57,11 @@ def get_data():
 				},
 				{
 					"type": "doctype",
-					"name": "Scheduling Tool"
+					"name": "Examination"
 				},
 				{
 					"type": "doctype",
-					"name": "Examination"
+					"name": "Scheduling Tool"
 				}
 			]
 		},
@@ -78,6 +88,23 @@ def get_data():
 				}
 			]
 		},
+		{
+			"label": _("LMS"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Announcement"
+				},
+				{
+					"type": "doctype",
+					"name": "Topic"
+				},
+				{
+					"type": "doctype",
+					"name": "Discussion"
+				}
+			]
+		},
 		{
 			"label": _("Setup"),
 			"items": [
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -167,9 +167,7 @@ def make_return_doc(doctype, source_name, target_doc=None):
 		target_doc.qty = -1* source_doc.qty
 		if doctype == "Purchase Receipt":
 			target_doc.received_qty = -1* source_doc.qty
-			target_doc.prevdoc_doctype = source_doc.prevdoc_doctype
-			target_doc.prevdoc_docname = source_doc.prevdoc_docname
-			target_doc.prevdoc_detail_docname = source_doc.prevdoc_detail_docname
+			target_doc.purchase_order = source_doc.purchase_order
 		elif doctype == "Purchase Invoice":
 			target_doc.received_qty = -1* source_doc.qty
 			target_doc.purchase_order = source_doc.purchase_order
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -43,15 +43,15 @@ class Opportunity(TransactionBase):

 	def make_new_lead_if_required(self):
 		"""Set lead against new opportunity"""
-		if not (self.lead or self.customer):
+		if not (self.lead or self.customer) and self.contact_email:
 			lead_name = frappe.db.get_value("Lead", {"email_id": self.contact_email})
 			if not lead_name:
 				sender_name = get_fullname(self.contact_email)
 				if sender_name == self.contact_email:
 					sender_name = None

-				if not sender_name and self.contact_email.index('@'):
-					email_name = self.contact_email[0:self.contact_email.index('@')]
+				if not sender_name and ('@' in self.contact_email):
+					email_name = self.contact_email.split('@')[0]

 					email_split = email_name.split('.')
 					sender_name = ''
--- a/erpnext/hr/doctype/branch/branch.js
+++ b/erpnext/hr/doctype/branch/branch.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Branch', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:branch", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:13", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Branch", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -38,13 +42,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-code-fork", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:42.974184", 
+ "modified": "2016-07-25 05:24:26.534086", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Branch", 
@@ -91,6 +96,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/deduction_type/deduction_type.js
+++ b/erpnext/hr/doctype/deduction_type/deduction_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Deduction Type', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/hr/doctype/deduction_type/deduction_type.json
+++ b/erpnext/hr/doctype/deduction_type/deduction_type.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:deduction_name", 
+ "beta": 0, 
 "creation": "2013-01-22 16:50:30", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Name", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -41,6 +45,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -50,6 +55,7 @@
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,13 +69,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:44.572917", 
+ "modified": "2016-07-25 05:24:26.194533", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Deduction Type", 
@@ -96,6 +103,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/department/department.js
+++ b/erpnext/hr/doctype/department/department.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Department', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:department_name", 
+ "beta": 0, 
 "creation": "2013-02-05 11:48:26", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Department", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -42,6 +46,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Leave Block List", 
@@ -50,6 +55,7 @@
   "options": "Leave Block List", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -62,13 +68,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-sitemap", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.172261", 
+ "modified": "2016-07-25 05:24:26.129542", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Department", 
@@ -95,6 +102,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/earning_type/earning_type.js
+++ b/erpnext/hr/doctype/earning_type/earning_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Earning Type', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/hr/doctype/earning_type/earning_type.json
+++ b/erpnext/hr/doctype/earning_type/earning_type.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:earning_name", 
+ "beta": 0, 
 "creation": "2013-01-24 11:03:32", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Name", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -41,6 +45,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -50,6 +55,7 @@
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,13 +69,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.813984", 
+ "modified": "2016-07-25 05:24:26.055240", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Earning Type", 
@@ -96,6 +103,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:employee_type_name", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:14", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Employment Type", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -38,13 +42,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:46.733350", 
+ "modified": "2016-07-22 05:34:43.238512", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Employment Type", 
@@ -91,6 +96,9 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/offer_term/offer_term.js
+++ b/erpnext/hr/doctype/offer_term/offer_term.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Offer Term', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/hr/doctype/offer_term/offer_term.json
+++ b/erpnext/hr/doctype/offer_term/offer_term.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "field:offer_term", 
+ "beta": 0, 
 "creation": "2015-03-05 13:00:30.900471", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Offer Term", 
@@ -25,6 +28,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -35,13 +39,15 @@
 ], 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:50.848215", 
+ "modified": "2016-07-25 05:24:25.724664", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Offer Term", 
@@ -69,8 +75,10 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -64,8 +64,8 @@ class SalarySlip(TransactionBase):
 		if self.salary_slip_based_on_timesheet and not self.get('timesheets'):
 			self.set("timesheets", [])

-			timesheets = frappe.db.sql(""" select * from `tabTimesheet` where employee = %(employee)s and (status = 'Submitted' or
-				status = 'Billed')""", {'employee': self.employee}, as_dict=1)
+			timesheets = frappe.db.sql(""" select * from `tabTimesheet` where employee = %(employee)s and start_date BETWEEN %(start_date)s AND %(end_date)s and (status = 'Submitted' or
+				status = 'Billed')""", {'employee': self.employee, 'start_date': self.start_date, 'end_date': self.end_date}, as_dict=1)

 			for data in timesheets:
 				self.append('timesheets', {
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -58,7 +58,7 @@ class MaintenanceSchedule(TransactionBase):
 			if no_email_sp:
 				frappe.msgprint(
 					frappe._("Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}").format(
-						doc.owner, "<br>"+no_email_sp.join("<br>")
+						self.owner, "<br>"+no_email_sp.join("<br>")
 				))

 			scheduled_date = frappe.db.sql("""select scheduled_date from
@@ -153,7 +153,7 @@ class MaintenanceSchedule(TransactionBase):
 			elif not d.sales_person:
 				throw(_("Please select Incharge Person's name"))

-			if getdate(d.start_date) > getdate(d.end_date):
+			if getdate(d.start_date) >= getdate(d.end_date):
 				throw(_("Start date should be less than end date for Item {0}").format(d.item_code))

 	def validate_sales_order(self):
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -98,7 +98,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-08 08:42:35.126397", 
+ "modified": "2016-07-25 05:24:23.398894", 
 "modified_by": "Administrator", 
 "module": "Manufacturing", 
 "name": "Operation", 
@@ -146,7 +146,7 @@
   "write": 1
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -112,8 +112,10 @@ class ProductionOrder(Document):


 	def update_status(self, status=None):
-		'''Update status of production order'''
-		status = self.get_status()
+		'''Update status of production order if unknown'''
+		if not status:
+			status = self.get_status()
+			
 		if status != self.status:
 			self.db_set("status", status)

--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -28,10 +28,11 @@ execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
 execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
 execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")

-# inserted this patch here since Item types are being changed
 erpnext.patches.v5_2.change_item_selects_to_checks
 erpnext.patches.v4_0.fields_to_be_renamed
 erpnext.patches.v4_0.rename_sitemap_to_route
+erpnext.patches.v7_0.re_route #2016-06-27
+
 erpnext.patches.v4_0.fix_contact_address
 erpnext.patches.v4_0.customer_discount_to_pricing_rule
 execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
@@ -277,9 +278,8 @@ execute:frappe.db.sql('update tabQuotation set status="Cancelled" where docstatu
 execute:frappe.rename_doc("DocType", "Payments", "Sales Invoice Payment", force=True)
 erpnext.patches.v7_0.update_mins_to_first_response
 erpnext.patches.v6_20x.repost_valuation_rate_for_negative_inventory
-erpnext.patches.v7_0.re_route #2016-06-27
 erpnext.patches.v7_0.system_settings_setup_complete
-erpnext.patches.v7_0.set_naming_series_for_timesheet
+erpnext.patches.v7_0.set_naming_series_for_timesheet #2016-07-27
 execute:frappe.reload_doc('projects', 'doctype', 'project')
 execute:frappe.reload_doc('projects', 'doctype', 'project_user')
 erpnext.patches.v7_0.convert_timelogbatch_to_timesheet
@@ -300,3 +300,7 @@ execute:frappe.delete_doc_if_exists("DocType", "Payment Tool")
 execute:frappe.delete_doc_if_exists("DocType", "Payment Tool Detail")
 erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists
 erpnext.patches.v7_0.migrate_schools_to_erpnext
+erpnext.patches.v7_0.remove_administrator_role_in_doctypes
+erpnext.patches.v7_0.rename_fee_amount_to_fee_component
+erpnext.patches.v7_0.calculate_total_costing_amount
+erpnext.patches.v7_0.fix_nonwarehouse_ledger_gl_entries_for_transactions
--- a/erpnext/patches/v7_0/calculate_total_costing_amount.py
+++ b/erpnext/patches/v7_0/calculate_total_costing_amount.py
@@ -0,0 +1,16 @@
+import frappe
+from frappe.utils import flt
+
+def execute():
+	frappe.reload_doc('projects', 'doctype', 'timesheet')
+
+	for data in frappe.get_all('Timesheet', fields=["name, total_costing_amount"],
+		filters = [["docstatus", "<", "2"]]):
+		if flt(data.total_costing_amount) == 0.0:
+			ts = frappe.get_doc('Timesheet', data.name)
+			ts.update_cost()
+			ts.calculate_total_amounts()
+			ts.flags.ignore_validate = True
+			ts.flags.ignore_mandatory = True
+			ts.flags.ignore_validate_update_after_submit = True
+			ts.save()
--- a/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
+++ b/erpnext/patches/v7_0/fix_nonwarehouse_ledger_gl_entries_for_transactions.py
@@ -0,0 +1,50 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if not frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock"):
+		return
+	
+	frappe.reload_doctype("Account")
+
+	warehouses = frappe.db.sql_list("""select name from tabAccount
+		where account_type = 'Stock' and is_group = 0
+		and (warehouse is null or warehouse = '')""")
+	if warehouses:
+		warehouses = set_warehouse_for_stock_account(warehouses)
+
+		stock_vouchers = frappe.db.sql("""select distinct sle.voucher_type, sle.voucher_no
+			from `tabStock Ledger Entry` sle
+			where sle.warehouse in (%s) and creation > '2016-05-01'
+			and not exists(select name from `tabGL Entry` 
+				where account=sle.warehouse and voucher_type=sle.voucher_type and voucher_no=sle.voucher_no)
+			order by sle.posting_date""" %
+			', '.join(['%s']*len(warehouses)), tuple(warehouses))
+
+		rejected = []
+		for voucher_type, voucher_no in stock_vouchers:
+			try:
+				frappe.db.sql("""delete from `tabGL Entry`
+					where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
+
+				voucher = frappe.get_doc(voucher_type, voucher_no)
+				voucher.make_gl_entries()
+				frappe.db.commit()
+			except Exception, e:
+				print frappe.get_traceback()
+				rejected.append([voucher_type, voucher_no])
+				frappe.db.rollback()
+
+		print rejected
+
+def set_warehouse_for_stock_account(warehouse_account):
+	for account in warehouse_account:
+		if frappe.db.exists('Warehouse', account):
+			frappe.db.set_value("Account", account, "warehouse", account)
+		else:
+			warehouse_account.remove(account)
+
+	return warehouse_account
--- a/erpnext/patches/v7_0/remove_administrator_role_in_doctypes.py
+++ b/erpnext/patches/v7_0/remove_administrator_role_in_doctypes.py
@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("""delete from tabDocPerm where role="Administrator" and parent in 
+		("Payment Gateway", "Payment Gateway Account", "Payment Request", "Academic Term", "Academic Year", "Course",
+		"Course Schedule", "Examination", "Fee Category", "Fee Structure", "Fees", "Instructor", "Program", "Program Enrollment Tool",
+		"Room", "Scheduling Tool", "Student", "Student Applicant", "Student Attendance", "Student Group", "Student Group Creation Tool")
+	""")
--- a/erpnext/patches/v7_0/rename_fee_amount_to_fee_component.py
+++ b/erpnext/patches/v7_0/rename_fee_amount_to_fee_component.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	if frappe.db.exists("DocType", "Fee Amount"):
+		frappe.rename_doc("DocType", "Fee Amount", "Fee Component")
+		for dt in ("Fees", "Fee Structure"):
+			frappe.reload_doctype(dt)
+			rename_field(dt, "amount", "components")
+		
+	
--- a/erpnext/patches/v7_0/update_home_page.py
+++ b/erpnext/patches/v7_0/update_home_page.py
@@ -5,6 +5,8 @@ def execute():
 	frappe.reload_doc('portal', 'doctype', 'homepage_featured_product')
 	frappe.reload_doc('portal', 'doctype', 'homepage')
 	frappe.reload_doc('portal', 'doctype', 'products_settings')
+	frappe.reload_doctype('Item')
+	frappe.reload_doctype('Item Group')

 	website_settings = frappe.get_doc('Website Settings', 'Website Settings')
 	if frappe.db.exists('Web Page', website_settings.home_page):
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:activity_type", 
+ "beta": 0, 
 "creation": "2013-03-05 10:14:59", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Activity Type", 
@@ -24,6 +27,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -39,6 +43,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Default Costing Rate", 
@@ -47,6 +52,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -62,6 +68,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -69,6 +76,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -84,6 +92,7 @@
   "fieldtype": "Currency", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Default Billing Rate", 
@@ -92,6 +101,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -104,13 +114,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:41.673241", 
+ "modified": "2016-07-25 05:24:26.717981", 
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Activity Type", 
@@ -157,6 +168,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -5,11 +5,11 @@ cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
 frappe.ui.form.on("Timesheet", {
 	setup: function(frm) {
 		frm.get_field('time_logs').grid.editable_fields = [
-			{fieldname: 'billable', columns: 2},
+			{fieldname: 'billable', columns: 1},
 			{fieldname: 'activity_type', columns: 2},
-			{fieldname: 'from_time', columns: 2},
-			{fieldname: 'hours', columns: 2},
-			{fieldname: 'to_time', columns: 2},
+			{fieldname: 'from_time', columns: 3},
+			{fieldname: 'hours', columns: 1},
+			{fieldname: 'project', columns: 3}
 		];

 		frm.fields_dict.employee.get_query = function() {
@@ -22,7 +22,8 @@ frappe.ui.form.on("Timesheet", {
 			child = locals[cdt][cdn];
 			return{
 				filters: {
-					'project': child.project
+					'project': child.project,
+					'status': ["!=", "Closed"]
 				}
 			}
 		}
@@ -37,8 +38,7 @@ frappe.ui.form.on("Timesheet", {

 	refresh: function(frm) {
 		if(frm.doc.docstatus==1) {
-			if(!frm.doc.sales_invoice && frm.doc.total_billing_amount > 0
-				&& !frm.doc.production_order){
+			if(!frm.doc.sales_invoice && frm.doc.total_billing_amount > 0){
 				frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
 					"icon-file-alt");
 			}
@@ -147,13 +147,16 @@ var calculate_time_and_amount = function(frm) {
 	var tl = frm.doc.time_logs || [];
 	total_hr = 0;
 	total_billing_amount = 0;
+	total_costing_amount = 0;
 	for(var i=0; i<tl.length; i++) {
 		if (tl[i].hours) {
 			total_hr += tl[i].hours;
 			total_billing_amount += tl[i].billing_amount;
+			total_costing_amount += tl[i].costing_amount;
 		}
 	}

 	cur_frm.set_value("total_hours", total_hr);
 	cur_frm.set_value("total_billing_amount", total_billing_amount);
+	cur_frm.set_value("total_costing_amount", total_costing_amount);
 }
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -157,7 +157,7 @@
   "no_copy": 1, 
   "options": "Draft\nSubmitted\nBilled\nPayslip\nCompleted\nCancelled", 
   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
@@ -478,7 +478,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "default": "0", 
-   "description": "updated via Time Logs", 
+   "description": "", 
   "fieldname": "total_hours", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -529,7 +529,7 @@
   "collapsible": 0, 
   "default": "0", 
   "depends_on": "", 
-   "description": "updated via Time Logs", 
+   "description": "", 
   "fieldname": "total_billing_amount", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -551,6 +551,31 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "total_costing_amount", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Total Costing Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -637,7 +662,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-13 23:44:05.086570", 
+ "modified": "2016-07-26 00:01:56.055046", 
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Timesheet", 
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -20,14 +20,21 @@ class OverProductionLoggedError(frappe.ValidationError): pass
 class Timesheet(Document):
 	def validate(self):
 		self.set_status()
-		self.total_hours = 0.0
-		self.total_billing_amount = 0.0
 		self.validate_dates()
 		self.validate_time_logs()
 		self.update_cost()
+		self.calculate_total_amounts()
+
+	def calculate_total_amounts(self):
+		self.total_hours = 0.0
+		self.total_billing_amount = 0.0
+		self.total_costing_amount = 0.0
+
 		for d in self.get("time_logs"):
 			self.total_hours += flt(d.hours)
-			if d.billable: self.total_billing_amount += flt(d.billing_amount)
+			if d.billable: 
+				self.total_billing_amount += flt(d.billing_amount)
+				self.total_costing_amount += flt(d.costing_amount)

 	def set_status(self):
 		self.status = {
@@ -88,12 +95,9 @@ class Timesheet(Document):
 				frappe.throw(_("Row {0}: Completed Qty must be greater than zero.").format(data.idx))

 			if self.production_order and flt(pending_qty) < flt(data.completed_qty):
-				frappe.throw(_("Row {0}: Completed Qty cannot be more than {0} for operation {1}").format(data.idx, pending_qty, self.operation),
+				frappe.throw(_("Row {0}: Completed Qty cannot be more than {1} for operation {2}").format(data.idx, pending_qty, data.operation),
 					OverProductionLoggedError)

-			if data.billable and flt(data.billing_rate) == 0.0 and data.activity_type:
-				frappe.throw(_("Row {0}: Billing Rate must be greater than zero.").format(data.idx))
-
 	def update_production_order(self, time_sheet):
 		if self.production_order:
 			pro = frappe.get_doc('Production Order', self.production_order)
@@ -223,7 +227,7 @@ class Timesheet(Document):

 	def update_cost(self):
 		for data in self.time_logs:
-			if data.activity_type and not data.billing_amount:
+			if data.activity_type and (not data.billing_amount or not data.costing_amount):
 				rate = get_activity_cost(self.employee, data.activity_type)
 				hours =  data.hours or 0
 				if rate:
--- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
@@ -14,7 +14,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:!parent.production_order", 
+   "depends_on": "", 
   "fieldname": "billable", 
   "fieldtype": "Check", 
   "hidden": 0, 
@@ -27,7 +27,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
@@ -163,7 +163,7 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "depends_on": "eval:!parent.production_order", 
+   "depends_on": "billable", 
   "fieldname": "section_break_11", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -265,7 +265,7 @@
   "collapsible": 0, 
   "default": "0", 
   "depends_on": "", 
-   "description": "To display value check Billable", 
+   "description": "", 
   "fieldname": "billing_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -292,7 +292,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "default": "0", 
-   "description": "To display value check Billable", 
+   "description": "", 
   "fieldname": "costing_amount", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -532,7 +532,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-21 09:59:01.622745", 
+ "modified": "2016-07-26 00:07:58.267131", 
 "modified_by": "Administrator", 
 "module": "Projects", 
 "name": "Timesheet Detail", 
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -127,8 +127,9 @@
 .dashboard-list-item:last-child {
  border-bottom: none;
 }
-.payment-toolbar {
-  margin-left: 35px;
+.payment-toolbar .row {
+  width: 323px;
+  margin: 0 auto;
 }
 .payment-mode {
  cursor: pointer;
@@ -159,6 +160,38 @@
  background-color: #FDFDFD;
  border-color: #e8e8e8;
 }
+.multimode-payments {
+  padding-left: 30px;
+}
+.payment-toolbar {
+  padding-right: 30px;
+}
+body[data-route="pos"] .modal-dialog {
+  width: 750px;
+}
+@media (max-width: 767px) {
+  body[data-route="pos"] .modal-dialog {
+    width: auto;
+  }
+  body[data-route="pos"] .modal-dialog .modal-content {
+    height: auto;
+  }
+}
+@media (max-width: 767px) {
+  .amount-row h3 {
+    font-size: 15px;
+  }
+  .pos-keyboard-key,
+  .delete-btn {
+    height: 50px;
+  }
+  .multimode-payments {
+    padding-left: 15px;
+  }
+  .payment-toolbar {
+    padding-right: 15px;
+  }
+}
 .amount-label {
  font-size: 16px;
 }
--- a/erpnext/public/js/payment/payments.js
+++ b/erpnext/public/js/payment/payments.js
@@ -11,7 +11,6 @@ erpnext.payments = erpnext.stock.StockController.extend({
 	
 		this.dialog.show();
 		this.$body = this.dialog.body;
-		this.dialog.$wrapper.find('.modal-dialog').css("width", "750px");
 		this.set_payment_primary_action();
 		this.make_keyboard();
 	},
--- a/erpnext/public/js/payment/pos_payment.html
+++ b/erpnext/public/js/payment/pos_payment.html
@@ -1,40 +1,36 @@
 <div class="pos_payment row">
-    	<div class="col-sm-6">
-			<div class="row">
-				<div class="col-xs-6 text-center"> 
-					<p class="amount-label"> Total <h3>{%= format_currency(grand_total, currency) %} </h3></p>
-				</div>
-				<div class="col-xs-6 text-center"> 
-					<p class="amount-label"> Paid <h3 class="paid_amount">{%= format_currency(paid_amount, currency) %}</h3></p>
-				</div>              
-			</div>
-				<hr>
-			<div class="multimode-payments">
-    		</div>
-    	</div>
-    	<div class="col-sm-6">
-            <div class="row">
-				<div class="col-xs-6 text-center"> 
-					<p class="amount-label"> Outstanding <h3 class="outstanding_amount">{%= format_currency(outstanding_amount, currency) %} </h3></p>
-				</div>
-				<div class="col-xs-6 text-center"> 
-					<p class="amount-label"> Change <h3 class="change_amount">{%= format_currency(change_amount, currency) %}</h3></p>
-				</div>              
-            </div>
-			<hr>
-            <div class="payment-toolbar">
-				{% for(var i=0; i<3; i++) { %}
-					<div class="row">
-						{% for(var j=i*3; j<(i+1)*3; j++) { %}
-							<button type="button"  class="btn btn-default pos-keyboard-key">{{j+1}}</button>
-						{% } %}
-					</div>
-				{% } %}   
+	<div class="row amount-row">
+		<div class="col-xs-6 col-sm-3 text-center">
+			<p class="amount-label"> Total <h3>{%= format_currency(grand_total, currency) %} </h3></p>
+		</div>
+		<div class="col-xs-6 col-sm-3 text-center">
+			<p class="amount-label"> Paid <h3 class="paid_amount">{%= format_currency(paid_amount, currency) %}</h3></p>
+		</div>
+		<div class="col-xs-6 col-sm-3 text-center">
+			<p class="amount-label"> Outstanding <h3 class="outstanding_amount">{%= format_currency(outstanding_amount, currency) %} </h3></p>
+		</div>
+		<div class="col-xs-6 col-sm-3 text-center">
+			<p class="amount-label"> Change <h3 class="change_amount">{%= format_currency(change_amount, currency) %}</h3>
+			</p>
+		</div>
+	</div>
+	<hr>
+	<div class="row">
+		<div class="col-sm-6 multimode-payments">
+		</div>
+		<div class="col-sm-6 payment-toolbar">
+			{% for(var i=0; i<3; i++) { %}
 				<div class="row">
-					<button type="button"  class="btn btn-default delete-btn">Del</button>
-					<button type="button"  class="btn btn-default pos-keyboard-key">0</button>
-					<button type="button"  class="btn btn-default pos-keyboard-key">.</button>
+					{% for(var j=i*3; j<(i+1)*3; j++) { %}
+						<button type="button"  class="btn btn-default pos-keyboard-key">{{j+1}}</button>
+					{% } %}
 				</div>
-            </div>
-    	</div>
+			{% } %}
+			<div class="row">
+				<button type="button"  class="btn btn-default delete-btn">Del</button>
+				<button type="button"  class="btn btn-default pos-keyboard-key">0</button>
+				<button type="button"  class="btn btn-default pos-keyboard-key">.</button>
+			</div>
+        </div>
+	</div>
 </div>
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -162,7 +162,10 @@
 }

 .payment-toolbar {
-	margin-left: 35px;
+	.row {
+		width: 323px;
+		margin: 0 auto;
+	}
 }

 .payment-mode {
@@ -197,6 +200,41 @@
 	border-color: #e8e8e8;
 }

+.multimode-payments {
+	padding-left: 30px;
+}
+
+.payment-toolbar {
+	padding-right: 30px;
+}
+
+body[data-route="pos"] .modal-dialog {
+	width: 750px;
+
+	@media (max-width: @screen-xs) {
+		width: auto;
+
+		.modal-content {
+			height: auto;
+		}
+	}
+}
+
+@media (max-width: @screen-xs) {
+	.amount-row h3 {
+		font-size: 15px;
+	}
+	.pos-keyboard-key, .delete-btn {
+		height: 50px;
+	}
+	.multimode-payments {
+		padding-left: 15px;
+	}
+	.payment-toolbar {
+		padding-right: 15px;
+	}
+}
+
 .amount-label {
 	font-size: 16px;
 }
--- a/erpnext/schools/doctype/academic_term/academic_term.js
+++ b/erpnext/schools/doctype/academic_term/academic_term.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Academic Term', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/schools/doctype/academic_term/academic_term.json
+++ b/erpnext/schools/doctype/academic_term/academic_term.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:term_name", 
+ "beta": 0, 
 "creation": "2015-09-08 17:19:19.158228", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,13 +19,16 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Term Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -34,12 +39,15 @@
 ], 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "max_attachments": 0, 
+ "modified": "2016-07-25 05:24:23.032319", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Academic Term", 
@@ -65,30 +73,12 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/academic_year/academic_year.json
+++ b/erpnext/schools/doctype/academic_year/academic_year.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "field:academic_year_name", 
+ "beta": 0, 
 "creation": "2015-09-07 12:49:51.303026", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,13 +19,16 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Academic Year Name", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -39,13 +44,16 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Year Start Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -61,13 +69,16 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Year End Date", 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -78,12 +89,15 @@
 ], 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "max_attachments": 0, 
+ "modified": "2016-07-25 05:24:23.090530", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Academic Year", 
@@ -109,31 +123,13 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "title_field": ""
+ "title_field": "", 
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/course/course.json
+++ b/erpnext/schools/doctype/course/course.json
@@ -197,33 +197,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-22 06:02:14.586594", 
+ "modified": "2016-07-25 01:33:48.647068", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Course", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/schools/doctype/course/test_records.json
+++ b/erpnext/schools/doctype/course/test_records.json
@@ -1,14 +1,17 @@
 [
 	{
 		"course_name": "_Test Course",
-		"course_code": "TC100"
+		"course_code": "TC100",
+		"course_abbreviation": "TC"
 	},
 	{
 		"course_name": "_Test Course 1",
-		"course_code": "TC101"
+		"course_code": "TC101",
+		"course_abbreviation": "TC1"
 	},
 	{
 		"course_name": "_Test Course 2",
-		"course_code": "TC102"
+		"course_code": "TC102",
+		"course_abbreviation": "TC2"
 	}
 ]
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "SH.####", 
+ "beta": 0, 
 "creation": "2015-09-09 16:34:04.960369", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Student Group", 
@@ -26,6 +29,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -41,6 +45,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Instructor", 
@@ -50,6 +55,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -65,6 +71,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -72,6 +79,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -87,6 +95,7 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Course", 
@@ -96,6 +105,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -111,6 +121,7 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Instructor Name", 
@@ -120,6 +131,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -135,6 +147,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -142,6 +155,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -158,6 +172,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Schedule Date", 
@@ -166,6 +181,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -181,6 +197,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Room", 
@@ -190,6 +207,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -205,6 +223,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -212,6 +231,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -227,6 +247,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "From Time", 
@@ -235,6 +256,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -250,6 +272,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "To Time", 
@@ -258,6 +281,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -273,6 +297,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Attendance", 
@@ -281,6 +306,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -296,6 +322,7 @@
   "fieldtype": "HTML", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Students HTML", 
@@ -304,6 +331,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -319,6 +347,7 @@
   "fieldtype": "Data", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Title", 
@@ -327,6 +356,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -338,6 +368,7 @@
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
@@ -345,33 +376,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 01:25:04.593769", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Course Schedule", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
@@ -393,10 +404,11 @@
   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "schedule_date", 
 "sort_order": "DESC", 
 "title_field": "title", 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/course_schedule/test_course_schedule.py
+++ b/erpnext/schools/doctype/course_schedule/test_course_schedule.py
@@ -24,27 +24,27 @@ class TestCourseSchedule(unittest.TestCase):
 		cs1 = make_course_schedule_test_record(simulate= True)
 		
 		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="_Test Student Group 1", room="RM0002", do_not_save= 1)
+			student_group="TC2-TP-2014-2015-_Test Academic Term", room="RM0002", do_not_save= 1)
 		self.assertRaises(OverlapError, cs2.save)

 	def test_room_conflict(self):
 		cs1 = make_course_schedule_test_record(simulate= True)
 		
 		cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="_Test Student Group 1", instructor="_T-Instructor-00002", do_not_save= 1)
+			student_group="TC2-TP-2014-2015-_Test Academic Term", instructor="_T-Instructor-00002", do_not_save= 1)
 		self.assertRaises(OverlapError, cs2.save)
 		
 	def test_no_conflict(self):
 		cs1 = make_course_schedule_test_record(simulate= True)
 		
 		make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, 
-			student_group="_Test Student Group 1", instructor="_T-Instructor-00002", room="RM0002")
+			student_group="TC2-TP-2014-2015-_Test Academic Term", instructor="_T-Instructor-00002", room="RM0002")

 def make_course_schedule_test_record(**args):
 	args = frappe._dict(args)

 	course_schedule = frappe.new_doc("Course Schedule")
-	course_schedule.student_group = args.student_group or "_Test Student Group"
+	course_schedule.student_group = args.student_group or "TC-TP-2014-2015-_Test Academic Term"
 	course_schedule.course = args.course or "_Test Course"
 	course_schedule.instructor = args.instructor or "_T-Instructor-00001"
 	course_schedule.room = args.room or "RM0001"
--- a/erpnext/schools/doctype/discussion/discussion.json
+++ b/erpnext/schools/doctype/discussion/discussion.json
@@ -9,6 +9,7 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -122,7 +123,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 05:24:23.235387", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Discussion", 
@@ -150,7 +151,7 @@
   "write": 1
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
--- a/erpnext/schools/doctype/examination/examination.json
+++ b/erpnext/schools/doctype/examination/examination.json
@@ -1,13 +1,15 @@
 {
 "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "field:exam_name", 
+ "beta": 0, 
 "creation": "2015-11-12 16:34:34.658092", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exam Name", 
@@ -25,6 +28,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -40,6 +44,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Exam Code", 
@@ -48,6 +53,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -63,6 +69,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Student Group", 
@@ -72,6 +79,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -87,6 +95,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Course", 
@@ -96,6 +105,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -111,6 +121,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -118,6 +129,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -133,6 +145,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supervisor", 
@@ -142,6 +155,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -157,6 +171,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Supervisor Name", 
@@ -165,6 +180,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -180,6 +196,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Examiner", 
@@ -189,6 +206,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -204,6 +222,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Examiner Name", 
@@ -212,6 +231,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -229,6 +249,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Schedule", 
@@ -237,6 +258,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -253,6 +275,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Schedule Date", 
@@ -261,6 +284,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -276,6 +300,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Room", 
@@ -285,6 +310,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -300,6 +326,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -307,6 +334,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -322,6 +350,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Time", 
@@ -330,6 +359,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -345,6 +375,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To Time", 
@@ -353,6 +384,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -368,6 +400,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Results", 
@@ -376,6 +409,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -391,6 +425,7 @@
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "results", 
@@ -400,6 +435,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -415,6 +451,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
@@ -423,6 +460,7 @@
   "options": "Examination", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -434,6 +472,7 @@
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 1, 
@@ -441,33 +480,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 06:24:11.126911", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Examination", 
 "name_case": "", 
 "owner": "Administrator", 
 "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }, 
  {
   "amend": 1, 
   "apply_user_permissions": 0, 
@@ -489,9 +508,10 @@
   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/fee_category/fee_category.js
+++ b/erpnext/schools/doctype/fee_category/fee_category.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Fee Category', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:category_name", 
+ "beta": 0, 
 "creation": "2015-09-16 13:01:10.448734", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Name", 
@@ -27,6 +30,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -42,6 +46,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -52,6 +57,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -65,6 +71,7 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
@@ -72,33 +79,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 08:42:24.309236", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Fee Category", 
 "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": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
@@ -120,10 +107,11 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "description", 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/fee_component/init.py
+++ b/erpnext/schools/doctype/fee_component/init.py
--- a/erpnext/schools/doctype/fee_component/fee_component.json
+++ b/erpnext/schools/doctype/fee_component/fee_component.json
@@ -104,10 +104,10 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-21 12:25:44.368245", 
- "modified_by": "r@r.com", 
+ "modified": "2016-07-25 08:43:25.405166", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
- "name": "Fee Amount", 
+ "name": "Fee Component", 
 "name_case": "", 
 "owner": "Administrator", 
 "permissions": [], 
--- a/erpnext/schools/doctype/fee_component/fee_component.py
+++ b/erpnext/schools/doctype/fee_component/fee_component.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt

 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document

-class FeeAmount(Document):
+class FeeComponent(Document):
 	pass
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -146,17 +146,17 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "amount", 
+   "fieldname": "components", 
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Amount", 
+   "label": "Components", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Fee Amount", 
+   "options": "Fee Component", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -230,7 +230,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 08:44:07.886467", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Fee Structure", 
@@ -256,26 +256,6 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
 "quick_entry": 0, 
--- a/erpnext/schools/doctype/fee_structure/fee_structure.py
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.py
@@ -13,6 +13,6 @@ class FeeStructure(Document):
 	def calculate_total(self):
 		"""Calculates total amount."""
 		self.total_amount = 0
-		for d in self.amount:
+		for d in self.components:
 			self.total_amount += d.amount
 	
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -295,17 +295,17 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
-   "fieldname": "amount", 
+   "fieldname": "components", 
   "fieldtype": "Table", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
-   "label": "Amount", 
+   "label": "Components", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Fee Amount", 
+   "options": "Fee Component", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -478,8 +478,8 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-21 06:20:10.878913", 
- "modified_by": "r@r.com", 
+ "modified": "2016-07-25 08:44:33.595812", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Fees", 
 "name_case": "", 
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -9,6 +9,7 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Other", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -167,6 +168,7 @@
 "hide_toolbar": 0, 
 "idx": 0, 
 "image_field": "image", 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
@@ -174,8 +176,8 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
- "modified_by": "demo@erpnext.com", 
+ "modified": "2016-07-25 01:26:44.111375", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Instructor", 
 "name_case": "", 
@@ -200,26 +202,6 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
 "quick_entry": 0, 
--- a/erpnext/schools/doctype/program/program.json
+++ b/erpnext/schools/doctype/program/program.json
@@ -250,33 +250,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-22 05:35:14.470843", 
+ "modified": "2016-07-25 01:33:56.912243", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Program", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/schools/doctype/program/test_records.json
+++ b/erpnext/schools/doctype/program/test_records.json
@@ -1,8 +1,10 @@
 [
 	{
-		"program_name": "_Test Program"
+		"program_name": "_Test Program",
+		"program_abbreviation": "TP"
 	},
 	{
-		"program_name": "_Test Program 2"
+		"program_name": "_Test Program 2",
+		"program_abbreviation": "TP2"
 	}
 ]
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.json
@@ -8,6 +8,7 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -274,33 +275,13 @@
 "issingle": 1, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-18 10:30:50.243271",
- "modified_by": "demo@erpnext.com", 
+ "modified": "2016-07-25 01:24:05.632746", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Program Enrollment Tool", 
 "name_case": "", 
 "owner": "Administrator", 
 "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/schools/doctype/room/room.json
+++ b/erpnext/schools/doctype/room/room.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "RM.####", 
+ "beta": 0, 
 "creation": "2015-09-09 16:20:14.613061", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Room Name", 
@@ -25,6 +28,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -40,6 +44,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Room Number", 
@@ -48,6 +53,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,6 +69,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Seating Capacity", 
@@ -71,6 +78,7 @@
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -82,6 +90,7 @@
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
@@ -89,7 +98,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 05:24:22.881854", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Room", 
@@ -115,32 +124,13 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
 "title_field": "room_name", 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
+++ b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
@@ -2,11 +2,13 @@
 "allow_copy": 1, 
 "allow_import": 0, 
 "allow_rename": 0, 
+ "beta": 0, 
 "creation": "2015-09-23 15:37:38.108475", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -16,6 +18,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Student Group", 
@@ -41,6 +44,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Academic Year", 
@@ -66,6 +70,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Academic Term", 
@@ -91,6 +96,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -114,6 +120,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Program", 
@@ -139,6 +146,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Course", 
@@ -164,6 +172,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -187,6 +196,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Room", 
@@ -212,6 +222,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -235,6 +246,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Instructor", 
@@ -260,6 +272,7 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Instructor Name", 
@@ -285,6 +298,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -309,6 +323,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "From Time", 
@@ -334,6 +349,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Course Start Date", 
@@ -359,6 +375,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Day", 
@@ -384,6 +401,7 @@
   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Rechedule", 
@@ -408,6 +426,7 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "length": 0, 
@@ -431,6 +450,7 @@
   "fieldtype": "Time", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "To TIme", 
@@ -456,6 +476,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Course End Date", 
@@ -476,6 +497,7 @@
 "hide_heading": 1, 
 "hide_toolbar": 1, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
@@ -483,7 +505,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 01:24:48.220756", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Scheduling Tool", 
@@ -509,31 +531,12 @@
   "share": 0, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "version": 0
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -556,33 +556,13 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 06:23:57.581538", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student", 
 "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": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -633,7 +633,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-07-25 01:24:27.384647", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student Applicant", 
@@ -659,26 +659,6 @@
   "share": 1, 
   "submit": 1, 
   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
  }
 ], 
 "quick_entry": 1, 
--- a/erpnext/schools/doctype/student_attendance/student_attendance.js
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Attendance', {
+	refresh: function(frm) {
+
+	}
+});
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "SA.######", 
+ "beta": 0, 
 "creation": "2015-11-05 15:20:23.045996", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,14 +19,17 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Student", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Student", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -40,14 +45,17 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Student Name", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "student.title", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,12 +71,15 @@
   "fieldtype": "Column Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
+   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -84,14 +95,17 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Course Schedule", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Course Schedule", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -108,14 +122,17 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Status", 
+   "length": 0, 
   "no_copy": 0, 
   "options": "Present\nAbsent", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -131,13 +148,16 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Amended From", 
+   "length": 0, 
   "no_copy": 1, 
   "options": "Student Attendance", 
   "permlevel": 0, 
   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -148,12 +168,15 @@
 ], 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 1, 
 "issingle": 0, 
 "istable": 0, 
- "modified": "2016-07-18 10:30:50.243271",
+ "max_attachments": 0, 
+ "modified": "2016-07-25 01:23:49.324922", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student Attendance", 
@@ -179,31 +202,13 @@
   "share": 1, 
   "submit": 1, 
   "write": 1
-  }, 
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
- "title_field": "student_name"
+ "title_field": "student_name", 
+ "track_seen": 0
 }
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -126,7 +126,7 @@
   "label": "Academic Term", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Academic Year", 
+   "options": "Academic Term", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -199,7 +199,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-22 05:31:12.683404", 
+ "modified": "2016-07-22 09:19:51.141234", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student Batch", 
--- a/erpnext/schools/doctype/student_batch/student_batch.py
+++ b/erpnext/schools/doctype/student_batch/student_batch.py
@@ -8,9 +8,12 @@ from erpnext.schools.utils import validate_duplicate_student
 import frappe

 class StudentBatch(Document):
-	def validate(self):
-		validate_duplicate_student(self.students)
+	def autoname(self):
 		prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
 		if not prog_abb:
 			prog_abb = self.program
-		self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
+		self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
+	
+	def validate(self):
+		validate_duplicate_student(self.students)
+		
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -1,7 +1,7 @@
 {
 "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
 "autoname": "", 
 "beta": 0, 
 "creation": "2015-09-07 12:55:52.072792", 
@@ -280,7 +280,7 @@
 "istable": 0, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2016-07-22 06:12:10.092544", 
+ "modified": "2016-07-25 06:23:43.903111", 
 "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student Group", 
@@ -306,26 +306,6 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
-  }, 
-  {
-   "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": 1, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
  }
 ], 
 "quick_entry": 0, 
--- a/erpnext/schools/doctype/student_group/student_group.py
+++ b/erpnext/schools/doctype/student_group/student_group.py
@@ -9,13 +9,7 @@ from frappe import _
 from erpnext.schools.utils import validate_duplicate_student

 class StudentGroup(Document):
-	def validate(self):
-		self.set_name()
-		self.validate_strength()
-		self.validate_student_name()
-		validate_duplicate_student(self.students)
-	
-	def set_name(self):
+	def autoname(self):
 		self.name = frappe.db.get_value("Course", self.course, "course_abbreviation")
 		if not self.name:
 			self.name = self.course
@@ -31,6 +25,11 @@ class StudentGroup(Document):
 				self.name += "-" + self.academic_year
 		if self.academic_term:
 			self.name += "-" + self.academic_term
+	
+	def validate(self):
+		self.validate_strength()
+		self.validate_student_name()
+		validate_duplicate_student(self.students)

 	def validate_strength(self):
 		if self.max_strength and len(self.students) > self.max_strength:
--- a/erpnext/schools/doctype/student_group/test_records.json
+++ b/erpnext/schools/doctype/student_group/test_records.json
@@ -1,13 +1,11 @@
 [
 	{
-		"group_name": "_Test Student Group",
 		"program": "_Test Program",
 		"course": "_Test Course",
 		"academic_year": "2014-2015",
 		"academic_term": "_Test Academic Term"
 	},
 	{
-		"group_name": "_Test Student Group 1",
 		"program": "_Test Program",
 		"course": "_Test Course 2",
 		"academic_year": "2014-2015",
--- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
+++ b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.json
@@ -2,11 +2,13 @@
 "allow_copy": 1, 
 "allow_import": 0, 
 "allow_rename": 0, 
+ "beta": 0, 
 "creation": "2016-01-04 14:45:36.576933", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -174,7 +176,7 @@
   "label": "Courses", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "SG Creation Tool Course", 
+   "options": "Student Group Creation Tool Course", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -190,39 +192,20 @@
 "hide_heading": 1, 
 "hide_toolbar": 1, 
 "idx": 0, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 1, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-18 10:30:50.243271",
- "modified_by": "demo@erpnext.com", 
+ "modified": "2016-07-25 06:40:46.107131", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
 "name": "Student Group Creation Tool", 
 "name_case": "", 
 "owner": "Administrator", 
 "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Administrator", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }, 
  {
   "amend": 0, 
   "apply_user_permissions": 0, 
@@ -244,6 +227,7 @@
   "write": 1
  }
 ], 
+ "quick_entry": 0, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "sort_field": "modified", 
--- a/erpnext/schools/doctype/student_group_creation_tool_course/init.py
+++ b/erpnext/schools/doctype/student_group_creation_tool_course/init.py
--- a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
+++ b/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.json
@@ -147,10 +147,10 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2016-07-21 12:31:41.252860", 
- "modified_by": "r@r.com", 
+ "modified": "2016-07-25 06:40:49.000588", 
+ "modified_by": "Administrator", 
 "module": "Schools", 
- "name": "SG Creation Tool Course", 
+ "name": "Student Group Creation Tool Course", 
 "name_case": "", 
 "owner": "Administrator", 
 "permissions": [], 
--- a/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py
+++ b/erpnext/schools/doctype/student_group_creation_tool_course/student_group_creation_tool_course.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt

 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document

-class SGCreationToolCourse(Document):
+class StudentGroupCreationToolCourse(Document):
 	pass
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -3,12 +3,14 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "naming_series:", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:18", 
 "custom": 0, 
 "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
   "fieldtype": "Section Break", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Section Break", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -41,6 +45,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Campaign Name", 
@@ -50,6 +55,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -65,6 +71,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Naming Series", 
@@ -73,6 +80,7 @@
   "options": "Campaign-.####", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -88,6 +96,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -97,6 +106,7 @@
   "oldfieldtype": "Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -110,13 +120,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-bullhorn", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:43.265411", 
+ "modified": "2016-07-25 05:24:26.355291", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Campaign", 
@@ -183,6 +194,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -10,6 +10,7 @@
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -956,10 +957,11 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-06-09 14:39:17.712638", 
+ "modified": "2016-07-25 05:20:22.976925", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Customer", 
+ "name_case": "Title Case", 
 "owner": "Administrator", 
 "permissions": [
  {
@@ -1143,7 +1145,7 @@
   "write": 0
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "customer_name,customer_group,territory", 
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:industry", 
+ "beta": 0, 
 "creation": "2012-03-27 14:36:09", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Industry", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -38,13 +42,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.569394", 
+ "modified": "2016-07-25 05:24:25.881361", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Industry Type", 
@@ -111,6 +116,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -5,8 +5,7 @@
 "autoname": "naming_series:", 
 "beta": 0, 
 "creation": "2013-05-24 19:29:08", 
- "custom": 0, 
- "default_print_format": "test123", 
+ "custom": 0,
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Document", 
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:brand", 
+ "beta": 0, 
 "creation": "2013-02-22 01:27:54", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Brand Name", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -41,6 +45,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -50,6 +55,7 @@
   "oldfieldtype": "Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,13 +69,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-certificate", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:43.008609", 
+ "modified": "2016-07-25 05:24:26.450436", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Brand", 
@@ -176,6 +183,8 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -32,6 +32,9 @@ class Company(Document):
 		self.validate_currency()

 	def validate_abbr(self):
+		if not self.abbr:
+			self.abbr = ''.join([c[0] for c in self.company_name.split()]).upper()
+
 		self.abbr = self.abbr.strip()

 		if self.get('__islocal') and len(self.abbr) > 5:
@@ -66,7 +69,7 @@ class Company(Document):
 			if not frappe.local.flags.ignore_chart_of_accounts:
 				self.create_default_accounts()
 				self.create_default_warehouses()
-			
+
 				self.install_country_fixtures()

 		if not frappe.db.get_value("Cost Center", {"is_group": 0, "company": self.name}):
@@ -92,7 +95,7 @@ class Company(Document):
 			{"warehouse_name": _("Stores"), "is_group": 0},
 			{"warehouse_name": _("Work In Progress"), "is_group": 0},
 			{"warehouse_name": _("Finished Goods"), "is_group": 0}]:
-			
+
 			if not frappe.db.exists("Warehouse", "{0} - {1}".format(wh_detail["warehouse_name"], self.abbr)):
 				stock_group = frappe.db.get_value("Account", {"account_type": "Stock",
 					"is_group": 1, "company": self.name})
@@ -203,9 +206,9 @@ class Company(Document):
 		rec = frappe.db.sql("SELECT name from `tabGL Entry` where company = %s", self.name)
 		if not rec:
 			frappe.db.sql("""delete from `tabBudget Account`
-				where exists(select name from tabBudget 
+				where exists(select name from tabBudget
 					where name=`tabBudget Account`.parent and company = %s)""", self.name)
-			
+
 			for doctype in ["Account", "Cost Center", "Budget", "Party Account"]:
 				frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name)

--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -2,12 +2,14 @@
 "allow_copy": 0, 
 "allow_import": 1, 
 "allow_rename": 0, 
+ "beta": 0, 
 "creation": "2013-06-20 15:40:29", 
 "custom": 0, 
 "description": "Specify Exchange Rate to convert one currency into another", 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "From Currency", 
@@ -25,6 +28,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -40,6 +44,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "To Currency", 
@@ -48,6 +53,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -63,6 +69,7 @@
   "fieldtype": "Float", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Exchange Rate", 
@@ -71,6 +78,7 @@
   "permlevel": 0, 
   "precision": "9", 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -83,13 +91,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-exchange", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:44.028262", 
+ "modified": "2016-07-25 05:24:26.264021", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Currency Exchange", 
@@ -176,6 +185,8 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -39,7 +39,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "description": "", 
   "fieldname": "parent_customer_group", 
@@ -67,7 +67,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "description": "Only leaf nodes are allowed in transaction", 
   "fieldname": "is_group", 
@@ -88,7 +88,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
@@ -359,7 +359,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-14 12:43:08.949307", 
+ "modified": "2016-07-25 05:16:17.676700", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Customer Group", 
@@ -486,7 +486,7 @@
   "write": 0
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "parent_customer_group", 
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -92,7 +92,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "description": "Only leaf nodes are allowed in transaction", 
   "fieldname": "is_group", 
@@ -113,7 +113,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
@@ -456,16 +456,17 @@
 "icon": "icon-sitemap", 
 "idx": 1, 
 "image_view": 0, 
- "in_create": 1, 
+ "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 3, 
- "modified": "2016-07-14 12:41:09.269478", 
+ "modified": "2016-07-25 05:20:09.760558", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Item Group", 
+ "name_case": "Title Case", 
 "owner": "Administrator", 
 "permissions": [
  {
@@ -589,7 +590,7 @@
   "write": 0
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "parent_item_group", 
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:print_heading", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:24", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 1, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 1, 
   "label": "Print Heading", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -41,6 +45,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Description", 
@@ -50,6 +55,7 @@
   "oldfieldtype": "Small Text", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -63,13 +69,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-font", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:52.194195", 
+ "modified": "2016-07-25 05:24:25.628101", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Print Heading", 
@@ -116,7 +123,9 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
- "search_fields": "print_heading"
+ "search_fields": "print_heading", 
+ "track_seen": 0
 }
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "field:order_lost_reason", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:24", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Quotation Lost Reason", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -38,13 +42,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-flag", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:55.325868", 
+ "modified": "2016-07-25 05:24:25.533953", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Quotation Lost Reason", 
@@ -71,6 +76,8 @@
   "write": 1
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -3,12 +3,14 @@
 "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:title", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:24", 
 "custom": 0, 
 "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -18,6 +20,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Title", 
@@ -43,6 +46,7 @@
   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 1, 
   "label": "Disabled", 
@@ -67,6 +71,7 @@
   "fieldtype": "Text Editor", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Terms and Conditions", 
@@ -89,13 +94,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-legal", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-01-11 23:54:33.491719", 
+ "modified": "2016-07-25 05:24:25.093905", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Terms and Conditions", 
@@ -222,6 +228,8 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -40,7 +40,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "description": "", 
   "fieldname": "parent_territory", 
@@ -68,7 +68,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "description": "Only leaf nodes are allowed in transaction", 
   "fieldname": "is_group", 
@@ -89,7 +89,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
@@ -318,7 +318,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-14 12:43:36.619881", 
+ "modified": "2016-07-25 05:18:18.629953", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "Territory", 
@@ -426,7 +426,7 @@
   "write": 0
  }
 ], 
- "quick_entry": 0, 
+ "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
 "search_fields": "parent_territory,territory_manager", 
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -3,11 +3,13 @@
 "allow_import": 1, 
 "allow_rename": 0, 
 "autoname": "field:uom_name", 
+ "beta": 0, 
 "creation": "2013-01-10 16:34:24", 
 "custom": 0, 
 "docstatus": 0, 
 "doctype": "DocType", 
 "document_type": "Setup", 
+ "editable_grid": 0, 
 "fields": [
  {
   "allow_on_submit": 0, 
@@ -17,6 +19,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "UOM Name", 
@@ -26,6 +29,7 @@
   "oldfieldtype": "Data", 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 1, 
@@ -42,6 +46,7 @@
   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_list_view": 0, 
   "label": "Must be Whole Number", 
@@ -49,6 +54,7 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "report_hide": 0, 
   "reqd": 0, 
@@ -61,13 +67,14 @@
 "hide_toolbar": 0, 
 "icon": "icon-compass", 
 "idx": 1, 
+ "image_view": 0, 
 "in_create": 0, 
 "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2015-11-16 06:29:59.741239", 
+ "modified": "2016-07-25 05:24:25.434534", 
 "modified_by": "Administrator", 
 "module": "Setup", 
 "name": "UOM", 
@@ -134,6 +141,8 @@
   "write": 0
  }
 ], 
+ "quick_entry": 1, 
 "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "track_seen": 0
 }
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -63,7 +63,7 @@ def get_domain(domain):
 		'Education': {
 			'desktop_icons': ['Student', 'Program', 'Course', 'Student Group', 'Instructor',
 				'Fees',  'ToDo', 'Schools'],
-			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager'],
+			'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Website Manager'],
 			'allow_sidebar_items': ['/announcement', '/course', '/examination', '/fees']
 		},
 	}
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -41,12 +41,12 @@ def setup_complete(args=None):
 		create_instructor(args)
 		create_room(args)

-	frappe.local.message_log = []
-	setup_domain(args.get('domain'))
-
 	website_maker(args)
 	create_logo(args)

+	frappe.local.message_log = []
+	setup_domain(args.get('domain'))
+
 	frappe.db.commit()
 	login_as_first_user(args)

--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -79,7 +79,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten

 				// stop
 				cur_frm.add_custom_button(__('Stop'),
-					cur_frm.cscript['Stop Material Request'], __("Status"));
+					cur_frm.cscript['Stop Material Request']);

 			}
 		}
@@ -102,7 +102,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten

 		if(doc.docstatus == 1 && doc.status == 'Stopped')
 			cur_frm.add_custom_button(__('Re-open'),
-				cur_frm.cscript['Unstop Material Request'], __("Status"));
+				cur_frm.cscript['Unstop Material Request']);

 	},

--- a/erpnext/stock/doctype/material_request/material_request_dashboard.py
+++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py
@@ -1,7 +1,6 @@
 from frappe import _

 data = {
-	'docstatus': 1,
 	'fieldname': 'material_request',
 	'transactions': [
 		{
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -40,6 +40,32 @@
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
+   "fieldname": "warehouse_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warehouse_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
   "default": "0", 
   "fieldname": "is_group", 
   "fieldtype": "Check", 
@@ -63,32 +89,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Warehouse Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "warehouse_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_on_submit": 0, 
   "bold": 0, 
@@ -477,7 +477,7 @@
  }, 
  {
   "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
   "collapsible": 0, 
   "fieldname": "parent_warehouse", 
   "fieldtype": "Link", 
@@ -589,7 +589,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-07-08 06:00:36.113988", 
+ "modified": "2016-07-25 05:06:44.598548", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Warehouse", 
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -71,9 +71,11 @@ def get_conditions(filters):
 		conditions += " and item_code = '%s'" % frappe.db.escape(filters.get("item_code"), percent=False)

 	if filters.get("warehouse"):
-		lft, rgt = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"])
-		conditions += " and exists (select name from `tabWarehouse` wh \
-			where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(lft, rgt)
+		warehouse_details = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1)
+		if warehouse_details:
+			conditions += " and exists (select name from `tabWarehouse` wh \
+				where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(warehouse_details.lft,
+				warehouse_details.rgt)

 	return conditions

--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -99,8 +99,10 @@ def get_opening_balance(filters, columns):
 	return row
 	
 def get_warehouse_condition(warehouse):
-	lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
-	
-	return " exists (select name from `tabWarehouse` wh \
-		where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(lft, rgt)
-	
+	warehouse_details = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"], as_dict=1)
+	if warehouse_details:
+		return " exists (select name from `tabWarehouse` wh \
+			where wh.lft >= %s and wh.rgt <= %s and sle.warehouse = wh.name)"%(warehouse_details.lft,
+			warehouse_details.rgt)
+
+	return ''
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -63,10 +63,12 @@ def get_bin_list(filters):
 		conditions.append("item_code = '%s' "%filters.item_code)
 		
 	if filters.warehouse:
-		lft, rgt = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"])
-	
-		conditions.append(" exists (select name from `tabWarehouse` wh \
-			where wh.lft >= %s and wh.rgt <= %s and bin.warehouse = wh.name)"%(lft, rgt))
+		warehouse_details = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"], as_dict=1)
+
+		if warehouse_details:
+			conditions.append(" exists (select name from `tabWarehouse` wh \
+				where wh.lft >= %s and wh.rgt <= %s and bin.warehouse = wh.name)"%(warehouse_details.lft,
+				warehouse_details.rgt))

 	bin_list = frappe.db.sql("""select item_code, warehouse, actual_qty, planned_qty, indented_qty,
 		ordered_qty, reserved_qty, reserved_qty_for_production, projected_qty
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rushabh Mehta	e26a42dc7a	Merge branch 'develop'	2016-07-27 15:19:58 +05:30
Rushabh Mehta	b2c9848886	bumped to version 7.0.7	2016-07-27 15:49:58 +06:00
Nabin Hait	b4bf757a15	Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py	2016-07-27 15:19:12 +05:30
Rushabh Mehta	fc49c2c5f9	Merge branch 'develop'	2016-07-27 15:09:03 +05:30
Rushabh Mehta	384f0b18c0	bumped to version 7.0.6	2016-07-27 15:39:03 +06:00
Rushabh Mehta	548ea777a9	Merge pull request #5883 from saurabh6790/maintenance_schedule_fix [fix] report filter fix	2016-07-27 12:43:41 +05:30
Nabin Hait	67047fbb06	Merge branch 'rohitwaghchaure-warehouse_blank_issue_for_non_stock_account' into develop	2016-07-27 12:43:25 +05:30
Nabin Hait	10007ab4df	[fix] reposting of gle where stock account not linked with warehouse	2016-07-27 12:43:02 +05:30
Nabin Hait	444bedcd20	Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account	2016-07-27 12:33:10 +05:30
Rushabh Mehta	2af5dfa9cc	Merge pull request #5884 from saurabh6790/schools_fix [minor][fix] rename attribute from amount to components	2016-07-27 12:23:22 +05:30
Saurabh	4bc0f7d105	[minor][fix] rename attribute from amount to components	2016-07-27 12:10:21 +05:30
Saurabh	3642f987c7	[fix] report filter fix	2016-07-27 11:42:50 +05:30
Rushabh Mehta	fd288f36ec	Merge pull request #5880 from bcornwellmott/fixSalarySlip_TimeSheet_SQL Added date filters for the Timesheet query in Salary Slip	2016-07-27 08:22:29 +05:30
Rushabh Mehta	593d2e3146	Merge pull request #5877 from rohitwaghchaure/v7_fixes [minor] Fixes	2016-07-26 21:21:45 +05:30
Rohit Waghchaure	c4afd63e50	[minor] Fixes	2016-07-26 20:47:42 +05:30
Rushabh Mehta	6fe4a336f1	Merge branch 'develop'	2016-07-26 18:02:38 +05:30
Rushabh Mehta	154be9b693	bumped to version 7.0.5	2016-07-26 18:32:38 +06:00
Rushabh Mehta	d46235ed83	Merge pull request #5874 from saurabh6790/maintenance_schedule_fix [minor][fix] end date should not be less or equal to start date	2016-07-26 17:44:42 +05:30
Saurabh	17a9940f00	[minor][fix] end date should not be less or equal to start date	2016-07-26 17:18:45 +05:30
Rohit Waghchaure	4d3e8da4a2	[Fix] Set warehouse to stock account and fixed gl entries against transactions.	2016-07-26 17:09:33 +05:30
Ben Cornwell-Mott	d4d1f1b036	Added date filters for the Timesheet query in Salary Slip	2016-07-26 03:33:38 -07:00
Rushabh Mehta	9b542f303c	Merge pull request #5870 from saurabh6790/fee_component_patch_fix [fix] fee component rename patch fix	2016-07-26 15:06:56 +05:30
Saurabh	21a5658fdf	[fix] fee component rename patch fix	2016-07-26 15:03:41 +05:30
Rushabh Mehta	0540d52449	Merge pull request #5868 from rohitwaghchaure/patch_issue [Fix] Timesheet patch	2016-07-26 12:59:00 +05:30
Rohit Waghchaure	8a9daece7e	[Fix] Timesheet patch	2016-07-26 12:57:05 +05:30
Rushabh Mehta	c85aa3d9c5	Merge branch 'develop'	2016-07-26 09:24:00 +05:30
Rushabh Mehta	5662ad6d96	bumped to version 7.0.4	2016-07-26 09:54:00 +06:00
Rushabh Mehta	859843687e	[minor] add abbr if missing	2016-07-26 08:23:32 +05:30
Rushabh Mehta	40cf3db0b1	Merge pull request #5865 from rohitwaghchaure/v7_fixes_and_cleanup [mionr] fixes and cleanups	2016-07-26 07:58:03 +05:30
Rohit Waghchaure	26cf01aaba	[mionr] fixes and cleanups	2016-07-26 00:30:25 +05:30
Rushabh Mehta	eac602304c	Merge pull request #5864 from neilLasrado/rename [rename] Renamed Fee Amount to Fee Component	2016-07-25 18:37:09 +05:30
Neil Trini Lasrado	ce1c63f776	[rename] Renamed Fee Amount to Fee Component	2016-07-25 18:24:37 +05:30
Rushabh Mehta	95b550dd8f	Merge pull request #5862 from neilLasrado/rename Renamed sg_creation_tool_course to Student Group Creation Tool Course	2016-07-25 16:21:32 +05:30
Rushabh Mehta	bb78f1ac16	Merge pull request #5861 from neilLasrado/develop [Fix] fixed test cases for schools	2016-07-25 16:21:18 +05:30
Neil Trini Lasrado	feea2e3dec	[Doctype Rename] Renamed sg_creation_tool_course to Student Group Creation Tool Course	2016-07-25 16:13:05 +05:30
Neil Trini Lasrado	7dae3e1ed4	[Fix] fixed test cases for schools	2016-07-25 15:55:31 +05:30
Rushabh Mehta	5658fdfaed	Merge branch 'develop'	2016-07-25 15:45:46 +05:30
Rushabh Mehta	1c93dd0591	bumped to version 7.0.3	2016-07-25 16:15:46 +06:00
Rushabh Mehta	c910e0c614	[translations] update icenlandic	2016-07-25 15:03:39 +05:30
Rushabh Mehta	6c3ac9587e	[fix] quick entry	2016-07-25 15:03:39 +05:30
Rushabh Mehta	316f78f859	Merge pull request #5858 from bohlian/develop [Fixed] Stopping and Re-Opening of Production Order	2016-07-25 14:24:16 +05:30
Javier Wong	5b2af6ad40	[Fixed] Stopping and Re-Opening of Production Order	2016-07-25 16:49:39 +08:00
Rushabh Mehta	00f7741288	Merge branch 'develop'	2016-07-25 12:58:03 +05:30
Rushabh Mehta	3f8428e972	bumped to version 7.0.2	2016-07-25 13:28:03 +06:00
Rushabh Mehta	644a04b378	[fix] translations v7.0	2016-07-25 12:15:30 +05:30
Rushabh Mehta	c9478fc4f1	[minor] setup website before domainify	2016-07-25 12:09:21 +05:30
Rushabh Mehta	7b13c11182	Merge pull request #5857 from neilLasrado/perm Removed Administrator role from Doctypes	2016-07-25 11:46:50 +05:30
Neil Trini Lasrado	d69d961f2a	Removed Administrator role from Doctypes	2016-07-25 11:39:23 +05:30
Rushabh Mehta	cc887900e8	[fix] --yes for reinstall	2016-07-24 22:45:09 +05:30
Rushabh Mehta	ead3ccfd52	[fix] more routes patch up	2016-07-24 22:28:50 +05:30
Rushabh Mehta	84f25b3214	Merge branch 'develop'	2016-07-24 17:17:43 +05:30
Rushabh Mehta	581a12c56a	bumped to version 7.0.1	2016-07-24 17:47:43 +06:00
Rushabh Mehta	cd385c3735	[fix] [minor] email pulling error, via scheduler log	2016-07-24 13:07:50 +05:30
Rushabh Mehta	49e17e4590	Merge pull request #5849 from netchampfaris/ui-fixes [mobile ui] fix pos payment layout #5780	2016-07-24 12:47:13 +05:30
Rushabh Mehta	0e94785cdd	Merge pull request #5846 from rohitwaghchaure/timesheet_patch_issue [Fix] Timesheet patch	2016-07-24 11:52:09 +05:30
Faris Ansari	8e282c2ed8	[mobile ui] fix pos payment layout #5780	2016-07-24 11:37:25 +05:30
Rohit Waghchaure	f027fd0c66	[Fix] Timesheet patch	2016-07-24 00:38:10 +05:30
Rushabh Mehta	71b6494395	Merge pull request #5845 from KanchanChauhan/quotation-fix [Minor Fix]	2016-07-23 15:16:31 +05:30
Kanchan Chauhan	39c952a3f2	[Minor Fix]	2016-07-23 14:39:01 +05:30
Rushabh Mehta	e7399dff2d	[fix] homepage patch	2016-07-22 21:01:39 +05:30
Rushabh Mehta	29517d0b8c	[fix] purchase order dashboard	2016-07-22 21:01:39 +05:30
Rushabh Mehta	c96263ceb8	Merge pull request #5841 from neilLasrado/student_batch Minor fixed for Schools	2016-07-22 19:16:54 +05:30
Neil Trini Lasrado	6cfb60dc98	Minor fixed for Schools	2016-07-22 19:08:18 +05:30