diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js
index 4a1cbbac17..92f17487bc 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -177,10 +177,15 @@ cur_frm.cscript.allocated_amount = function(doc,cdt,cdn) {
 
 
 cur_frm.cscript.make_bank_voucher = function() {
-	$c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) {
-		if(!r.exc) {
+	wn.call({
+		method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
+		args: {
+			"company": cur_frm.doc.company,
+			"voucher_type": "Bank Voucher"
+		},
+		callback: function(r) {
 			cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message);
-	}
+		}
 	});
 }
 
@@ -289,8 +294,9 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, bank_account) {
 	
 	// credit to bank
 	var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
-	d1.account = bank_account;
+	d1.account = bank_account.account;
 	d1.credit = doc.outstanding_amount;
+	d1.balance = bank_account.balance;
 	
 	loaddoc('Journal Voucher', jv.name);
 }
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js
index 97c8554ac8..2e8cc820a6 100644
--- a/accounts/page/accounts_browser/accounts_browser.js
+++ b/accounts/page/accounts_browser/accounts_browser.js
@@ -159,7 +159,7 @@ erpnext.AccountsChart = Class.extend({
 	rename: function() {
 		var node = this.selected_node();
 		wn.model.rename_doc(this.ctype, node.data('label'), function(new_name) {
-			node.data('label', new_name).find(".tree-label").html(new_name);
+			node.parents("ul:first").parent().find(".tree-link:first").trigger("reload");
 		});
 	},
 	delete: function() {
diff --git a/accounts/search_criteria/purchase_register/purchase_register.py b/accounts/search_criteria/purchase_register/purchase_register.py
index 93fc32393e..82ab047e3b 100644
--- a/accounts/search_criteria/purchase_register/purchase_register.py
+++ b/accounts/search_criteria/purchase_register/purchase_register.py
@@ -77,14 +77,10 @@ for r in res:
 	r.append(net_total)
 
 	#Get tax for account heads
-	acc_head_tax = sql("""select account_head, sum(tax_amount) 
-						  from `tabPurchase Taxes and Charges` 
-						  where parent = '%s' 
-						  and parenttype = 'Purchase Invoice' 
-						  and add_deduct_tax = 'Add' 
-						  and category in ('Total', 'Valuation and Total')
-						  group by account_head
-						""" %(r[col_idx['ID']],))
+	acc_head_tax = sql("""select account_head, 
+		sum(if(add_deduct_tax='Add', tax_amount, -tax_amount)) 
+		from `tabPurchase Taxes and Charges` where parent = %s and parenttype = 'Purchase Invoice' 
+		and category in ('Total', 'Valuation and Total') group by account_head""", r[col_idx['ID']])
 
 	#Convert the result to dictionary for easy retrieval
 	acc_head_tax_dict = {}
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index e2c0db598a..fcb2276ca0 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -76,9 +76,13 @@ div.web-footer, div.web-footer a {
 	box-shadow: none;
 }
 
-{% if doc.top_bar_background == doc.page_background %}.navbar-inner {
-	border-bottom: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
-}{% endif %}
+.navbar-inner {
+	border-bottom: 1px solid {% if doc.top_bar_background == doc.page_background -%}
+		#{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
+	{%- else -%}
+		transparent;
+	{%- endif %}
+}
 
 .navbar-inverse .brand,
 .navbar-inverse .brand:hover,