diff --git a/accounts/doctype/sales_invoice/pos.js b/accounts/doctype/sales_invoice/pos.js
index 126b887..1bd6de1 100644
--- a/accounts/doctype/sales_invoice/pos.js
+++ b/accounts/doctype/sales_invoice/pos.js
@@ -288,7 +288,7 @@
 			<tr>', {
 				description: d.description,
 				tax_amount: format_currency(d.tax_amount, me.frm.doc.price_list_currency)
-			})).appendTo(".tax-table tbody")
+			})).appendTo(".tax-table tbody");
 		});
 
 		// set totals
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 5d11ecb..109d9f8 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -26,9 +26,7 @@
 			}
 		}
 		
-		if(this.frm.doc.is_pos && this.frm.doc.docstatus===0) {
-			cur_frm.cscript.toggle_pos(true);
-		}
+		cur_frm.cscript.toggle_pos(true);
 	},
 	
 	refresh: function(doc, dt, dn) {
@@ -94,10 +92,10 @@
 					});
 				});
 			
-			if (cint(sys_defaults.fs_pos_view)===1)
+			if(cint(sys_defaults.fs_pos_view)===1)
 				cur_frm.cscript.pos_btn();
 				
-			setTimeout(function() { cur_frm.$pos_btn.click(); }, 1000);
+			// setTimeout(function() { cur_frm.$pos_btn.click(); }, 1000);
 				
 		} else {
 			// hide shown pos for submitted records
@@ -125,6 +123,9 @@
 	},
 
 	toggle_pos: function(show) {
+		if(cint(sys_defaults.fs_pos_view)===0) return;
+		if(!(this.frm.doc.is_pos && this.frm.doc.docstatus===0)) return;
+		
 		if (!this.frm.doc.selling_price_list)
 			msgprint(wn._("Please select Price List"))
 		else {
