Merge branch 'hotfix'

bumped to version 9.2.5
Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option
2026-06-13 09:53:02 +00:00 · 2017-11-08 12:12:37 +05:30 · 2017-11-08 12:42:37 +06:00 · 2017-11-08 11:49:24 +05:30 · 2017-11-08 11:39:08 +05:30 · 2017-11-08 11:33:39 +05:30
272 changed files with 12118 additions and 5815 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides

-__version__ = '9.1.8'
+__version__ = '9.2.5'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -417,6 +417,46 @@
   "share": 1, 
   "submit": 0, 
   "write": 1
+  },
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  },
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
  }
 ], 
 "quick_entry": 1, 
@@ -426,4 +466,4 @@
 "sort_order": "ASC", 
 "track_changes": 1, 
 "track_seen": 0
-}
+}
--- a/erpnext/accounts/doctype/asset/asset.js
+++ b/erpnext/accounts/doctype/asset/asset.js
@@ -55,13 +55,13 @@ frappe.ui.form.on('Asset', {
 				});
 			}

-			frm.trigger("show_graph");
+			frm.trigger("setup_chart");
 		}
 	},

-	show_graph: function(frm) {
-		var x_intervals = ["x", frm.doc.purchase_date];
-		var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
+	setup_chart: function(frm) {
+		var x_intervals = [frm.doc.purchase_date];
+		var asset_values = [frm.doc.gross_purchase_amount];
 		var last_depreciation_date = frm.doc.purchase_date;

 		if(frm.doc.opening_accumulated_depreciation) {
@@ -94,32 +94,21 @@ frappe.ui.form.on('Asset', {
 			last_depreciation_date = frm.doc.disposal_date;
 		}

-		frm.dashboard.setup_chart({
+		frm.dashboard.render_graph({
+			title: "Asset Value",
 			data: {
-				x: 'x',
-				columns: [x_intervals, asset_values],
-				regions: {
-					'Asset Value': [{'start': last_depreciation_date, 'style':'dashed'}]
-				}
+				labels: x_intervals,
+				datasets: [{
+					color: 'green',
+					values: asset_values,
+					formatted: asset_values.map(d => d.toFixed(2))
+				}]
 			},
-			legend: {
-				show: false
-			},
-			axis: {
-				x: {
-					type: 'timeseries',
-					tick: {
-						format: "%d-%m-%Y"
-					}
-				},
-				y: {
-					min: 0,
-					padding: {bottom: 10}
-				}
-			}
+			type: 'line'
 		});
 	},

+
 	item_code: function(frm) {
 		if(frm.doc.item_code) {
 			frappe.call({
--- a/erpnext/accounts/doctype/asset/test_asset.py
+++ b/erpnext/accounts/doctype/asset/test_asset.py
@@ -13,6 +13,7 @@ class TestAsset(unittest.TestCase):
 	def setUp(self):
 		set_depreciation_settings_in_company()
 		create_asset()
+		frappe.db.sql("delete from `tabTax Rule`")
 		
 	def test_purchase_asset(self):
 		asset = frappe.get_doc("Asset", "Macbook Pro 1")
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -648,13 +648,13 @@ frappe.ui.form.on('Payment Entry', {

 	set_difference_amount: function(frm) {
 		var unallocated_amount = 0;
+		var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
+			function(d) { return flt(d.amount) }));
+
 		if(frm.doc.party) {
 			var party_amount = frm.doc.payment_type=="Receive" ?
 				frm.doc.paid_amount : frm.doc.received_amount;

-			var total_deductions = frappe.utils.sum($.map(frm.doc.deductions || [],
-				function(d) { return flt(d.amount) }));
-
 			if(frm.doc.total_allocated_amount < party_amount) {
 				if(frm.doc.payment_type == "Receive") {
 					unallocated_amount = party_amount - (frm.doc.total_allocated_amount - total_deductions);
--- a/erpnext/accounts/doctype/payment_entry/tests/test_payment_against_purchase_invoice.js
+++ b/erpnext/accounts/doctype/payment_entry/tests/test_payment_against_purchase_invoice.js
@@ -0,0 +1,60 @@
+QUnit.module('Payment Entry');
+
+QUnit.test("test payment entry", function(assert) {
+	assert.expect(7	);
+	let done = assert.async();
+
+	frappe.run_serially([
+		() => {
+			return frappe.tests.make('Purchase Invoice', [
+				{supplier: 'Test Supplier'},
+				{bill_no: 'in1234'},
+				{items: [
+					[
+						{'qty': 2},
+						{'item_code': 'Test Product 1'},
+						{'rate':1000},
+					]
+				]},
+				{update_stock:1},
+				{supplier_address: 'Test1-Billing'},
+				{contact_person: 'Contact 3-Test Supplier'},
+				{tc_name: 'Test Term 1'},
+				{terms: 'This is just a Test'}
+			]);
+		},
+
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(1),
+		() => frappe.click_button('Make'),
+		() => frappe.timeout(2),
+		() => frappe.click_link('Payment'),
+		() => frappe.timeout(3),
+		() => cur_frm.set_value('mode_of_payment','Cash'),
+		() => frappe.timeout(3),
+		() => {
+			assert.equal(frappe.get_route()[1], 'Payment Entry',
+				'made payment entry');
+			assert.equal(cur_frm.doc.party, 'Test Supplier',
+				'supplier set in payment entry');
+			assert.equal(cur_frm.doc.paid_amount, 2000,
+				'paid amount set in payment entry');
+			assert.equal(cur_frm.doc.references[0].allocated_amount, 2000,
+				'amount allocated against purchase invoice');
+			assert.equal(cur_frm.doc.references[0].bill_no, 'in1234',
+				'invoice number allocated against purchase invoice');
+			assert.equal(cur_frm.get_field('total_allocated_amount').value, 2000,
+				'correct amount allocated in Write Off');
+			assert.equal(cur_frm.get_field('unallocated_amount').value, 0,
+				'correct amount unallocated in Write Off');
+		},
+
+		() => cur_frm.save(),
+		() => frappe.tests.click_button('Submit'),
+		() => frappe.tests.click_button('Yes'),
+		() => frappe.timeout(3),
+		() => done()
+	]);
+});
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -3,7 +3,7 @@
 "allow_guest_to_view": 0, 
 "allow_import": 0, 
 "allow_rename": 0, 
- "autoname": "hash", 
+ "autoname": "field:pos_profile_name", 
 "beta": 0, 
 "creation": "2013-05-24 12:15:51", 
 "custom": 0, 
@@ -11,6 +11,96 @@
 "doctype": "DocType", 
 "editable_grid": 0, 
 "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pos_profile_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "POS Profile Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
@@ -112,9 +202,8 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
-   "depends_on": "update_stock", 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
+   "fieldname": "ignore_pricing_rule", 
+   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -122,13 +211,11 @@
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
-   "label": "Warehouse", 
+   "label": "Ignore Pricing Rule", 
   "length": 0, 
   "no_copy": 0, 
-   "oldfieldname": "warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
   "permlevel": 0, 
+   "precision": "", 
   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
@@ -145,8 +232,8 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
+   "fieldname": "allow_delete", 
+   "fieldtype": "Check", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -154,10 +241,39 @@
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
-   "label": "Campaign", 
+   "label": "Allow Delete", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_user_to_edit_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow user to edit Rate", 
   "length": 0, 
   "no_copy": 0, 
-   "options": "Campaign", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -300,7 +416,8 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
-   "fieldname": "currency", 
+   "depends_on": "update_stock", 
+   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
@@ -309,19 +426,19 @@
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
-   "label": "Currency", 
+   "label": "Warehouse", 
   "length": 0, 
   "no_copy": 0, 
-   "oldfieldname": "currency", 
-   "oldfieldtype": "Select", 
-   "options": "Currency", 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
   "permlevel": 0, 
   "print_hide": 0, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
@@ -332,8 +449,8 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
-   "fieldname": "ignore_pricing_rule", 
-   "fieldtype": "Check", 
+   "fieldname": "campaign", 
+   "fieldtype": "Link", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
@@ -341,69 +458,10 @@
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
-   "label": "Ignore Pricing Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_delete", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Delete", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_user_to_edit_rate", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow user to edit Rate", 
+   "label": "Campaign", 
   "length": 0, 
   "no_copy": 0, 
+   "options": "Campaign", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -422,6 +480,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "", 
   "fieldname": "section_break_11", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -482,6 +541,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "", 
   "fieldname": "section_break_14", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -602,6 +662,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "", 
   "fieldname": "section_break_16", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -882,6 +943,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "", 
   "fieldname": "offline_pos_section", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1037,6 +1099,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "", 
   "fieldname": "section_break_19", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -1046,6 +1109,7 @@
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
+   "label": "Accounting", 
   "length": 0, 
   "no_copy": 0, 
   "permlevel": 0, 
@@ -1060,6 +1124,38 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "currency", 
+   "oldfieldtype": "Select", 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
  {
   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
@@ -1154,38 +1250,6 @@
   "set_only_once": 0, 
   "unique": 0
  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "charge", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
  {
   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
@@ -1309,6 +1373,38 @@
   "search_index": 0, 
   "set_only_once": 0, 
   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "taxes_and_charges", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Taxes and Charges", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "charge", 
+   "oldfieldtype": "Link", 
+   "options": "Sales Taxes and Charges Template", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
  }
 ], 
 "has_web_view": 0, 
@@ -1322,7 +1418,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-09-01 15:55:14.890452", 
+ "modified": "2017-10-27 06:45:32.957674", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "POS Profile", 
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -41,6 +41,7 @@ def make_pos_profile():
 		"expense_account": "_Test Account Cost for Goods Sold - _TC",
 		"income_account": "Sales - _TC",
 		"name": "_Test POS Profile",
+		"pos_profile_name": "_Test POS Profile",
 		"naming_series": "_T-POS Profile-",
 		"selling_price_list": "_Test Price List",
 		"territory": "_Test Territory",
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -348,6 +348,8 @@ def apply_internal_priority(pricing_rules, field_set, args):
 	return filtered_rules or pricing_rules

 def set_transaction_type(args):
+	if args.transaction_type:
+		return
 	if args.doctype in ("Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"):
 		args.transaction_type = "selling"
 	elif args.doctype in ("Material Request", "Supplier Quotation", "Purchase Order",
@@ -356,4 +358,4 @@ def set_transaction_type(args):
 	elif args.customer:
 		args.transaction_type = "selling"
 	else:
-		args.transaction_type = "buying"
+		args.transaction_type = "buying"
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
@@ -7,6 +7,7 @@ QUnit.test("test purchase invoice", function(assert) {
 		() => {
 			return frappe.tests.make('Purchase Invoice', [
 				{supplier: 'Test Supplier'},
+				{bill_no: 'in123'},
 				{items: [
 					[
 						{'qty': 5},
@@ -36,7 +37,7 @@ QUnit.test("test purchase invoice", function(assert) {
 		},
 		() => frappe.tests.click_button('Submit'),
 		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.3),
+		() => frappe.timeout(1),
 		() => done()
 	]);
 });
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -473,6 +473,7 @@ class TestPurchaseInvoice(unittest.TestCase):
 			import test_records as jv_test_records

 		jv = frappe.copy_doc(jv_test_records[1])
+		jv.accounts[0].is_advance = 'Yes'
 		jv.insert()
 		jv.submit()

--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -92,6 +92,7 @@ def update_pos_profile_data(doc, pos_profile, company_data):
 	doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
 	doc.territory = pos_profile.get('territory') or get_root('Territory')
 	doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or ''
+	doc.offline_pos_name = ''

 def get_root(table):
 	root = frappe.db.sql(""" select name from `tab%(table)s` having
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -339,7 +339,7 @@ $.extend(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_
 // ------------
 cur_frm.cscript.hide_fields = function(doc) {
 	var parent_fields = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances',
-		'advances', 'sales_partner', 'commission_rate', 'total_commission', 'advances', 'from_date', 'to_date'];
+		'advances', 'advances', 'from_date', 'to_date'];

 	if(cint(doc.is_pos) == 1) {
 		hide_field(parent_fields);
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -70,7 +70,6 @@ class SalesInvoice(SellingController):
 		self.clear_unallocated_advances("Sales Invoice Advance", "advances")
 		self.add_remarks()
 		self.validate_write_off_account()
-		self.validate_duplicate_offline_pos_entry()
 		self.validate_account_for_change_amount()
 		self.validate_fixed_asset()
 		self.set_income_account_for_fixed_assets()
@@ -305,6 +304,7 @@ class SalesInvoice(SellingController):
 			self.account_for_change_amount = frappe.db.get_value('Company', self.company, 'default_cash_account')

 		if pos:
+			self.pos_profile = pos.name
 			if not for_validate and not self.customer:
 				self.customer = pos.customer
 				self.mode_of_payment = pos.mode_of_payment
@@ -463,12 +463,6 @@ class SalesInvoice(SellingController):
 		if flt(self.write_off_amount) and not self.write_off_account:
 			msgprint(_("Please enter Write Off Account"), raise_exception=1)

-	def validate_duplicate_offline_pos_entry(self):
-		if self.is_pos and self.offline_pos_name \
-			and frappe.db.get_value('Sales Invoice',
-			{'offline_pos_name': self.offline_pos_name, 'docstatus': 1}):
-			frappe.throw(_("Duplicate offline pos sales invoice {0}").format(self.offline_pos_name))
-
 	def validate_account_for_change_amount(self):
 		if flt(self.change_amount) and not self.account_for_change_amount:
 			msgprint(_("Please enter Account for Change Amount"), raise_exception=1)
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1133,6 +1133,7 @@ class TestSalesInvoice(unittest.TestCase):
 			import test_records as jv_test_records

 		jv = frappe.copy_doc(jv_test_records[0])
+		jv.accounts[0].is_advance = 'Yes'
 		jv.insert()
 		jv.submit()

--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -200,7 +200,7 @@ def update_doc(new_document, reference_doc, args, schedule_date):
 	new_document.run_method("on_recurring", reference_doc=reference_doc, subscription_doc=args)

 def set_subscription_period(args, mcount, new_document):
-	if new_document.meta.get_field('from_date') and new_document.meta.get_field('to_date'):
+	if mcount and new_document.meta.get_field('from_date') and new_document.meta.get_field('to_date'):
 		last_ref_doc = frappe.db.sql("""
 			select name, from_date, to_date
 			from `tab{0}`
--- a/erpnext/accounts/doctype/subscription/test_subscription.py
+++ b/erpnext/accounts/doctype/subscription/test_subscription.py
@@ -30,7 +30,7 @@ class TestSubscription(unittest.TestCase):

 		new_quotation = frappe.get_doc('Quotation', new_quotation)

-		for fieldname in ['customer', 'company', 'order_type', 'total', 'grand_total']:
+		for fieldname in ['customer', 'company', 'order_type', 'total', 'net_total']:
 			self.assertEquals(quotation.get(fieldname), new_quotation.get(fieldname))

 		for fieldname in ['item_code', 'qty', 'rate', 'amount']:
--- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py
@@ -11,7 +11,10 @@ test_records = frappe.get_test_records('Tax Rule')

 class TestTaxRule(unittest.TestCase):
 	def setUp(self):
-		frappe.db.sql("delete from `tabTax Rule` where use_for_shopping_cart <> 1")
+		frappe.db.sql("delete from `tabTax Rule`")
+
+	def tearDown(self):
+		frappe.db.sql("delete from `tabTax Rule`")

 	def test_conflict(self):
 		tax_rule1 = make_tax_rule(customer= "_Test Customer",
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -179,41 +179,12 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		}
 	},

-	dialog_actions: function () {
-		var me = this;
-
-		$(this.list_body).find('.list-select-all').click(function () {
-			me.removed_items = [];
-			$(me.list_body).find('.list-delete').prop("checked", $(this).is(":checked"))
-			if ($(this).is(":checked")) {
-				$.each(me.si_docs, function (index, data) {
-					for (key in data) {
-						me.removed_items.push(key)
-					}
-				})
-			}
-
-			me.toggle_delete_button();
-		})
-
-		$(this.list_body).find('.list-delete').click(function () {
-			me.name = $(this).parent().parent().attr('invoice-name');
-			if ($(this).is(":checked")) {
-				me.removed_items.push(me.name);
-			} else {
-				me.removed_items.pop(me.name)
-			}
-
-			me.toggle_delete_button();
-		})
-	},
-
 	edit_record: function () {
 		var me = this;

 		doc_data = this.get_invoice_doc(this.si_docs);
 		if (doc_data) {
-			this.frm.doc = doc_data[0][this.name];
+			this.frm.doc = doc_data[0][this.frm.doc.offline_pos_name];
 			this.set_missing_values();
 			this.refresh(false);
 			this.toggle_input_field();
@@ -226,16 +197,15 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		this.validate_list()
 		this.remove_doc_from_localstorage()
 		this.update_localstorage();
-		// this.dialog_actions();
 		this.toggle_delete_button();
 	},

 	validate_list: function() {
 		var me = this;
 		this.si_docs = this.get_submitted_invoice()
-		$.each(this.removed_items, function(index, name){
+		$.each(this.removed_items, function(index, pos_name){
 			$.each(me.si_docs, function(key, data){
-				if(me.si_docs[key][name] && me.si_docs[key][name].offline_pos_name == name ){
+				if(me.si_docs[key][pos_name] && me.si_docs[key][pos_name].offline_pos_name == pos_name ){
 					frappe.throw(__("Submitted orders can not be deleted"))
 				}
 			})
@@ -294,7 +264,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 		return $.grep(this.si_docs, function (data) {
 			for (key in data) {
-				return key == me.name
+				return key == me.frm.doc.offline_pos_name;
 			}
 		})
 	},
@@ -348,7 +318,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	create_new: function () {
 		var me = this;
 		this.frm = {}
-		this.name = null;
 		this.load_data(true);
 		this.setup();
 		this.set_default_customer()
@@ -362,6 +331,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 		if (load_doc) {
 			this.frm.doc = JSON.parse(localStorage.getItem('doc'));
+			this.frm.doc.offline_pos_name = null;
 		}

 		$.each(this.meta, function (i, data) {
@@ -629,6 +599,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		// this.list_customers.empty();
 		this.si_docs = this.get_doc_from_localstorage();
 		if (!this.si_docs.length) {
+			this.list_customers.find('.list-customers-table').html("");
 			return;
 		}

@@ -655,7 +626,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 			me.list_customers_btn.toggleClass("view_customer");
 			me.pos_bill.show();
 			me.list_customers_btn.show();
-			me.name = $(this).parents().attr('invoice-name')
+			me.frm.doc.offline_pos_name = $(this).parents().attr('invoice-name')
 			me.edit_record();
 		})

@@ -675,11 +646,11 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		});

 		$(this.wrapper).find('.list-delete').click(function () {
-			me.name = $(this).parent().parent().attr('invoice-name');
+			me.frm.doc.offline_pos_name = $(this).parent().parent().attr('invoice-name');
 			if ($(this).is(":checked")) {
-				me.removed_items.push(me.name);
+				me.removed_items.push(me.frm.doc.offline_pos_name);
 			} else {
-				me.removed_items.pop(me.name)
+				me.removed_items.pop(me.frm.doc.offline_pos_name)
 			}

 			me.toggle_delete_button();
@@ -1435,7 +1406,7 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 	},

 	update_paid_amount_status: function (update_paid_amount) {
-		if (this.name) {
+		if (this.frm.doc.offline_pos_name) {
 			update_paid_amount = update_paid_amount ? false : true;
 		}

@@ -1643,18 +1614,17 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({

 	create_invoice: function () {
 		var me = this;
-		var invoice_data = {}
+		var invoice_data = {};
 		this.si_docs = this.get_doc_from_localstorage();
-		if (this.name) {
-			this.update_invoice()
+		if (this.frm.doc.offline_pos_name) {
+			this.update_invoice();
 		} else {
-			this.name = $.now();
-			this.frm.doc.offline_pos_name = this.name;
+			this.frm.doc.offline_pos_name = $.now();
 			this.frm.doc.posting_date = frappe.datetime.get_today();
 			this.frm.doc.posting_time = frappe.datetime.now_time();
 			this.frm.doc.pos_profile = this.pos_profile_data['name'];
-			invoice_data[this.name] = this.frm.doc
-			this.si_docs.push(invoice_data)
+			invoice_data[this.frm.doc.offline_pos_name] = this.frm.doc;
+			this.si_docs.push(invoice_data);
 			this.update_localstorage();
 			this.set_primary_action();
 		}
@@ -1666,12 +1636,12 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		this.si_docs = this.get_doc_from_localstorage();
 		$.each(this.si_docs, function (index, data) {
 			for (var key in data) {
-				if (key == me.name) {
+				if (key == me.frm.doc.offline_pos_name) {
 					me.si_docs[index][key] = me.frm.doc;
 					me.update_localstorage();
 				}
 			}
-		})
+		});
 	},

 	update_localstorage: function () {
@@ -1710,6 +1680,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 		freeze_screen = this.freeze_screen || false;

 		if ((this.si_docs.length || this.email_queue_list || this.customers_list) && !this.freeze) {
+			this.freeze = true;
+
 			frappe.call({
 				method: "erpnext.accounts.doctype.sales_invoice.pos.make_invoice",
 				freeze: freeze_screen,
@@ -1720,17 +1692,19 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
 				},
 				callback: function (r) {
 					if (r.message) {
+						me.freeze = false;
 						me.customers = r.message.synced_customers_list;
 						me.address = r.message.synced_address;
 						me.contacts = r.message.synced_contacts;
 						me.removed_items = r.message.invoice;
-						me.removed_email = r.message.email_queue
-						me.removed_customers = r.message.customers
+						me.removed_email = r.message.email_queue;
+						me.removed_customers = r.message.customers;
 						me.remove_doc_from_localstorage();
 						me.remove_email_queue_from_localstorage();
 						me.remove_customer_from_localstorage();
-						me.prepare_customer_mapper()
-						me.autocomplete_customers()
+						me.prepare_customer_mapper();
+						me.autocomplete_customers();
+						me.render_list_customers();
 					}
 				}
 			})
--- a/erpnext/accounts/page/pos/test_pos.js
+++ b/erpnext/accounts/page/pos/test_pos.js
@@ -6,6 +6,7 @@ QUnit.test("test:Sales Invoice", function(assert) {
 		() => {
 			return frappe.tests.make("POS Profile", [
 				{naming_series: "SINV"},
+				{pos_profile_name: "_Test POS Profile"},
 				{country: "India"},
 				{currency: "INR"},
 				{write_off_account: "Write Off - FT"},
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -44,7 +44,7 @@ class ReceivablePayableReport(object):
 			})

 		columns += [_("Age (Days)") + ":Int:80"]
-		
+
 		self.ageing_col_idx_start = len(columns)

 		if not "range1" in self.filters:
@@ -53,7 +53,7 @@ class ReceivablePayableReport(object):
 			self.filters["range2"] = "60"
 		if not "range3" in self.filters:
 			self.filters["range3"] = "90"
-			
+
 		for label in ("0-{range1}".format(range1=self.filters["range1"]),
 			"{range1}-{range2}".format(range1=cint(self.filters["range1"])+ 1, range2=self.filters["range2"]),
 			"{range2}-{range3}".format(range2=cint(self.filters["range2"])+ 1, range3=self.filters["range3"]),
@@ -74,14 +74,14 @@ class ReceivablePayableReport(object):
 		})
 		if args.get("party_type") == "Customer":
 			columns += [
-				_("Territory") + ":Link/Territory:80", 
+				_("Territory") + ":Link/Territory:80",
 				_("Customer Group") + ":Link/Customer Group:120"
 			]
 		if args.get("party_type") == "Supplier":
 			columns += [_("Supplier Type") + ":Link/Supplier Type:80"]
-			
+
 		columns.append(_("Remarks") + "::200")
-		
+
 		return columns

 	def get_data(self, party_naming_by, args):
@@ -97,13 +97,13 @@ class ReceivablePayableReport(object):
 			self.filters["company"] = frappe.db.get_single_value('Global Defaults', 'default_company')

 		company_currency = frappe.db.get_value("Company", self.filters.get("company"), "default_currency")
-		
+
 		return_entries = self.get_return_entries(args.get("party_type"))

 		data = []
 		for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")):
 			if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
-				outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle, 
+				outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle,
 					self.filters.report_date, dr_or_cr, return_entries, currency_precision)
 				if abs(outstanding_amount) > 0.1/10**currency_precision:
 					row = [gle.posting_date, gle.party]
@@ -179,15 +179,15 @@ class ReceivablePayableReport(object):
 			# entries adjusted with future vouchers
 			((gle.against_voucher_type, gle.against_voucher) in future_vouchers)
 		)
-		
+
 	def get_return_entries(self, party_type):
 		doctype = "Sales Invoice" if party_type=="Customer" else "Purchase Invoice"
-		return [d.name for d in frappe.get_all(doctype, filters={"is_return": 1, "docstatus": 1})]	
+		return [d.name for d in frappe.get_all(doctype, filters={"is_return": 1, "docstatus": 1})]

 	def get_outstanding_amount(self, gle, report_date, dr_or_cr, return_entries, currency_precision):
 		payment_amount, credit_note_amount = 0.0, 0.0
 		reverse_dr_or_cr = "credit" if dr_or_cr=="debit" else "debit"
-		
+
 		for e in self.get_gl_entries_for(gle.party, gle.party_type, gle.voucher_type, gle.voucher_no):
 			if getdate(e.posting_date) <= report_date and e.name!=gle.name:
 				amount = flt(e.get(reverse_dr_or_cr)) - flt(e.get(dr_or_cr))
@@ -195,11 +195,11 @@ class ReceivablePayableReport(object):
 					payment_amount += amount
 				else:
 					credit_note_amount += amount
-					
+
 		outstanding_amount = flt((flt(gle.get(dr_or_cr)) - flt(gle.get(reverse_dr_or_cr)) \
 			- payment_amount - credit_note_amount), currency_precision)
 		credit_note_amount = flt(credit_note_amount, currency_precision)
-		
+
 		return outstanding_amount, credit_note_amount

 	def get_party_name(self, party_type, party_name):
@@ -207,7 +207,7 @@ class ReceivablePayableReport(object):

 	def get_territory(self, party_name):
 		return self.get_party_map("Customer").get(party_name, {}).get("territory") or ""
-		
+
 	def get_customer_group(self, party_name):
 		return self.get_party_map("Customer").get(party_name, {}).get("customer_group") or ""

@@ -220,7 +220,7 @@ class ReceivablePayableReport(object):
 				select_fields = "name, customer_name, territory, customer_group"
 			elif party_type == "Supplier":
 				select_fields = "name, supplier_name, supplier_type"
-			
+
 			self.party_map = dict(((r.name, r) for r in frappe.db.sql("select {0} from `tab{1}`"
 				.format(select_fields, party_type), as_dict=True)))

@@ -250,8 +250,8 @@ class ReceivablePayableReport(object):
 			else:
 				select_fields = "sum(debit) as debit, sum(credit) as credit"

-			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, 
-				voucher_type, voucher_no, against_voucher_type, against_voucher, 
+			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
+				voucher_type, voucher_no, against_voucher_type, against_voucher,
 				account_currency, remarks, {0}
 				from `tabGL Entry`
 				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
@@ -277,13 +277,13 @@ class ReceivablePayableReport(object):

 		if party_type_field=="customer":
 			if self.filters.get("customer_group"):
-				lft, rgt = frappe.db.get_value("Customer Group", 
+				lft, rgt = frappe.db.get_value("Customer Group",
 					self.filters.get("customer_group"), ["lft", "rgt"])
-			
-				conditions.append("""party in (select name from tabCustomer 
-					where exists(select name from `tabCustomer Group` where lft >= {0} and rgt <= {1} 
+
+				conditions.append("""party in (select name from tabCustomer
+					where exists(select name from `tabCustomer Group` where lft >= {0} and rgt <= {1}
 						and name=tabCustomer.customer_group))""".format(lft, rgt))
-						
+
 			if self.filters.get("credit_days_based_on"):
 				conditions.append("party in (select name from tabCustomer where credit_days_based_on=%s)")
 				values.append(self.filters.get("credit_days_based_on"))
@@ -303,22 +303,22 @@ class ReceivablePayableReport(object):
 		return self.gl_entries_map.get(party, {})\
 			.get(against_voucher_type, {})\
 			.get(against_voucher, [])
-			
+
 	def get_chart_data(self, columns, data):
 		ageing_columns = columns[self.ageing_col_idx_start : self.ageing_col_idx_start+4]
-		
+
 		rows = []
 		for d in data:
 			rows.append(d[self.ageing_col_idx_start : self.ageing_col_idx_start+4])

 		if rows:
 			rows.insert(0, [[d.get("label")] for d in ageing_columns])
-		
+
 		return {
 			"data": {
-				'rows': rows
+				'labels': rows
 			},
-			"chart_type": 'pie'
+			"type": 'percentage'
 		}

 def execute(filters=None):
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -8,18 +8,18 @@ from frappe.utils import flt, cint
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)

 def execute(filters=None):
-	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year,
 		filters.periodicity, company=filters.company)

-	asset = get_data(filters.company, "Asset", "Debit", period_list, 
+	asset = get_data(filters.company, "Asset", "Debit", period_list,
 		only_current_fiscal_year=False, filters=filters,
 		accumulated_values=filters.accumulated_values)
-		
-	liability = get_data(filters.company, "Liability", "Credit", period_list, 
+
+	liability = get_data(filters.company, "Liability", "Credit", period_list,
 		only_current_fiscal_year=False, filters=filters,
 		accumulated_values=filters.accumulated_values)
-		
-	equity = get_data(filters.company, "Equity", "Credit", period_list, 
+
+	equity = get_data(filters.company, "Equity", "Credit", period_list,
 		only_current_fiscal_year=False, filters=filters,
 		accumulated_values=filters.accumulated_values)

@@ -43,17 +43,17 @@ def execute(filters=None):
 			unclosed[period.key] = opening_balance
 			if provisional_profit_loss:
 				provisional_profit_loss[period.key] = provisional_profit_loss[period.key] - opening_balance
-				
+
 		unclosed["total"]=opening_balance
 		data.append(unclosed)
-		
+
 	if provisional_profit_loss:
 		data.append(provisional_profit_loss)
 	if total_credit:
-		data.append(total_credit)		
+		data.append(total_credit)

 	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, company=filters.company)
-	
+
 	chart = get_chart_data(filters, columns, asset, liability, equity)

 	return columns, data, message, chart
@@ -87,7 +87,7 @@ def get_provisional_profit_loss(asset, liability, equity, period_list, company):

 			total += flt(provisional_profit_loss[period.key])
 			provisional_profit_loss["total"] = total
-			
+
 			total_row_total += flt(total_row[period.key])
 			total_row["total"] = total_row_total

@@ -98,7 +98,7 @@ def get_provisional_profit_loss(asset, liability, equity, period_list, company):
 				"warn_if_negative": True,
 				"currency": currency
 			})
-			
+
 	return provisional_profit_loss, total_row

 def check_opening_balance(asset, liability, equity):
@@ -111,17 +111,17 @@ def check_opening_balance(asset, liability, equity):
 		opening_balance -= flt(liability[0].get("opening_balance", 0), float_precision)
 	if equity:
 		opening_balance -= flt(equity[0].get("opening_balance", 0), float_precision)
-		
+
 	opening_balance = flt(opening_balance, float_precision)
 	if opening_balance:
 		return _("Previous Financial Year is not closed"),opening_balance
 	return None,None
-		
+
 def get_chart_data(filters, columns, asset, liability, equity):
-	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
-	
+	labels = [d.get("label") for d in columns[2:]]
+
 	asset_data, liability_data, equity_data = [], [], []
-	
+
 	for p in columns[2:]:
 		if asset:
 			asset_data.append(asset[-2].get(p.get("fieldname")))
@@ -129,23 +129,25 @@ def get_chart_data(filters, columns, asset, liability, equity):
 			liability_data.append(liability[-2].get(p.get("fieldname")))
 		if equity:
 			equity_data.append(equity[-2].get(p.get("fieldname")))
-		
-	columns = [x_intervals]
+
+	datasets = []
 	if asset_data:
-		columns.append(["Assets"] + asset_data)
+		datasets.append({'title':'Assets', 'values': asset_data})
 	if liability_data:
-		columns.append(["Liabilities"] + liability_data)
+		datasets.append({'title':'Liabilities', 'values': liability_data})
 	if equity_data:
-		columns.append(["Equity"] + equity_data)
+		datasets.append({'title':'Equity', 'values': equity_data})

 	chart = {
 		"data": {
-			'x': 'x',
-			'columns': columns
+			'labels': labels,
+			'datasets': datasets
 		}
 	}

 	if not filters.accumulated_values:
-		chart["chart_type"] = "bar"
+		chart["type"] = "bar"
+	else:
+		chart["type"] = "line"

 	return chart
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -8,15 +8,15 @@ from frappe.utils import flt
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)

 def execute(filters=None):
-	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year,
 		filters.periodicity, filters.accumulated_values, filters.company)

 	income = get_data(filters.company, "Income", "Credit", period_list, filters = filters,
-		accumulated_values=filters.accumulated_values, 
+		accumulated_values=filters.accumulated_values,
 		ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
-		
+
 	expense = get_data(filters.company, "Expense", "Debit", period_list, filters=filters,
-		accumulated_values=filters.accumulated_values, 
+		accumulated_values=filters.accumulated_values,
 		ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)

 	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
@@ -61,7 +61,7 @@ def get_net_profit_loss(income, expense, period_list, company):


 def get_chart_data(filters, columns, income, expense, net_profit_loss):
-	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
+	labels = [d.get("label") for d in columns[2:]]

 	income_data, expense_data, net_profit = [], [], []

@@ -73,27 +73,24 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
 		if net_profit_loss:
 			net_profit.append(net_profit_loss.get(p.get("fieldname")))

-	columns = [x_intervals]
+	datasets = []
 	if income_data:
-		columns.append(["Income"] + income_data)
+		datasets.append({'title': 'Income', 'values': income_data})
 	if expense_data:
-		columns.append(["Expense"] + expense_data)
+		datasets.append({'title': 'Expense', 'values': expense_data})
 	if net_profit:
-		columns.append(["Net Profit/Loss"] + net_profit)
+		datasets.append({'title': 'Net Profit/Loss', 'values': net_profit})

 	chart = {
 		"data": {
-			'x': 'x',
-			'columns': columns,
-			'colors': {
-				'Income': '#5E64FF',
-				'Expense': '#b8c2cc',
-				'Net Profit/Loss': '#ff5858'
-			}
+			'labels': labels,
+			'datasets': datasets
 		}
 	}

 	if not filters.accumulated_values:
-		chart["chart_type"] = "bar"
+		chart["type"] = "bar"
+	else:
+		chart["type"] = "line"

 	return chart
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -1,4 +1,3 @@
-
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt

@@ -16,6 +15,8 @@ frappe.ui.form.on("Purchase Order", {
 	},

 	onload: function(frm) {
+		set_schedule_date(frm);
+
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(frm.doc);
 		});
@@ -34,6 +35,17 @@ frappe.ui.form.on("Purchase Order Item", {
 				frm.trigger('calculate_taxes_and_totals');
 			}
 		})
+	},
+
+	schedule_date: function(frm, cdt, cdn) {
+		var row = locals[cdt][cdn];
+		if (row.schedule_date) {
+			if(!frm.doc.schedule_date) {
+				erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "schedule_date");
+			} else {
+				set_schedule_date(frm);
+			}
+		}
 	}
 });

@@ -120,12 +132,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 	},

 	validate: function() {
-		// set default schedule date as today if missing.
-		(this.frm.doc.items || []).forEach(function(d) {
-			if(!d.schedule_date) {
-				d.schedule_date = frappe.datetime.nowdate();
-			}
-		})
+		set_schedule_date(this.frm);
 	},

 	make_stock_entry: function() {
@@ -214,7 +221,12 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(

 	items_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
-		this.frm.script_manager.copy_from_first_row("items", row, ["schedule_date"]);
+		if(doc.schedule_date) {
+			row.schedule_date = doc.schedule_date;
+			refresh_field("schedule_date", cdn, "items");
+		} else {
+			this.frm.script_manager.copy_from_first_row("items", row, ["schedule_date"]);
+		}
 	},

 	unclose_purchase_order: function(){
@@ -227,8 +239,26 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(

 	delivered_by_supplier: function(){
 		cur_frm.cscript.update_status('Deliver', 'Delivered')
-	}
+	},

+	get_last_purchase_rate: function() {
+		frappe.call({
+			"method": "get_last_purchase_rate",
+			"doc": cur_frm.doc,
+			callback: function(r, rt) {
+				cur_frm.dirty();
+				cur_frm.cscript.calculate_taxes_and_totals();
+			}
+		})
+	},
+
+	items_on_form_rendered: function() {
+		set_schedule_date(this.frm);
+	},
+
+	schedule_date: function() {
+		set_schedule_date(this.frm);
+	}
 });

 // for backward compatibility: combine new and previous states
@@ -270,8 +300,10 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	}
 }

-cur_frm.cscript.schedule_date = function(doc, cdt, cdn) {
-	erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "schedule_date");
+function set_schedule_date(frm) {
+	if(frm.doc.schedule_date){
+		erpnext.utils.copy_value_in_all_row(frm.doc, frm.doc.doctype, frm.doc.name, "items", "schedule_date");
+	}
 }

 frappe.provide("erpnext.buying");
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -291,9 +291,40 @@
   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
-  }, 
+  },
  {
-   "allow_bulk_edit": 0, 
+   "allow_bulk_edit": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "fieldname": "schedule_date",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reqd By Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -41,6 +41,7 @@ class PurchaseOrder(BuyingController):
 		self.set_status()

 		self.validate_supplier()
+		self.validate_schedule_date()
 		validate_for_items(self)
 		self.check_for_closed_status()

--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -118,6 +118,7 @@ class TestPurchaseOrder(unittest.TestCase):
 			"company": "_Test Company",
 			"supplier" : "_Test Supplier",
 			"is_subcontracted" : "No",
+			"schedule_date": add_days(nowdate(), 1),
 			"currency" : frappe.db.get_value("Company", "_Test Company", "default_currency"),
 			"conversion_factor" : 1,
 			"items" : get_same_items(),
@@ -149,6 +150,7 @@ def create_purchase_order(**args):
 	if args.transaction_date:
 		po.transaction_date = args.transaction_date

+	po.schedule_date = add_days(nowdate(), 1)
 	po.company = args.company or "_Test Company"
 	po.supplier = args.customer or "_Test Supplier"
 	po.is_subcontracted = args.is_subcontracted or "No"
--- a/erpnext/buying/doctype/purchase_order/test_records.json
+++ b/erpnext/buying/doctype/purchase_order/test_records.json
@@ -30,7 +30,8 @@
  ], 
  "supplier": "_Test Supplier", 
  "supplier_name": "_Test Supplier", 
-  "transaction_date": "2013-02-12"
+  "transaction_date": "2013-02-12",
+  "schedule_date": "2013-02-13"
 },
 {
  "advance_paid": 0.0,  
@@ -63,6 +64,7 @@
  ], 
  "supplier": "_Test Supplier", 
  "supplier_name": "_Test Supplier", 
-  "transaction_date": "2013-02-12"
+  "transaction_date": "2013-02-12",
+  "schedule_date": "2013-02-13"
 }
 ]
--- a/erpnext/buying/doctype/purchase_order/tests/test_purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order.js
@@ -1,7 +1,7 @@
 QUnit.module('Buying');

 QUnit.test("test: purchase order", function(assert) {
-	assert.expect(11);
+	assert.expect(16);
 	let done = assert.async();

 	frappe.run_serially([
@@ -13,12 +13,21 @@ QUnit.test("test: purchase order", function(assert) {
 				{items: [
 					[
 						{"item_code": 'Test Product 4'},
-						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 2)},
 						{"expected_delivery_date": frappe.datetime.add_days(frappe.datetime.now_date(), 5)},
 						{"qty": 5},
 						{"uom": 'Unit'},
 						{"rate": 100},
 						{"warehouse": 'Stores - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
+					],
+					[
+						{"item_code": 'Test Product 1'},
+						{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
+						{"expected_delivery_date": frappe.datetime.add_days(frappe.datetime.now_date(), 5)},
+						{"qty": 2},
+						{"uom": 'Unit'},
+						{"rate": 100},
+						{"warehouse": 'Stores - '+frappe.get_abbr(frappe.defaults.get_default("Company"))}
 					]
 				]},

@@ -30,14 +39,20 @@ QUnit.test("test: purchase order", function(assert) {
 		() => {
 			// Get supplier details
 			assert.ok(cur_frm.doc.supplier_name == 'Test Supplier', "Supplier name correct");
-			assert.ok($('div.control-value.like-disabled-input.for-description').text().includes('Contact 3'), "Contact display correct");
+			assert.ok(cur_frm.doc.schedule_date == frappe.datetime.add_days(frappe.datetime.now_date(), 1), "Schedule Date correct");
 			assert.ok(cur_frm.doc.contact_email == 'test@supplier.com', "Contact email correct");
 			// Get item details
 			assert.ok(cur_frm.doc.items[0].item_name == 'Test Product 4', "Item name correct");
 			assert.ok(cur_frm.doc.items[0].description == 'Test Product 4', "Description correct");
 			assert.ok(cur_frm.doc.items[0].qty == 5, "Quantity correct");
+			assert.ok(cur_frm.doc.items[0].schedule_date == frappe.datetime.add_days(frappe.datetime.now_date(), 2), "Schedule Date correct");
+
+			assert.ok(cur_frm.doc.items[1].item_name == 'Test Product 1', "Item name correct");
+			assert.ok(cur_frm.doc.items[1].description == 'Test Product 1', "Description correct");
+			assert.ok(cur_frm.doc.items[1].qty == 2, "Quantity correct");
+			assert.ok(cur_frm.doc.items[1].schedule_date == cur_frm.doc.schedule_date, "Schedule Date correct");
 			// Calculate total
-			assert.ok(cur_frm.doc.total == 500, "Total correct");
+			assert.ok(cur_frm.doc.total == 700, "Total correct");
 			// Get terms
 			assert.ok(cur_frm.doc.terms == 'This is a term.', "Terms correct");
 		},
@@ -54,7 +69,7 @@ QUnit.test("test: purchase order", function(assert) {

 		() => frappe.tests.click_button('Submit'),
 		() => frappe.tests.click_button('Yes'),
-		() => frappe.timeout(0.3),
+		() => frappe.timeout(1),

 		() => {
 			assert.ok(cur_frm.doc.status == 'To Receive and Bill', "Submitted successfully");
--- a/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js
+++ b/erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js
@@ -11,6 +11,7 @@ QUnit.test("test: purchase order with taxes and charges", function(assert) {
 				{is_subcontracted: 'No'},
 				{buying_price_list: 'Test-Buying-USD'},
 				{currency: 'USD'},
+				{"schedule_date": frappe.datetime.add_days(frappe.datetime.now_date(), 1)},
 				{items: [
 					[
 						{"item_code": 'Test Product 4'},
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -140,7 +140,7 @@
   "allow_on_submit": 1, 
   "bold": 1, 
   "collapsible": 0, 
-   "columns": 0, 
+   "columns": 2, 
   "fieldname": "schedule_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
@@ -148,7 +148,7 @@
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Reqd By Date", 
   "length": 0, 
@@ -382,7 +382,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
-   "columns": 2, 
+   "columns": 1, 
   "fieldname": "qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
@@ -749,7 +749,7 @@
   "allow_on_submit": 0, 
   "bold": 1, 
   "collapsible": 0, 
-   "columns": 3, 
+   "columns": 2, 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -1745,7 +1745,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-09-22 16:47:08.783546", 
+ "modified": "2017-10-05 19:47:12.433095", 
 "modified_by": "Administrator", 
 "module": "Buying", 
 "name": "Purchase Order Item", 
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -138,7 +138,7 @@ class RequestforQuotation(BuyingController):
 			'user_fullname': full_name
 		}

-		subject = _("Request for Quotation")
+		subject = _("Request for Quotation: {0}".format(self.name))
 		template = "templates/emails/request_for_quotation.html"
 		sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None
 		message = frappe.get_template(template).render(args)
--- a/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation.js
@@ -27,6 +27,7 @@ QUnit.test("test: request_for_quotation", function(assert) {
 				{tc_name: 'Test Term 1'}
 			]);
 		},
+		() => frappe.timeout(3),
 		() => {
 			assert.ok(cur_frm.doc.transaction_date == date, "Date correct");
 			assert.ok(cur_frm.doc.company == cur_frm.doc.company, "Company correct");
@@ -38,7 +39,7 @@ QUnit.test("test: request_for_quotation", function(assert) {
 			assert.ok(cur_frm.doc.message_for_supplier == 'Please supply the specified items at the best possible rates', "Reply correct");
 			assert.ok(cur_frm.doc.tc_name == 'Test Term 1', "Term name correct");
 		},
-		() => frappe.timeout(0.3),
+		() => frappe.timeout(3),
 		() => cur_frm.print_doc(),
 		() => frappe.timeout(1),
 		() => {
@@ -65,7 +66,7 @@ QUnit.test("test: request_for_quotation", function(assert) {
 			assert.ok(cur_frm.doc.docstatus == 1, "Quotation request submitted");
 		},
 		() => frappe.click_button('Send Supplier Emails'),
-		() => frappe.timeout(4),
+		() => frappe.timeout(6),
 		() => {
 			assert.ok($('div.modal.fade.in > div.modal-dialog > div > div.modal-body.ui-front > div.msgprint').text().includes("Email sent to supplier Test Supplier"), "Send emails working");
 		},
--- a/erpnext/buying/doctype/supplier/test_supplier.js
+++ b/erpnext/buying/doctype/supplier/test_supplier.js
@@ -56,7 +56,8 @@ QUnit.test("test: supplier", function(assert) {
 		() => frappe.click_button('New Contact'),
 		() => {
 			return frappe.tests.set_form_values(cur_frm, [
-				{first_name: "Contact 3"}
+				{first_name: "Contact 3"},
+				{email_id: "test@supplier.com"}
 			]);
 		},
 		() => cur_frm.save(),
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt
+from frappe.utils import flt, nowdate, add_days
 from frappe.model.mapper import get_mapped_doc

 from erpnext.controllers.buying_controller import BuyingController
@@ -151,5 +151,4 @@ def make_quotation(source_name, target_doc=None):
 		}
 	}, target_doc)

-	return doclist
-
+	return doclist
--- a/erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation.js
@@ -27,12 +27,13 @@ QUnit.test("test: supplier quotation", function(assert) {
 				{terms: 'This is a term'}
 			]);
 		},
+		() => frappe.timeout(3),
 		() => {
 			// Get Supplier details
 			assert.ok(cur_frm.doc.supplier == 'Test Supplier', "Supplier correct");
 			assert.ok(cur_frm.doc.company == cur_frm.doc.company, "Company correct");
 			// Get Contact details
-			assert.ok(cur_frm.doc.contact_display == 'Contact 3', "Conatct correct");
+			assert.ok(cur_frm.doc.contact_person == 'Contact 3-Test Supplier', "Conatct correct");
 			assert.ok(cur_frm.doc.contact_email == 'test@supplier.com', "Email correct");
 			// Get uom
 			assert.ok(cur_frm.doc.items[0].uom == 'Unit', "Multi uom correct");
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -1,3 +1,5 @@
+# coding=utf-8
+
 from __future__ import unicode_literals
 from frappe import _

@@ -127,7 +129,6 @@ def get_data():
 		{
 			"module_name": "POS",
 			"color": "#589494",
-			"icon": "fa fa-th",
 			"icon": "octicon octicon-credit-card",
 			"type": "page",
 			"link": "pos",
@@ -267,7 +268,15 @@ def get_data():
 			"color": "#FF888B",
 			"icon": "octicon octicon-plus",
 			"type": "module",
-			"label": _("Healthcare")
+			"label": _("Healthcare"),
+		},
+		{
+			"module_name": "Hub",
+			"color": "#009248",
+			"icon": "/assets/erpnext/images/hub_logo.svg",
+			"type": "page",
+			"link": "hub",
+			"label": _("Hub")
 		},
 		{
 			"module_name": "Data Import Tool",
@@ -277,4 +286,12 @@ def get_data():
 			"link": "data-import-tool",
 			"label": _("Data Import Tool")
 		},
+		{
+			"module_name": "Restaurant",
+			"color": "#EA81E8",
+			"icon": "🍔",
+			"_doctype": "Restaurant",
+			"link": "List/Restaurant",
+			"label": _("Restaurant")
+		}
 	]
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -176,6 +176,10 @@ def get_data():
 		{
 			"label": _("Training"),
 			"items": [
+				{
+					"type": "doctype",
+					"name": "Training Program"
+				},
 				{
 					"type": "doctype",
 					"name": "Training Event"
--- a/erpnext/config/hub_node.py
+++ b/erpnext/config/hub_node.py
@@ -0,0 +1,24 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return [
+		{
+			"label": _("Setup"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Hub Settings"
+				},
+			]
+		},
+		{
+			"label": _("Hub"),
+			"items": [
+				{
+					"type": "page",
+					"name": "hub"
+				},
+			]
+		},
+	]
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -83,6 +83,9 @@ class AccountsController(TransactionBase):
 					self.set(fieldname, today())
 					break

+		# set taxes table if missing from `taxes_and_charges`
+		self.set_taxes()
+
 	def calculate_taxes_and_totals(self):
 		from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
 		calculate_taxes_and_totals(self)
@@ -259,9 +262,9 @@ class AccountsController(TransactionBase):
 		if not account_currency:
 			account_currency = get_account_currency(gl_dict.account)

-		if gl_dict.account and self.doctype not in ["Journal Entry", 
+		if gl_dict.account and self.doctype not in ["Journal Entry",
 			"Period Closing Voucher", "Payment Entry"]:
-			
+
 			self.validate_account_currency(gl_dict.account, account_currency)
 			set_balance_in_account_currency(gl_dict, account_currency, self.get("conversion_rate"), self.company_currency)

--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, msgprint
-from frappe.utils import flt,cint, cstr
+from frappe.utils import flt,cint, cstr, getdate

 from erpnext.accounts.party import get_party_details
 from erpnext.stock.get_item_details import get_conversion_factor
@@ -408,3 +408,16 @@ class BuyingController(StockController):
 					"actual_qty": -1*flt(d.consumed_qty),
 				}))

+	def validate_schedule_date(self):
+		if not self.schedule_date:
+			self.schedule_date = min([d.schedule_date for d in self.get("items")])
+
+		if self.schedule_date:
+			for d in self.get('items'):
+				if not d.schedule_date:
+					d.schedule_date = self.schedule_date
+
+				if d.schedule_date and getdate(d.schedule_date) < getdate(self.transaction_date):
+					frappe.throw(_("Expected Date cannot be before Transaction Date"))
+		else:
+			frappe.throw(_("Please enter Schedule Date"))
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -165,6 +165,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 			and (tabItem.`{key}` LIKE %(txt)s
 				or tabItem.item_group LIKE %(txt)s
 				or tabItem.item_name LIKE %(txt)s
+				or tabItem.barcode LIKE %(txt)s
 				or tabItem.description LIKE %(txt)s)
 			{fcond} {mcond}
 		order by
@@ -172,7 +173,8 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 			if(locate(%(_txt)s, item_name), locate(%(_txt)s, item_name), 99999),
 			idx desc,
 			name, item_name
-		limit %(start)s, %(page_len)s """.format(key=searchfield,
+		limit %(start)s, %(page_len)s """.format(
+			key=searchfield,
 			fcond=get_filters_cond(doctype, filters, conditions).replace('%', '%%'),
 			mcond=get_match_cond(doctype).replace('%', '%%')),
 			{
--- a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
@@ -21,23 +21,13 @@ frappe.query_reports["Minutes to First Response for Opportunity"] = {
 	get_chart_data: function (columns, result) {
 		return {
 			data: {
-				x: 'Date',
-				columns: [
-					['Date'].concat($.map(result, function (d) { return d[0]; })),
-					['Mins to first response'].concat($.map(result, function (d) { return d[1]; }))
-				]
-				// rows: [['Date', 'Mins to first response']].concat(result)
+				labels: result.map(d => d[0]),
+				datasets: [{
+					title: 'Mins to first response',
+					values: result.map(d => d[1])
+				}]
 			},
-			axis: {
-				x: {
-					type: 'timeseries',
-					tick: {
-						format: frappe.ui.py_date_format
-					}
-				}
-			},
-			chart_type: 'line',
-
+			type: 'line',
 		}
 	}
 }
--- a/erpnext/demo/user/purchase.py
+++ b/erpnext/demo/user/purchase.py
@@ -103,6 +103,7 @@ def make_material_request(item_code, qty):
 		mr.material_request_type = "Purchase"

 	mr.transaction_date = frappe.flags.current_date
+	mr.schedule_date = frappe.utils.add_days(mr.transaction_date, 7)

 	mr.append("items", {
 		"doctype": "Material Request Item",
@@ -128,6 +129,7 @@ def make_subcontract():
 		po = frappe.new_doc("Purchase Order")
 		po.is_subcontracted = "Yes"
 		po.supplier = get_random("Supplier")
+		po.schedule_date = frappe.utils.add_days(frappe.flags.current_date, 7)

 		item_code = get_random("Item", {"is_sub_contracted_item": 1})

--- a/erpnext/docs/assets/img/human-resources/training_event.png
+++ b/erpnext/docs/assets/img/human-resources/training_event.png
--- a/erpnext/docs/assets/img/human-resources/training_program.png
+++ b/erpnext/docs/assets/img/human-resources/training_program.png
--- a/erpnext/docs/assets/img/restaurant/order-entry-bill.png
+++ b/erpnext/docs/assets/img/restaurant/order-entry-bill.png
--- a/erpnext/docs/assets/img/restaurant/order-entry.png
+++ b/erpnext/docs/assets/img/restaurant/order-entry.png
--- a/erpnext/docs/assets/img/restaurant/reservation-kanban.png
+++ b/erpnext/docs/assets/img/restaurant/reservation-kanban.png
--- a/erpnext/docs/assets/img/restaurant/restaurant-invoice.png
+++ b/erpnext/docs/assets/img/restaurant/restaurant-invoice.png
--- a/erpnext/docs/assets/img/restaurant/restaurant-menu.png
+++ b/erpnext/docs/assets/img/restaurant/restaurant-menu.png
--- a/erpnext/docs/assets/img/restaurant/restaurant-reservation.png
+++ b/erpnext/docs/assets/img/restaurant/restaurant-reservation.png
--- a/erpnext/docs/assets/img/restaurant/restaurant-table.png
+++ b/erpnext/docs/assets/img/restaurant/restaurant-table.png
--- a/erpnext/docs/assets/img/restaurant/restaurant.png
+++ b/erpnext/docs/assets/img/restaurant/restaurant.png
--- a/erpnext/docs/assets/img/schools/admission/student-admission.gif
+++ b/erpnext/docs/assets/img/schools/admission/student-admission.gif
--- a/erpnext/docs/user/manual/en/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -16,7 +16,9 @@ To set credit limit go to Customer - Master

 <img class="screenshot" alt="Credit Limit" src="/docs/assets/img/accounts/credit-limit-1.png">

-Go to the 'More Info section' and enter the amount in the field Credit Limit.
+Go to the 'CREDIT LIMIT' section and enter the amount in the field Credit Limit.
+
+If you leave CREDIT LIMIT as 0.00, it has no effect.

 In case a need arises to allow more credit to the customer as a good-will, the
 Credit Controller has access to submit order even if credit limit is crossed.
@@ -26,6 +28,25 @@ has expired, go to accounting settings and make changes.

 In the field Credit Controller, select the role who would be authorized to
 accept orders or raise credit limits of customers.
+
+To set credit limit at Customer Group Level go to Selling -> Customers -> Customer Group
+
+Go to the 'CREDIT LIMIT' field and enter the amount.
+If you leave CREDIT LIMIT as 0.00, it has no effect.
+
+
+To set credit limit at Company level go to Account -> Company
+
+Go to the 'ACCOUNT SETTINGS' section and enter the amount in the CREDIT LIMIT field.
+If you leave CREDIT LIMIT as 0.00, it has no effect.
+
+For 'CREDIT LIMIT' check functionality, Priority (High to Low) is as below
+1) Customer
+2) Customer Group
+3) Company
+
+
+
  
 #### Figure 2: Credit Controller

--- a/erpnext/docs/user/manual/en/hospitality/index.md
+++ b/erpnext/docs/user/manual/en/hospitality/index.md
@@ -0,0 +1,9 @@
+# Hospitality
+
+ERPNext Hospitality module is designed to handle workflows for Hotels and Restaurants. This is still in early development stage.
+
+### Manage Restaurants
+
+The Restaurant module in ERPNext will help you manage a chain of restaurants. You can create Restaurants, Menus, Tables, Reservations and a manage Order Entry and Billing.
+
+{index}
--- a/erpnext/docs/user/manual/en/hospitality/index.txt
+++ b/erpnext/docs/user/manual/en/hospitality/index.txt
@@ -0,0 +1,4 @@
+restaurant
+restaurant-menu
+reservations
+order-entry
--- a/erpnext/docs/user/manual/en/hospitality/order-entry.md
+++ b/erpnext/docs/user/manual/en/hospitality/order-entry.md
@@ -0,0 +1,26 @@
+# Restaurant Order Entry
+
+The Restaurant Order Entry is the screen where the waiters will punch in orders related to a particular table.
+
+This screen makes it easy for the waiters in your restaurant to punch in orders from various tables.
+
+When the guest places an order, the waiter will select the table number and add the items in the Order Entry. This can be changed until it is time for the bill. Unless you bill a table, you can change the items and they will automatically appear when you select the table ID.
+
+To place an order you can select an item and click the enter key so that the item will be updated in the items table.
+
+<img class="screenshot" alt="Order Entry" src="/docs/assets/img/restaurant/order-entry.png">
+
+You can also choose items with the POS style item selector.
+
+### Billing
+
+When it is time for billing, you just choose the bill and you can select the customer and mode of payment. On saving, a Sales Invoice is generated and the order section becomes empty.
+
+<img class="screenshot" alt="Order Entry" src="/docs/assets/img/restaurant/order-entry-bill.png">
+
+### Sales Invoice
+
+To print the invoice, you can click on the Invoice Link and print the invoice
+
+<img class="screenshot" alt="Sales Invoice" src="/docs/assets/img/restaurant/restaurant-invoice.png">
+
--- a/erpnext/docs/user/manual/en/hospitality/reservations.md
+++ b/erpnext/docs/user/manual/en/hospitality/reservations.md
@@ -0,0 +1,13 @@
+# Restaurant Reservations
+
+Once you have setup the restaurant and tables, you can start taking in reservations for your restaurant.
+
+To take a reservation, just make a new Restaurant Reservation from the Restaurant Page and set the time, number of people and name of the guest.
+
+<img class="screenshot" alt="Reservation" src="/docs/assets/img/restaurant/reservation.png">
+
+### Kanban
+
+As your guests walk in, You can also manage the reservations by making a simple Kanban board for the same.
+
+<img class="screenshot" alt="Reservation Kanban Board" src="/docs/assets/img/restaurant/reservation-kanban.png">
--- a/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md
+++ b/erpnext/docs/user/manual/en/hospitality/restaurant-menu.md
@@ -0,0 +1,7 @@
+# Restaurant Menu
+
+For every restaurant you must set an active Restaurant Menu from which orders can be placed. You can also set the rates for each of the item for the day.
+
+When you save the Restaurant Menu, a Price List is created for that Menu and all pricing is linked to that price list. This way you can easily control the items on offer and pricing from the menu.
+
+<img class="screenshot" alt="Restaurant Menu" src="/docs/assets/img/restaurant/restaurant-menu.png">
--- a/erpnext/docs/user/manual/en/hospitality/restaurant.md
+++ b/erpnext/docs/user/manual/en/hospitality/restaurant.md
@@ -0,0 +1,19 @@
+# Restaurant
+
+The Restaurant record represents one restaurant in your organization. To create a new Restaurant, just set the name, Company and Default Customer.
+
+You can set a unique numbering prefix for each of your restaurants. All invoices for that restuarant will follow that numbering prefix.
+
+If you have a default Sales Taxes and Charges Template, you can add it so that the same charge + tax will be applicable for all invoices in the restaurant.
+
+<img class="screenshot" alt="Restaurant" src="/docs/assets/img/restaurant/restaurant.png">
+
+After your restaurant is created, you can add Tables and Menus for that restaurant
+
+### Adding Tables
+
+You can add a Restaurant Table by creating a new Restaurant Table from the dashboard.
+
+<img class="screenshot" alt="Restaurant Table" src="/docs/assets/img/restaurant/restaurant-table.png">
+
+
--- a/erpnext/docs/user/manual/en/human-resources/training.md
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -1,8 +1,13 @@
 # Training
+### Training Program
+
+Create Training Program and schedule Training Events under it. It has a dashboard linked to Training Event to view which event is under the Training Program.
+
+<img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_program.png">

 ### Training Event

-Schedule seminars, workshops, conferences etc using Training Event. You can also invite your employees to attend the event using this feature.
+Schedule seminars, workshops, conferences etc using Training Event linked to a Training Program. You can also invite your employees to attend the event using this feature.

 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event.png">

@@ -14,11 +19,11 @@ By default the status of the employee will be 'Open'.

 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_event_employee.png">

-When you submit the Training Event, a notifcation will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modifiy this Email Alert to customize the message.
+When you submit the Training Event, a notification will be sent to the employee notifying that the Training has been scheduled. This is sent via Email Alert "Training Scheduled". You can modify this Email Alert to customize the message.

 ### Training Result

-After compleation of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.
+After completion of the training Employee-wise training results can be stored based on the Feedback received from the Trainer.

 <img class="screenshot" alt="Employee" src="/docs/assets/img/human-resources/training_result.png">

--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -97,8 +97,8 @@ fiscal year.

 A Cost Center is like an Account, but the only difference is that its
 structure represents your business more closely than Accounts.
-For example, in your Chart of Accounts, you can separate your expenses by its type 
-(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate 
+For example, in your Chart of Accounts, you can separate your expenses by its type
+(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate
 them by product line or business group (e.g., online sales, retail sales, etc.).

 > Accounts > Chart of Cost Centers
@@ -316,7 +316,7 @@ A record of the monthly salary given to an Employee.

 #### Salary Structure

-A template identifying all the components of an Employees' salary (earnings), 
+A template identifying all the components of an Employees' salary (earnings),
 tax and other social security deductions.

 > Human Resource > Salary and Payroll > Salary Structure
--- a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -1,7 +1,3 @@
-# Getting Started With Erpnext
-
-<!-- Getting Started with ERPNext-->
-
 # Getting Started with ERPNext

 There are many ways to get started with ERPNext.
--- a/erpnext/docs/user/manual/en/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -1,9 +1,5 @@
 # The Champion

-<!-- no-heading -->
-
-<h1 class="white">The Champion</h1>
-
 <img alt="Champion" class="screenshot" src="/docs/assets/img/setup/implementation-image.png">

 We have seen dozens of ERP implementations over the past few years and we
--- a/erpnext/docs/user/manual/en/schools/admission/student_admission.md
+++ b/erpnext/docs/user/manual/en/schools/admission/student_admission.md
@@ -1,13 +1,14 @@
 # Student Admission

-The admission process begins with filling the admission form. The Student Admission record enables to intitate your admission process for a given **Academic year**. ERPNext admission module allow you to create an admission record which can be then published on the ERPNext generate website. 
+The admission process begins with filling the admission form. The Student Admission record enables to initiate your admission process for a given **Academic year**. ERPNext admission module allows you to create an admission record which can be then published on the ERPNext generate website.

 To create a Student Admission record  go to :

 **Schools** >> **Admissions** >> **Student Admission** >>


-<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/student/student-admission.gif">
+<img class="screenshot" alt="Student Applicant" src="/docs/assets/img/schools/admission/student-admission.gif">

+Once an admission record is created, the age eligibility criteria can be determined for the every program. Similarly, you can also determine the application fee and naming series for every student applicant. If you keep the naming series blank then the default naming series will be applied for every student applicant.

-Once a admission record is created it can be published on the website and the student can apply from the web portal itself. 
+The information provided in the Student Admission records will be used for the validation and creation of the Student Admission records (only if student admission link is filled there)
--- a/erpnext/docs/user/manual/en/subscription/index.md
+++ b/erpnext/docs/user/manual/en/subscription/index.md
@@ -1,22 +0,0 @@
-If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing.
-
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/subscription/subscription.png">
-
-#### Scenario
-
-Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.
-
-To set the subscription for the sales invoice
-Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
-
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/subscription/subscription.gif">
-
-**From Date and To Date**: This defines contract period with the customer.
-
-**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
-
-**Notify By Email**: If you want to notify the user about auto recurring invoice.
-
-**Print Format**: Select a print format to define document view which should be emailed to customer.
-
-**Disabled**: It will stop to make auto recurring documents against the subscription
--- a/erpnext/docs/user/manual/en/subscription/init.py
+++ b/erpnext/docs/user/manual/en/subscription/init.py
--- a/erpnext/domains/distribution.py
+++ b/erpnext/domains/distribution.py
@@ -0,0 +1,18 @@
+data = {
+	'desktop_icons': [
+		'Item',
+		'Customer',
+		'Supplier',
+		'Lead',
+		'Sales Order',
+		'Purchase Order',
+		'Task',
+		'Sales Invoice',
+		'CRM',
+		'ToDo'
+	],
+	'set_value': [
+		['Stock Settings', None, 'show_barcode_field', 1]
+	],
+	'default_portal_role': 'Customer'
+}
--- a/erpnext/domains/education.py
+++ b/erpnext/domains/education.py
@@ -0,0 +1,37 @@
+data = {
+	'desktop_icons': [
+		'Student',
+		'Program',
+		'Course',
+		'Student Group',
+		'Instructor',
+		'Fees',
+		'Task',
+		'ToDo',
+		'Schools'
+	],
+	'default_portal_role': 'Student',
+	'restricted_roles': [
+		'Student',
+		'Instructor',
+		'Academics User'
+	],
+	'modules': [
+		'Schools'
+	],
+	'fixtures': [
+		dict(doctype='Academic Year', academic_year_name='2013-14'),
+		dict(doctype='Academic Year', academic_year_name='2014-15'),
+		dict(doctype='Academic Year', academic_year_name='2015-16'),
+		dict(doctype='Academic Year', academic_year_name='2016-17'),
+		dict(doctype='Academic Year', academic_year_name='2017-18'),
+		dict(doctype='Academic Year', academic_year_name='2018-19'),
+		dict(doctype='Academic Year', academic_year_name='2019-20'),
+		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 1'),
+		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 2'),
+		dict(doctype='Academic Term', academic_year='2016-17', term_name='Semester 3'),
+		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 1'),
+		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 2'),
+		dict(doctype='Academic Term', academic_year='2017-18', term_name='Semester 3')
+	]
+}
--- a/erpnext/domains/healthcare.py
+++ b/erpnext/domains/healthcare.py
@@ -0,0 +1,29 @@
+data = {
+	'desktop_icons': [
+		'Patient',
+		'Patient Appointment',
+		'Consultation',
+		'Lab Test',
+		'Healthcare',
+		'Accounts',
+		'Buying',
+		'Stock',
+		'HR',
+		'ToDo'
+	],
+	'default_portal_role': 'Patient',
+	'restricted_roles': [
+		'Healthcare Administrator',
+		'LabTest Approver',
+		'Laboratory User',
+		'Nursing User',
+		'Physician',
+		'Patient'
+	],
+	'custom_fields': {
+		'Sales Invoice': dict(fieldname='appointment', label='Patient Appointment',
+			fieldtype='Link', options='Patient Appointment',
+			insert_after='customer')
+	},
+	'on_setup': 'erpnext.healthcare.setup.setup_healthcare'
+}
--- a/erpnext/domains/hospitality.py
+++ b/erpnext/domains/hospitality.py
@@ -0,0 +1,32 @@
+data = {
+	'desktop_icons': [
+		'Restaurant',
+		'Accounts',
+		'Buying',
+		'Stock',
+		'HR',
+		'Project',
+		'ToDo'
+	],
+	'restricted_roles': [
+		'Restaurant Manager'
+	],
+	'custom_fields': {
+		'Sales Invoice': [
+			{
+				'fieldname': 'restaurant', 'fieldtype': 'Link', 'options': 'Restaurant',
+				'insert_after': 'customer_name', 'label': 'Restaurant',
+			},
+			{
+				'fieldname': 'restaurant_table', 'fieldtype': 'Link', 'options': 'Restaurant Table',
+				'insert_after': 'restaurant', 'label': 'Restaurant Table',
+			}
+		],
+		'Price List': [
+			{
+				'fieldname':'restaurant_menu', 'fieldtype':'Link', 'options':'Restaurant Menu', 'label':'Restaurant Menu',
+				'insert_after':'currency'
+			}
+		]
+	}
+}
--- a/erpnext/domains/manufacturing.py
+++ b/erpnext/domains/manufacturing.py
@@ -0,0 +1,25 @@
+data = {
+	'desktop_icons': [
+		'Item',
+		'BOM',
+		'Customer',
+		'Supplier',
+		'Sales Order',
+		'Purchase Order',
+		'Production Order',
+		'Task',
+		'Accounts',
+		'HR',
+		'ToDo'
+	 ],
+	'properties': [
+		{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'collapsible_depends_on', 'value': 'is_stock_item'},
+	],
+	'set_value': [
+		['Stock Settings', None, 'show_barcode_field', 1]
+	],
+	'restricted_roles': [
+		'Manufacturing User'
+	],
+	'default_portal_role': 'Customer'
+}
--- a/erpnext/domains/retail.py
+++ b/erpnext/domains/retail.py
@@ -0,0 +1,20 @@
+data = {
+	'desktop_icons': [
+		'POS',
+		'Item',
+		'Customer',
+		'Sales Invoice',
+		'Purchase Order',
+		'Accounts',
+		'Task',
+		'ToDo'
+	],
+	'properties': [
+		{'doctype': 'Item', 'fieldname': 'manufacturing', 'property': 'hidden', 'value': 1},
+		{'doctype': 'Customer', 'fieldname': 'credit_limit_section', 'property': 'hidden', 'value': 1},
+	],
+	'set_value': [
+		['Stock Settings', None, 'show_barcode_field', 1]
+	],
+	'default_portal_role': 'Customer'
+}
--- a/erpnext/domains/services.py
+++ b/erpnext/domains/services.py
@@ -0,0 +1,19 @@
+data = {
+	'desktop_icons': [
+		'Project',
+		'Timesheet',
+		'Customer',
+		'Sales Order',
+		'Sales Invoice',
+		'CRM',
+		'Task',
+		'Expense Claim',
+		'Employee',
+		'HR',
+		'ToDo'
+	],
+	'set_value': [
+		['Stock Settings', None, 'show_barcode_field', 0]
+	],
+	'default_portal_role': 'Customer'
+}
--- a/erpnext/healthcare/doctype/appointment_type/appointment_type.json
+++ b/erpnext/healthcare/doctype/appointment_type/appointment_type.json
@@ -22,7 +22,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -62,11 +62,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -83,7 +83,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:46:57.142289", 
+ "modified": "2017-10-05 11:07:26.369657", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Appointment Type", 
--- a/erpnext/healthcare/doctype/codification_table/codification_table.json
+++ b/erpnext/healthcare/doctype/codification_table/codification_table.json
@@ -21,7 +21,7 @@
   "fieldname": "medical_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -53,7 +53,7 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -84,7 +84,7 @@
   "fieldtype": "Read Only", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -116,7 +116,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:06:50.281545", 
+ "modified": "2017-10-04 17:07:22.880451", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Codification Table", 
--- a/erpnext/healthcare/doctype/complaint/complaint.json
+++ b/erpnext/healthcare/doctype/complaint/complaint.json
@@ -23,7 +23,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -54,7 +54,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:44:31.848346", 
+ "modified": "2017-10-05 11:18:42.017864", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Complaint", 
--- a/erpnext/healthcare/doctype/consultation/consultation.json
+++ b/erpnext/healthcare/doctype/consultation/consultation.json
@@ -63,11 +63,11 @@
   "options": "C-", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -83,7 +83,7 @@
   "fieldname": "appointment", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -114,7 +114,7 @@
   "fieldname": "type", 
   "fieldtype": "Link", 
   "hidden": 1, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -122,15 +122,15 @@
   "in_standard_filter": 0, 
   "label": "Type", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Appointment Type", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -145,12 +145,12 @@
   "fieldname": "patient", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Patient", 
   "length": 0, 
   "no_copy": 0, 
@@ -188,11 +188,11 @@
   "options": "", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -219,11 +219,11 @@
   "options": "\nMale\nFemale", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -243,7 +243,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Doctor", 
   "length": 0, 
   "no_copy": 0, 
@@ -329,12 +329,12 @@
   "fieldname": "visit_department", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Department", 
   "length": 0, 
   "no_copy": 0, 
@@ -347,7 +347,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -430,7 +430,7 @@
   "in_standard_filter": 0, 
   "label": "Invoice", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
   "precision": "", 
@@ -493,11 +493,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -542,7 +542,7 @@
   "fieldname": "symptoms_select", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -550,15 +550,15 @@
   "in_standard_filter": 0, 
   "label": "Complaints", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Complaint", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -574,14 +574,14 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
   "label": "", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -612,14 +612,14 @@
   "in_standard_filter": 0, 
   "label": "In print", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -665,7 +665,7 @@
   "fieldname": "diagnosis_select", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -673,15 +673,15 @@
   "in_standard_filter": 0, 
   "label": "Diagnosis", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Diagnosis", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -698,14 +698,14 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
   "label": "", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -737,14 +737,14 @@
   "in_standard_filter": 0, 
   "label": "In print", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -943,14 +943,14 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
   "label": "Review Details", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -1004,7 +1004,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:24:59.935498", 
+ "modified": "2017-10-05 12:13:52.596750", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Consultation", 
--- a/erpnext/healthcare/doctype/diagnosis/diagnosis.json
+++ b/erpnext/healthcare/doctype/diagnosis/diagnosis.json
@@ -23,7 +23,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -54,7 +54,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:40:09.731904", 
+ "modified": "2017-10-05 11:25:46.107435", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Diagnosis", 
--- a/erpnext/healthcare/doctype/dosage_form/dosage_form.json
+++ b/erpnext/healthcare/doctype/dosage_form/dosage_form.json
@@ -23,7 +23,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -54,7 +54,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:40:19.973532", 
+ "modified": "2017-10-05 11:24:57.888091", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Dosage Form", 
--- a/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
+++ b/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
@@ -21,7 +21,7 @@
   "fieldname": "drug_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -83,7 +83,7 @@
   "fieldname": "dosage", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -114,7 +114,7 @@
   "fieldname": "period", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -145,7 +145,7 @@
   "fieldname": "dosage_form", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -206,7 +206,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -341,11 +341,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -362,7 +362,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:59:48.222282", 
+ "modified": "2017-10-04 17:09:54.998517", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Drug Prescription", 
--- a/erpnext/healthcare/doctype/fee_validity/fee_validity.json
+++ b/erpnext/healthcare/doctype/fee_validity/fee_validity.json
@@ -39,7 +39,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -70,7 +70,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -206,7 +206,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:36:52.108407", 
+ "modified": "2017-10-05 11:26:35.292841", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Fee Validity", 
--- a/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
+++ b/erpnext/healthcare/doctype/fee_validity/test_fee_validity.py
@@ -19,13 +19,13 @@ class TestFeeValidity(unittest.TestCase):
 			patient = frappe.new_doc("Patient")
 			patient.patient_name = "Test Patient"
 			patient.sex = "Male"
-			patient.save(ignore_permissions = True)
+			patient.save(ignore_permissions=True)
 			patient = patient.name

 		if not physician:
 			physician = frappe.new_doc("Physician")
-			physician.first_name= "Amit Jain"
-			physician.save(ignore_permissions = True)
+			physician.first_name = "Amit Jain"
+			physician.save(ignore_permissions=True)
 			physician = physician.name

 		frappe.db.set_value("Healthcare Settings", None, "max_visit", 2)
@@ -50,5 +50,5 @@ def create_appointment(patient, physician, appointment_date):
 	appointment.patient = patient
 	appointment.physician = physician
 	appointment.appointment_date = appointment_date
-	appointment.save(ignore_permissions = True)
+	appointment.save(ignore_permissions=True)
 	return appointment
--- a/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.json
+++ b/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.json
@@ -359,7 +359,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -421,7 +421,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -544,7 +544,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -942,7 +942,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1002,7 +1002,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1033,7 +1033,7 @@
 "issingle": 1, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:25:48.193218", 
+ "modified": "2017-10-05 11:36:44.087182", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Healthcare Settings", 
--- a/erpnext/healthcare/doctype/healthcare_settings/test_healthcare_settings.py
+++ b/erpnext/healthcare/doctype/healthcare_settings/test_healthcare_settings.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestHealthcareSettings(unittest.TestCase):
+	pass
--- a/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
+++ b/erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
@@ -20,7 +20,7 @@
   "fieldname": "test_code", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -143,7 +143,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -180,14 +180,14 @@
   "in_standard_filter": 0, 
   "label": "Test Created", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -204,7 +204,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:47:22.789095", 
+ "modified": "2017-10-04 17:42:32.976165", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Lab Prescription", 
--- a/erpnext/healthcare/doctype/lab_test/lab_test.json
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.json
@@ -38,7 +38,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 1, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -61,7 +61,7 @@
   "in_standard_filter": 0, 
   "label": "Invoice", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Sales Invoice", 
   "permlevel": 0, 
   "precision": "", 
@@ -84,12 +84,12 @@
   "fieldname": "patient", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Patient", 
   "length": 0, 
   "no_copy": 0, 
@@ -131,7 +131,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -161,7 +161,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -192,7 +192,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 1, 
   "search_index": 0, 
   "set_only_once": 1, 
@@ -207,7 +207,7 @@
   "fieldname": "physician", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -225,7 +225,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -253,7 +253,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -283,9 +283,9 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -314,7 +314,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -358,7 +358,7 @@
   "fieldname": "department", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -376,7 +376,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -405,9 +405,9 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -435,7 +435,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -465,7 +465,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -480,7 +480,7 @@
   "fieldname": "sample", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -496,7 +496,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -551,7 +551,7 @@
   "in_standard_filter": 0, 
   "label": "Lab Technician", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Employee", 
   "permlevel": 0, 
   "precision": "", 
@@ -559,7 +559,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -582,7 +582,7 @@
   "in_standard_filter": 0, 
   "label": "Technician Name", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "employee.employee_name", 
   "permlevel": 0, 
   "precision": "", 
@@ -590,7 +590,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -613,7 +613,7 @@
   "in_standard_filter": 0, 
   "label": "Designation", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "employee.designation", 
   "permlevel": 0, 
   "precision": "", 
@@ -621,7 +621,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -644,7 +644,7 @@
   "in_standard_filter": 0, 
   "label": "User", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "User", 
   "permlevel": 0, 
   "precision": "", 
@@ -652,7 +652,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -682,7 +682,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -731,7 +731,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Test Name", 
   "length": 0, 
   "no_copy": 1, 
@@ -741,9 +741,9 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -785,7 +785,7 @@
   "fieldname": "template", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -801,7 +801,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 1, 
   "search_index": 0, 
   "set_only_once": 1, 
@@ -832,7 +832,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -950,7 +950,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1009,7 +1009,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1054,7 +1054,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1114,7 +1114,7 @@
   "fieldtype": "Text Editor", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1158,7 +1158,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1189,7 +1189,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1219,7 +1219,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1249,7 +1249,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1279,7 +1279,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1309,7 +1309,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1339,7 +1339,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1362,7 +1362,7 @@
   "in_standard_filter": 0, 
   "label": "Prescription", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Lab Prescription", 
   "permlevel": 0, 
   "precision": "", 
@@ -1370,7 +1370,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -1388,7 +1388,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:52:14.180774", 
+ "modified": "2017-10-05 12:14:57.078823", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Lab Test", 
--- a/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json
+++ b/erpnext/healthcare/doctype/lab_test_groups/lab_test_groups.json
@@ -34,11 +34,11 @@
   "options": "Add Test\nAdd new line", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -54,7 +54,7 @@
   "fieldname": "test_template", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -97,11 +97,11 @@
   "options": "test_template.test_rate", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -117,7 +117,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -149,7 +149,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -179,7 +179,7 @@
   "fieldname": "group_test_uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -212,7 +212,7 @@
   "fieldtype": "Long Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -272,7 +272,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:07:35.188661", 
+ "modified": "2017-10-04 16:55:45.081003", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Lab Test Groups", 
--- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json
+++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.json
@@ -26,7 +26,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Test Name", 
   "length": 0, 
   "no_copy": 1, 
@@ -69,7 +69,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -113,12 +113,12 @@
   "fieldname": "test_group", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Item Group", 
   "length": 0, 
   "no_copy": 0, 
@@ -131,7 +131,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -144,12 +144,12 @@
   "fieldname": "department", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Department", 
   "length": 0, 
   "no_copy": 0, 
@@ -211,7 +211,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Result Format", 
   "length": 0, 
   "no_copy": 0, 
@@ -257,7 +257,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -334,7 +334,7 @@
   "fieldname": "test_uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -366,7 +366,7 @@
   "fieldtype": "Long Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -670,7 +670,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -729,7 +729,7 @@
   "fieldname": "sample", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -823,7 +823,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -861,14 +861,14 @@
   "in_standard_filter": 0, 
   "label": "Change In Item", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -895,11 +895,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -916,7 +916,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:45:27.655822", 
+ "modified": "2017-10-05 12:12:11.918652", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Lab Test Template", 
--- a/erpnext/healthcare/doctype/lab_test_uom/lab_test_uom.json
+++ b/erpnext/healthcare/doctype/lab_test_uom/lab_test_uom.json
@@ -22,7 +22,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -52,7 +52,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -83,7 +83,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:41:40.186676", 
+ "modified": "2017-10-05 11:24:15.687464", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Lab Test UOM", 
--- a/erpnext/healthcare/doctype/medical_code/medical_code.json
+++ b/erpnext/healthcare/doctype/medical_code/medical_code.json
@@ -21,7 +21,7 @@
   "fieldname": "medical_code_standard", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -53,7 +53,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -83,7 +83,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -114,7 +114,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:01:18.817484", 
+ "modified": "2017-10-04 17:08:11.053418", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Medical Code", 
--- a/erpnext/healthcare/doctype/normal_test_items/normal_test_items.json
+++ b/erpnext/healthcare/doctype/normal_test_items/normal_test_items.json
@@ -21,7 +21,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -51,7 +51,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -82,7 +82,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -142,7 +142,7 @@
   "fieldtype": "Long Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -182,11 +182,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -217,7 +217,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -248,7 +248,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -265,7 +265,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:59:33.202695", 
+ "modified": "2017-10-04 17:13:06.376928", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Normal Test Items", 
--- a/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json
+++ b/erpnext/healthcare/doctype/normal_test_template/normal_test_template.json
@@ -21,7 +21,7 @@
   "fieldtype": "Heading", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -51,7 +51,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -80,7 +80,7 @@
   "fieldname": "test_uom", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -112,7 +112,7 @@
   "fieldtype": "Long Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -172,7 +172,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-08-31 14:07:11.277187", 
+ "modified": "2017-10-04 16:58:43.990804", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Normal Test Template", 
--- a/erpnext/healthcare/doctype/patient/patient.json
+++ b/erpnext/healthcare/doctype/patient/patient.json
@@ -67,11 +67,11 @@
   "options": "PID-", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -91,7 +91,7 @@
   "in_filter": 1, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Full Name", 
   "length": 0, 
   "no_copy": 1, 
@@ -217,14 +217,14 @@
   "in_standard_filter": 0, 
   "label": "Age", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -248,7 +248,7 @@
   "in_standard_filter": 0, 
   "label": "Status", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Active\nDormant\nOpen", 
   "permlevel": 0, 
   "precision": "", 
@@ -256,7 +256,7 @@
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -279,14 +279,14 @@
   "in_standard_filter": 0, 
   "label": "Image", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -331,7 +331,7 @@
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -374,11 +374,11 @@
   "options": "Company", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -429,7 +429,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Mobile", 
   "length": 0, 
   "no_copy": 0, 
@@ -459,7 +459,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Email", 
   "length": 0, 
   "no_copy": 0, 
@@ -524,14 +524,14 @@
   "in_standard_filter": 0, 
   "label": "Disabled", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -638,14 +638,14 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
   "in_standard_filter": 0, 
   "label": "Allergies", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -668,7 +668,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -727,7 +727,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -757,7 +757,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -817,11 +817,11 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Occupation", 
   "length": 0, 
   "no_copy": 0, 
@@ -937,7 +937,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -967,7 +967,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -997,7 +997,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1026,7 +1026,7 @@
   "fieldname": "alcohol_current_use", 
   "fieldtype": "Data", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -1086,7 +1086,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1116,7 +1116,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1180,7 +1180,7 @@
   "fieldtype": "Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1240,7 +1240,7 @@
   "fieldtype": "Link", 
   "hidden": 1, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -1251,7 +1251,7 @@
   "options": "Currency", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
@@ -1274,7 +1274,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 50, 
- "modified": "2017-08-31 13:50:25.474398", 
+ "modified": "2017-10-04 17:41:03.219934", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Patient", 
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -30,6 +30,14 @@ frappe.ui.form.on('Patient Appointment', {
 			frm.add_custom_button(__('Cancel'), function() {
 				btn_update_status(frm, "Cancelled");
 			});
+
+			frm.add_custom_button(__("Consultation"),function(){
+				btn_create_consultation(frm);
+			},"Create");
+
+			frm.add_custom_button(__('Vital Signs'), function() {
+				btn_create_vital_signs(frm);
+			},"Create");
 		}
 		if(frm.doc.status == "Pending"){
 			frm.add_custom_button(__('Set Open'), function() {
@@ -40,14 +48,6 @@ frappe.ui.form.on('Patient Appointment', {
 			});
 		}

-		frm.add_custom_button(__("Consultation"),function(){
-			btn_create_consultation(frm);
-		},"Create");
-
-		frm.add_custom_button(__('Vital Signs'), function() {
-			btn_create_vital_signs(frm);
-		},"Create");
-
 		if(!frm.doc.__islocal){
 			if(frm.doc.sales_invoice && frappe.user.has_role("Accounts User")){
 				frm.add_custom_button(__('Invoice'), function() {
@@ -188,7 +188,7 @@ var btn_update_status = function(frm, status){
 			frappe.call({
 				method:
 				"erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_status",
-				args: {appointmentId: doc.name, status:status},
+				args: {appointment_id: doc.name, status:status},
 				callback: function(data){
 					if(!data.exc){
 						frm.reload_doc();
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
@@ -22,12 +22,12 @@
   "fieldname": "patient", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Patient", 
   "length": 0, 
   "no_copy": 0, 
@@ -53,12 +53,12 @@
   "fieldname": "physician", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Physician", 
   "length": 0, 
   "no_copy": 0, 
@@ -89,7 +89,7 @@
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Date", 
   "length": 0, 
   "no_copy": 0, 
@@ -101,7 +101,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 1, 
   "unique": 0
  }, 
@@ -206,7 +206,7 @@
   "fieldname": "appointment_type", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -234,6 +234,7 @@
   "bold": 0, 
   "collapsible": 0, 
   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
   "fieldname": "section_break_1", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
@@ -338,11 +339,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 1, 
   "set_only_once": 0, 
@@ -386,12 +387,12 @@
   "fieldname": "department", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
   "label": "Department", 
   "length": 0, 
   "no_copy": 0, 
@@ -404,7 +405,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 1, 
   "unique": 0
  }, 
@@ -435,7 +436,7 @@
   "remember_last_selected_value": 0, 
   "report_hide": 0, 
   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
   "set_only_once": 0, 
   "unique": 0
  }, 
@@ -546,15 +547,15 @@
   "in_standard_filter": 0, 
   "label": "Gender", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "patient.sex", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -608,15 +609,15 @@
   "in_standard_filter": 0, 
   "label": "Company", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "Company", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -662,7 +663,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 0, 
@@ -691,7 +692,7 @@
   "fieldname": "referring_physician", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -734,11 +735,11 @@
   "no_copy": 0, 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -755,7 +756,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-08-31 13:27:39.208298", 
+ "modified": "2017-10-25 23:33:36.060803", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Patient Appointment", 
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
@@ -6,66 +6,100 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 import json
-from frappe.utils import getdate
+from frappe.utils import getdate, cint
 from frappe import _
 import datetime
 from frappe.core.doctype.sms_settings.sms_settings import send_sms
 from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account,get_income_account

+
 class PatientAppointment(Document):
 	def on_update(self):
 		today = datetime.date.today()
 		appointment_date = getdate(self.appointment_date)
-		#If appointment created for today set as open
-		if(today == appointment_date):
-			frappe.db.set_value("Patient Appointment",self.name,"status","Open")
+
+		# If appointment created for today set as open
+		if today == appointment_date:
+			frappe.db.set_value("Patient Appointment", self.name, "status", "Open")
 			self.reload()

 	def after_insert(self):
-		#Check fee validity exists
+		# Check fee validity exists
 		appointment = self
 		validity_exist = validity_exists(appointment.physician, appointment.patient)
-		if validity_exist :
-			fee_validity = frappe.get_doc("Fee Validity",validity_exist[0][0])
-			#Check if the validity is valid
+		if validity_exist:
+			fee_validity = frappe.get_doc("Fee Validity", validity_exist[0][0])
+
+			# Check if the validity is valid
 			appointment_date = getdate(appointment.appointment_date)
-			if((fee_validity.valid_till >= appointment_date) and (fee_validity.visited < fee_validity.max_visit)):
+			if (fee_validity.valid_till >= appointment_date) and (fee_validity.visited < fee_validity.max_visit):
 				visited = fee_validity.visited + 1
-				frappe.db.set_value("Fee Validity",fee_validity.name,"visited",visited)
-				if(fee_validity.ref_invoice):
-					frappe.db.set_value("Patient Appointment",appointment.name,"sales_invoice",fee_validity.ref_invoice)
+				frappe.db.set_value("Fee Validity", fee_validity.name, "visited", visited)
+				if fee_validity.ref_invoice:
+					frappe.db.set_value("Patient Appointment", appointment.name, "sales_invoice", fee_validity.ref_invoice)
 				frappe.msgprint(_("{0} has fee validity till {1}").format(appointment.patient, fee_validity.valid_till))
 		confirm_sms(self)

-def appointment_cancel(appointmentId):
-	appointment = frappe.get_doc("Patient Appointment",appointmentId)
-	#If invoice --> fee_validity update with -1 visit
-	if (appointment.sales_invoice):
- 		validity = frappe.db.exists({"doctype": "Fee Validity","ref_invoice": appointment.sales_invoice})
- 		if(validity):
- 			fee_validity = frappe.get_doc("Fee Validity",validity[0][0])
- 			visited = fee_validity.visited - 1
- 			frappe.db.set_value("Fee Validity",fee_validity.name,"visited",visited)
- 			if visited <= 0:
- 				frappe.msgprint(_("Appointment cancelled, Please review and cancel the invoice {0}".format(appointment.sales_invoice)))
- 			else:
- 				frappe.msgprint(_("Appointment cancelled"))
+	def save(self, *args, **kwargs):
+		# duration is the only changeable field in the document
+		if not self.is_new():
+			self.db_set('duration', cint(self.duration))
+		else:
+			super(PatientAppointment, self).save(*args, **kwargs)
+
+
+def appointment_cancel(appointment_id):
+	appointment = frappe.get_doc("Patient Appointment", appointment_id)
+
+	# If invoice --> fee_validity update with -1 visit
+	if appointment.sales_invoice:
+		validity = frappe.db.exists({"doctype": "Fee Validity", "ref_invoice": appointment.sales_invoice})
+		if validity:
+			fee_validity = frappe.get_doc("Fee Validity", validity[0][0])
+			visited = fee_validity.visited - 1
+			frappe.db.set_value("Fee Validity", fee_validity.name, "visited", visited)
+			if visited <= 0:
+				frappe.msgprint(
+					_("Appointment cancelled, Please review and cancel the invoice {0}".format(appointment.sales_invoice))
+				)
+			else:
+				frappe.msgprint(_("Appointment cancelled"))
+

@frappe.whitelist()
 def get_availability_data(date, physician):
-	# get availability data of 'physician' on 'date'
+	"""
+	Get availability data of 'physician' on 'date'
+	:param date: Date to check in schedule
+	:param physician: Name of the physician
+	:return: dict containing a list of available slots, list of appointments and time of appointments
+	"""
+
 	date = getdate(date)
 	weekday = date.strftime("%A")

 	available_slots = []
+	physician_schedule_name = None
+	physician_schedule = None
+	time_per_appointment = None
+
 	# get physicians schedule
 	physician_schedule_name = frappe.db.get_value("Physician", physician, "physician_schedule")
-	physician_schedule = frappe.get_doc("Physician Schedule", physician_schedule_name)
-	time_per_appointment = frappe.db.get_value("Physician", physician, "time_per_appointment")
+	if physician_schedule_name:
+		physician_schedule = frappe.get_doc("Physician Schedule", physician_schedule_name)
+		time_per_appointment = frappe.db.get_value("Physician", physician, "time_per_appointment")
+	else:
+		frappe.throw(_("Dr {0} does not have a Physician Schedule. Add it in Physician master".format(physician)))

-	for t in physician_schedule.time_slots:
-		if weekday == t.day:
-			available_slots.append(t)
+	if physician_schedule:
+		for t in physician_schedule.time_slots:
+			if weekday == t.day:
+				available_slots.append(t)
+
+	# `time_per_appointment` should never be None since validation in `Patient` is supposed to prevent
+	# that. However, it isn't impossible so we'll prepare for that.
+	if not time_per_appointment:
+		frappe.throw(_('"Time Per Appointment" hasn"t been set for Dr {0}. Add it in Physician master.').format(physician))

 	# if physician not available return
 	if not available_slots:
@@ -89,27 +123,36 @@ def get_availability_data(date, physician):
 		"time_per_appointment": time_per_appointment
 	}

+
@frappe.whitelist()
-def update_status(appointmentId, status):
-	frappe.db.set_value("Patient Appointment",appointmentId,"status",status)
-	if(status=="Cancelled"):
-		appointment_cancel(appointmentId)
+def update_status(appointment_id, status):
+	frappe.db.set_value("Patient Appointment", appointment_id, "status", status)
+	if status == "Cancelled":
+		appointment_cancel(appointment_id)
+

@frappe.whitelist()
 def set_open_appointments():
 	today = getdate()
-	frappe.db.sql("""update `tabPatient Appointment` set status='Open' where status = 'Scheduled' and appointment_date = %s""",(today))
+	frappe.db.sql(
+		"update `tabPatient Appointment` set status='Open' where status = 'Scheduled'"
+		" and appointment_date = %s", today)
+

@frappe.whitelist()
 def set_pending_appointments():
 	today = getdate()
-	frappe.db.sql("""update `tabPatient Appointment` set status='Pending' where status in ('Scheduled','Open') and appointment_date < %s""",(today))
+	frappe.db.sql(
+		"update `tabPatient Appointment` set status='Pending' where status in "
+		"('Scheduled','Open') and appointment_date < %s", today)
+

 def confirm_sms(doc):
-	if (frappe.db.get_value("Healthcare Settings", None, "app_con")=='1'):
+	if frappe.db.get_value("Healthcare Settings", None, "app_con") == '1':
 		message = frappe.db.get_value("Healthcare Settings", None, "app_con_msg")
 		send_message(doc, message)

+
@frappe.whitelist()
 def create_invoice(company, physician, patient, appointment_id, appointment_date):
 	if not appointment_id:
@@ -134,21 +177,24 @@ def create_invoice(company, physician, patient, appointment_id, appointment_date
 		frappe.db.set_value("Consultation", consultation[0][0], "invoice", sales_invoice.name)
 	return sales_invoice.name

+
 def get_fee_validity(physician, patient, date):
 	validity_exist = validity_exists(physician, patient)
-	if validity_exist :
-		fee_validity = frappe.get_doc("Fee Validity",validity_exist[0][0])
+	if validity_exist:
+		fee_validity = frappe.get_doc("Fee Validity", validity_exist[0][0])
 		fee_validity = update_fee_validity(fee_validity, date)
 	else:
 		fee_validity = create_fee_validity(physician, patient, date)
 	return fee_validity

+
 def validity_exists(physician, patient):
 	return frappe.db.exists({
 			"doctype": "Fee Validity",
 			"physician": physician,
 			"patient": patient})

+
 def update_fee_validity(fee_validity, date):
 	max_visit = frappe.db.get_value("Healthcare Settings", None, "max_visit")
 	valid_days = frappe.db.get_value("Healthcare Settings", None, "valid_days")
@@ -164,6 +210,7 @@ def update_fee_validity(fee_validity, date):
 	fee_validity.save(ignore_permissions=True)
 	return fee_validity

+
 def create_fee_validity(physician, patient, date):
 	fee_validity = frappe.new_doc("Fee Validity")
 	fee_validity.physician = physician
@@ -171,6 +218,7 @@ def create_fee_validity(physician, patient, date):
 	fee_validity = update_fee_validity(fee_validity, date)
 	return fee_validity

+
 def create_invoice_items(appointment_id, physician, company, invoice):
 	item_line = invoice.append("items")
 	item_line.item_name = "Consulting Charges"
@@ -178,16 +226,17 @@ def create_invoice_items(appointment_id, physician, company, invoice):
 	item_line.qty = 1
 	item_line.uom = "Nos"
 	item_line.conversion_factor = 1
-	item_line.income_account = get_income_account(physician,company)
+	item_line.income_account = get_income_account(physician, company)
 	op_consulting_charge = frappe.db.get_value("Physician", physician, "op_consulting_charge")
 	if op_consulting_charge:
 		item_line.rate = op_consulting_charge
 		item_line.amount = op_consulting_charge
 	return invoice

+
@frappe.whitelist()
 def create_consultation(appointment):
-	appointment = frappe.get_doc("Patient Appointment",appointment)
+	appointment = frappe.get_doc("Patient Appointment", appointment)
 	consultation = frappe.new_doc("Consultation")
 	consultation.appointment = appointment.name
 	consultation.patient = appointment.patient
@@ -199,29 +248,37 @@ def create_consultation(appointment):
 		consultation.invoice = appointment.sales_invoice
 	return consultation.as_dict()

+
 def remind_appointment():
-	if (frappe.db.get_value("Healthcare Settings", None, "app_rem")=='1'):
+	if frappe.db.get_value("Healthcare Settings", None, "app_rem") == '1':
 		rem_before = datetime.datetime.strptime(frappe.get_value("Healthcare Settings", None, "rem_before"), "%H:%M:%S")
-		rem_dt = datetime.datetime.now() + datetime.timedelta(hours = rem_before.hour, minutes=rem_before.minute, seconds= rem_before.second)
+		rem_dt = datetime.datetime.now() + datetime.timedelta(
+			hours=rem_before.hour, minutes=rem_before.minute, seconds=rem_before.second)

-		appointment_list = frappe.db.sql("select name from `tabPatient Appointment` where start_dt between %s and %s and reminded = 0 ", (datetime.datetime.now(), rem_dt))
+		appointment_list = frappe.db.sql(
+			"select name from `tabPatient Appointment` where start_dt between %s and %s and reminded = 0 ",
+			(datetime.datetime.now(), rem_dt)
+		)

-		for i in range (0,len(appointment_list)):
+		for i in range(0, len(appointment_list)):
 			doc = frappe.get_doc("Patient Appointment", appointment_list[i][0])
 			message = frappe.db.get_value("Healthcare Settings", None, "app_rem_msg")
 			send_message(doc, message)
-			frappe.db.set_value("Patient Appointment",doc.name,"reminded",1)
+			frappe.db.set_value("Patient Appointment", doc.name, "reminded",1)
+

 def send_message(doc, message):
-	patient = frappe.get_doc("Patient",doc.patient)
-	if(patient.mobile):
+	patient = frappe.get_doc("Patient", doc.patient)
+	if patient.mobile:
 		context = {"doc": doc, "alert": doc, "comments": None}
 		if doc.get("_comments"):
 			context["comments"] = json.loads(doc.get("_comments"))
-		#jinja to string convertion happens here
+
+		# jinja to string convertion happens here
 		message = frappe.render_template(message, context)
 		number = [patient.mobile]
-		send_sms(number,message)
+		send_sms(number, message)
+

@frappe.whitelist()
 def get_events(start, end, filters=None):
--- a/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json
+++ b/erpnext/healthcare/doctype/patient_medical_record/patient_medical_record.json
@@ -33,11 +33,11 @@
   "options": "PMR-", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -52,7 +52,7 @@
   "fieldname": "patient", 
   "fieldtype": "Link", 
   "hidden": 0, 
-   "ignore_user_permissions": 0, 
+   "ignore_user_permissions": 1, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -171,7 +171,7 @@
   "fieldtype": "Small Text", 
   "hidden": 0, 
   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
+   "ignore_xss_filter": 1, 
   "in_filter": 0, 
   "in_global_search": 0, 
   "in_list_view": 1, 
@@ -212,7 +212,7 @@
   "options": "Open\nClose", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 0, 
   "remember_last_selected_value": 0, 
@@ -332,15 +332,15 @@
   "in_standard_filter": 0, 
   "label": "Reference Owner", 
   "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
   "options": "reference_name.owner", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -356,7 +356,7 @@
   "fieldname": "user", 
   "fieldtype": "Link", 
   "hidden": 1, 
-   "ignore_user_permissions": 1, 
+   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
   "in_global_search": 0, 
@@ -368,11 +368,11 @@
   "options": "User", 
   "permlevel": 0, 
   "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
   "read_only": 1, 
   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
+   "report_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
   "set_only_once": 0, 
@@ -389,7 +389,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-09-04 14:29:48.679751", 
+ "modified": "2017-10-04 16:09:55.597866", 
 "modified_by": "Administrator", 
 "module": "Healthcare", 
 "name": "Patient Medical Record", 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Saurabh	6ad1082433	Merge branch 'hotfix'	2017-11-08 12:12:37 +05:30
Saurabh	db781e607a	bumped to version 9.2.5	2017-11-08 12:42:37 +06:00
rohitwaghchaure	521606e433	Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option [enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:49:24 +05:30
Rohit Waghchaure	acc8995c48	[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:39:08 +05:30
rohitwaghchaure	f688af3809	[fix] Offline pos name is not defined issue in the POS (#11469 )	2017-11-08 11:33:39 +05:30
rohitwaghchaure	9f2a27c99c	Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases [fix] POS Profile test cases	2017-11-07 16:35:52 +05:30
rohitwaghchaure	6058dcc2ce	Merge pull request #11470 from rohitwaghchaure/pos_online_invalid_grand_total_issue [Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart	2017-11-07 16:19:51 +05:30
Rohit Waghchaure	35fc45eff9	[fix] POS Profile test cases	2017-11-07 10:43:16 +05:30
Rohit Waghchaure	57cc924d29	[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart	2017-11-06 18:42:37 +05:30
rohitwaghchaure	adbbb0b0f3	Merge pull request #11364 from manassolanki/set-pos-profile set the pos profile in the sales invoice	2017-11-06 14:08:59 +05:30
Manas Solanki	40ef7e7039	patch for renaming the pos profile and setting the pos profile name	2017-11-06 13:53:52 +05:30
Manas Solanki	b1616a0cb3	changes in thepos profile	2017-11-06 13:53:52 +05:30
Manas Solanki	3f0dfd720f	set the pos profile in the sales invoice	2017-11-06 13:53:52 +05:30
Saurabh	5647bf081a	Merge branch 'hotfix'	2017-11-03 16:56:23 +05:30
Saurabh	56cb0aa9c1	bumped to version 9.2.4	2017-11-03 17:26:23 +06:00
rohitwaghchaure	7677ff00a2	[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409 )	2017-11-02 18:12:14 +05:30
Saurabh	75f3f81a9b	Merge branch 'hotfix'	2017-11-02 12:14:41 +05:30
Saurabh	870ce3cfea	bumped to version 9.2.3	2017-11-02 12:44:40 +06:00
Saurabh	0ad2cc3def	Merge pull request #11403 from tundebabzy/issue-11402 Error In Employee Loan Form (#11402)	2017-11-02 12:09:54 +05:30
Saurabh	00f6c2d61d	Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9 [Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-02 12:07:32 +05:30
Saurabh	38008f8daa	Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue [Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-02 12:07:14 +05:30
Saurabh	afb63af3b6	Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so [Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-11-02 12:06:08 +05:30
Rohit Waghchaure	816ce33daf	[Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-01 19:02:09 +05:30
Rohit Waghchaure	99748dbacf	[Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-01 11:45:02 +05:30
tunde	31287b00a6	call get_employee_loan_application only when appropriate	2017-10-31 18:10:17 +01:00
Rohit Waghchaure	5ec9f6930b	[Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-10-31 15:26:56 +05:30
Faris Ansari	40611e4f69	[fix] hub get_item_details (#11383 )	2017-10-31 13:00:09 +05:30
Saurabh	dd0bdc7fa6	Merge pull request #11356 from tundebabzy/issue-11355 fix object has not attribute 'is_item_from_hub'	2017-10-31 12:23:09 +05:30
tunde	bbce7b7e5d	get attribute with get method	2017-10-26 14:31:13 +01:00
Nabin Hait	92e09c0b7b	Merge branch 'hotfix'	2017-10-26 14:35:33 +05:30
Nabin Hait	819c50c042	bumped to version 9.2.2	2017-10-26 15:05:33 +06:00
Faris Ansari	6887cedaea	[fix] item qty trigger (#11349 )	2017-10-26 14:34:15 +05:30
Nabin Hait	aa7896f1e1	[test] Fixed physician test cases (#11347 )	2017-10-26 14:33:28 +05:30
Nabin Hait	52909b73bb	[test] Fixed advance jv cancellation (#11333 )	2017-10-26 11:06:07 +05:30
Saurabh	5235aa833c	Merge branch 'hotfix'	2017-10-26 09:59:22 +05:30
Saurabh	d0131762cc	bumped to version 9.2.1	2017-10-26 10:29:22 +06:00
Saurabh	97b98b6c01	Merge pull request #11345 from saurabh6790/setup_wiz_fixes [HOTFIX] translate domain	2017-10-26 09:52:45 +05:30
Saurabh	92a6155bb0	[fix] translate domain	2017-10-26 09:44:51 +05:30
Saurabh	d6e67ce123	[fix] check for null date fields (#11334 )	2017-10-25 17:44:22 +05:30
Nabin Hait	6a4e230cde	[fix] Status of Item (#11326 )	2017-10-25 17:06:30 +05:30
rohitwaghchaure	c65f1d7745	Search item using name instead of item code (#11327 )	2017-10-25 17:04:56 +05:30
rohitwaghchaure	e02ee898e9	[Fix] Production order not displaying in the calendar view, if po has no operations (#11328 )	2017-10-25 17:04:31 +05:30
rohitwaghchaure	2e6f6d6749	[minor] cleanup code (#11331 )	2017-10-25 17:03:49 +05:30
Nabin Hait	014b138074	Merge branch 'tundebabzy-issue-11080' into hotfix	2017-10-25 15:53:53 +05:30
Nabin Hait	fb734976eb	Removed appintment field from Invoice, it should be a custom field and will be added from domain settings	2017-10-25 15:53:07 +05:30
Nabin Hait	8e7ba95b78	Merge branch 'staging'	2017-10-25 14:10:38 +05:30
Nabin Hait	e146143bd1	bumped to version 9.2.0	2017-10-25 14:40:38 +06:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	f76bc27db5	Merge branch 'develop' into staging	2017-10-21 11:34:44 +05:30
Nabin Hait	7533101d4b	Merge branch 'master' into develop	2017-10-21 11:29:40 +05:30
Nabin Hait	4825eccad5	UI test fixed for supplier quotation (#11260 ) * UI test fixed for supplier quotation * ui test fixes for purchase order * Fixed number of assertion in student admission test * Fixed multiple ui tests * ui tests	2017-10-21 10:44:30 +05:30
Doridel Cahanap	5a4d5bfaf2	Add Training Program DocType, Script, Path and Doc (#11181 ) * Add Training Program Doctype, Script, Config and documentation * Add Training Program to Training Event * [Test Case] Training Event in a Training Program	2017-10-20 11:31:15 +05:30
Nabin Hait	b4f5f14438	Timeout increased for setting __newname (#11252 ) * Timeout increased for setting __newname * UI test fixes * fixed ui test for PO * ui tests * ui tests * ui tests * ui tests * ui tests	2017-10-20 11:26:17 +05:30
Nabin Hait	bb60a59b96	Fixed asset test cases due to tax rule (#11247 ) * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule	2017-10-19 12:14:37 +05:30
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Jamsheer	dd7c1b87c5	Healthcare Doctypes - Docfield Clean up (#11065 ) * Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect. * Healthcare Doctype - remove frappe import	2017-10-18 12:13:15 +05:30
Helkyd	7ec7a45f05	Salary Detail Abbr (#11165 ) When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee	2017-10-18 11:16:24 +05:30
Vishal Dhayagude	3e02d80636	[fix] Travis Client Side Failure (#11198 )	2017-10-18 11:10:45 +05:30
Brown-Harry Boma	11e964d442	Set transaction type in pricing rule only if unavailable (#11229 ) * Set transaction type in pricing rule only if unavailable * Update pricing_rule.py	2017-10-18 11:07:09 +05:30
Javier Wong	84f7ba8699	[hotfix] Allow Sales User and Purchase User to Read Account Settings (#11233 ) * [hotfix] Allow Sales User and Purchase User to Read Account Settings This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4. * Added back Accounts Manager Permissions	2017-10-18 11:04:15 +05:30
jigneshpshah	bad5e90e46	Priority of credit limit check functionality (#11232 ) CREDIT LIMIT field is at customer, customer group and company level . Explanation given on priority of the three levels.	2017-10-18 10:53:11 +05:30
Nabin Hait	a9feddbb79	Testcase fixes (#11238 ) * Restaurant test records fixed * Fixes for test cases	2017-10-18 10:52:48 +05:30
KanchanChauhan	44734049f5	[Minor] Populate Expense Claim Description from Expense Claim Type (#11156 )	2017-10-17 17:23:26 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020 ) * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
Prateeksha Singh	bfb108d722	Replace c3 (#11112 ) * [charts] replace in asset.js * replace in reports	2017-10-17 12:03:02 +05:30
Nabin Hait	53659cf0bd	Update payment_entry_reference.json	2017-10-16 12:57:51 +05:30
mbauskar	cd4202c2f7	Merge branch 'master' into develop	2017-10-15 19:10:56 +05:30
Nabin Hait	4072d71769	Delete api.py	2017-10-11 23:53:57 +05:30
Saurabh	5ffed60916	Merge branch 'master' into develop	2017-10-11 14:39:11 +05:30
Saurabh	9893a2d608	Merge branch 'master' into develop	2017-10-10 11:22:39 +05:30
Faris Ansari	172f28fa06	Merge pull request #11133 from netchampfaris/fix-hub-sync fix Hub Sync plan	2017-10-09 19:31:08 +05:30
Faris Ansari	d635a2646b	fix Hub Sync plan	2017-10-09 19:30:11 +05:30
mbauskar	966b3c156a	[conflicts] resolved merge conflicts	2017-10-09 15:20:30 +05:30
Doridel Cahanap	5ba39f3f83	Add has_certificate and level fields in Training Event (#11093 )	2017-10-09 12:45:28 +05:30
Manas Solanki	f91ad75b5a	test, patch, docs for student admission (#11075 )	2017-10-09 12:41:24 +05:30
Doridel Cahanap	5cb6c38a34	Add Calendar in Training Event Doctype (#11090 )	2017-10-06 11:50:05 +05:30
Nabin Hait	7eaeec951d	Merge branch 'schilgod-develop' into develop	2017-10-05 19:54:17 +05:30
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Faris Ansari	e3a5899980	[hub] Add hub category filters, fix minor issues (#11079 )	2017-10-05 19:43:08 +05:30
Stavros Anastasiadis	455c3ebb27	Add as optional field link Company (#11068 )	2017-10-05 18:45:37 +05:30
Stavros Anastasiadis	58b587834e	Provide a minor warning message if no stock levels are availiable (#11074 ) * Provide a minor warning message if no stock levels are availiable * Update item_dashboard.js	2017-10-05 18:44:50 +05:30
Stavros Anastasiadis	e31757b001	Show Stock Level section only to stock maintain items (#11073 )	2017-10-05 18:41:51 +05:30
Nabin Hait	bf3b54f658	Merge branch 'schilgod-material_request' into develop	2017-10-05 18:30:11 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
Prateeksha Singh	925e9776e8	[hub] rename is_hub_item to is_item_from_hub (#11069 ) * [hub] rename is_hub_item to is_item_from_hub * [rename] is_hub_item to is_item_from_hub	2017-10-05 17:17:41 +05:30
AravindPranera	9c0d30a087	Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874 )	2017-10-05 17:08:32 +05:30
Utkarsh Goswami	4cb4d2f155	Tests for payment entry against purchase invoice (#10930 )	2017-10-05 16:51:42 +05:30
Utkarsh Goswami	975d28307a	Payroll feature (#10900 )	2017-10-05 15:59:51 +05:30
Stavros Anastasiadis	ea390effa5	Add multirows in Attendees selection (#11067 )	2017-10-05 15:31:25 +05:30
Nabin Hait	31e6f75dbf	Merge branch 'Helkyd-develop' into develop	2017-10-05 15:29:05 +05:30
Nabin Hait	34ad2e6a60	Use format_currency only if fieldtype is currency	2017-10-05 15:28:43 +05:30
Nabin Hait	f8ad0cbe70	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop	2017-10-05 15:02:50 +05:30
Manas Solanki	0518001bdc	Changes in Student Admission (#11019 ) * configurable student admission * validate dob and admission date from student admission * add in hooks and fix codacy	2017-10-05 14:31:31 +05:30
Doridel Cahanap	25db832be1	[minor] Add "Attendance" in grid view for Training Event Employee (#11063 )	2017-10-05 14:20:43 +05:30
mbauskar	74ce391303	Merge branch 'master' into develop	2017-10-05 13:36:50 +05:30
Nabin Hait	26507d7867	Removed deprecated hub functions	2017-10-05 13:10:32 +05:30
Nabin Hait	d6d99e0d59	Removed duplicate field related to hub from Item	2017-10-05 12:39:42 +05:30
Nabin Hait	729aa2025a	Show commission section for pos as well (#11059 )	2017-10-05 12:21:36 +05:30
Faris Ansari	fd345f8e90	Hub (#10934 ) * [WIP]Hub * [listing] Show items, users and item_groups * Show filters * [start] cart, api for rfq and opp * rfq working * [wip] keys * wip quotes * [hub] register/unregister * [hub] rename password to access_token, remove passed company field * [hub] publishing cases, api call wrapper * [hub] add and remove fields working * [hub] fix flags, update on client save working * [hub] new hub page, client item CUD at hub working * listing, standard rate, local site hack * item listing, item page, search, back to home * [hub] implement hub company * [hub] company filter * [hub] basic rfq-ing, item page cleanup * categories wip * [hub] use get_doc_before_save() * [hub] send opportunity message to hub, api to make locally * [hub] enqueueing in hub api request wrapper * cleanup * [hub] refactor shopping cart's product.py to reuse * sync dynamic item fields daily * Scheduler heartbeat check * [wip] hub categories * [hub] wip enqueued callbacks * [hub] outgoing messages, fixing callback loop * [hub] bug: callback save after primary save * [hub] pricing, stock, currency * [hub] replace send_hub_request with make_and_enqueue * add hub.less, refactor code * Remove template html files, add styling for hub item cards * fix paging * add breadcrumb * Add sidebar * [hub] add company page, change country * [hub] order_by filters * [hub] make hub category a tree * [hub] enqueue batched item enqueueing * [hub] requested products page * [minor] * update hub url * [fix] url * [fix] more reform * fix recursion * [hub] data migration plans as jsons * Hub register, create data connector, sync with run * [add] user registration by session user * Removed hub_message * Remove sync code from hub_settings * Remove hub methods from item.py * Update Hub Sync plan * Hub unregister * Update Hub connector on reregister * Dont delete Hub Connector on unregister * Enable hub on success response * Add new hub whitelisted methods * [hub] list working * Hub register from hub page * [hub] Add hub logo in desk icon, link to page * [hub] hide page head on empty state * [hub] make rfq * [hub] push opportunity doc, poll for opportunity docs * add fields to item mapping * update hub mappings * Make RFQ * [hub] item, home routing * Make rfq and send opportunity refactor * [hub][fix] remote lead data * images passed as base64 * set default company on register * Revert "images passed as base64" This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4. * Add sync to hub page * Prompt for publish items to hub * add post process to hub document to lead * Rename Hub document to Hub message, create opportunity in post process	2017-10-05 11:17:30 +05:30
Sunny	38647ed832	move Purchase Order patch to v9	2017-10-02 11:37:48 +08:00
Sunny	42c74a6365	set schedule_date when creating po	2017-10-02 11:37:48 +08:00
Sunny	c6f25ba996	correct field name	2017-10-02 11:37:47 +08:00
Sunny	b387b3cca0	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	a456901e9f	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	0f2b21f88b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	73f4eef40f	[fix] tests	2017-10-02 11:37:47 +08:00
Sunny	9ded8a7290	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	c2befc59d1	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	34a8fb4100	[fix] Codacy errors	2017-10-02 11:37:47 +08:00
Sunny	47eac28f0a	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:37:47 +08:00
Sunny	869b878286	set schedule_Date when creating po	2017-10-02 11:36:24 +08:00
Sunny	f2e2e23b6b	[fix] tests	2017-10-02 11:35:33 +08:00
Sunny	3a22fd1535	Add schedule_date when creating Purchase Order	2017-10-02 11:35:33 +08:00
Sunny	f07e53b7a8	[fix] tests	2017-10-02 11:35:33 +08:00
Sunny	bd121486a8	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	122981d465	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
Sunny	962cef470a	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:33 +08:00
Sunny	0f73f90fa2	[fix] Codacy errors	2017-10-02 11:35:33 +08:00
Sunny	69e88ffa39	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:33 +08:00
schilgod	f29969a5cc	update test records	2017-10-02 11:35:32 +08:00
Sunny	e3ed8b7cb3	[fix] tests	2017-10-02 11:35:32 +08:00
Sunny	9626ed79fa	Add patch to update schedule date of submitted Purchase Orders	2017-10-02 11:35:32 +08:00
Sunny	c429a6e688	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	2315a79b5f	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
Sunny	9da25f568d	Set PO Reqd By Date default in code, to next date	2017-10-02 11:35:32 +08:00
Sunny	9d497a984b	[fix] Codacy errors	2017-10-02 11:35:32 +08:00
Sunny	bb03ec103b	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-10-02 11:35:32 +08:00
Helkyd	4c58588d25	Improve Salary Register Check if fieldname is a number to format. Start the Html Salary with hidden fields and check if they not empty and increase the width... This will remove Blank fields from the report.	2017-10-01 20:20:57 +01:00
Sunny	3ec6960478	move Material Request patch to v9	2017-09-28 15:26:20 +08:00
Sunny	33670bba47	fix reorder_item	2017-09-28 15:24:11 +08:00
Sunny	73f1c93cd2	fix ppt code	2017-09-28 15:24:11 +08:00
Sunny	bf68611567	clean code	2017-09-28 15:24:11 +08:00
Sunny	0d91d3f572	add schedule_date while creating Material Request	2017-09-28 15:23:52 +08:00
Sunny	892ec599d4	[fix] tests	2017-09-28 15:23:09 +08:00
Sunny	65cd9f2284	Add patch to update schedule date of submitted Purchase Orders	2017-09-28 15:23:09 +08:00
Sunny	799d69baba	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	71866e06f3	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Sunny	284ceb7abe	Set PO Reqd By Date default in code, to next date	2017-09-28 15:22:49 +08:00
Sunny	65c7a6947a	[fix] Codacy errors	2017-09-28 15:22:49 +08:00
Sunny	f7a8277d12	Add Purchase Order schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:49 +08:00
Sunny	12cb07ce3c	[fix] test records	2017-09-28 15:22:49 +08:00
Sunny	23a4b09d43	Add Material Request schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:48 +08:00