diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 58b1d19..66239d4 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -165,6 +165,7 @@
 		self.update_ordered_qty()
 
 		msgprint(_("Status of {0} {1} is now {2}").format(self.doctype, self.name, status))
+		self.notify_modified()
 
 	def on_submit(self):
 		super(PurchaseOrder, self).on_submit()
@@ -237,8 +238,6 @@
 				if po.status == "Stopped":
 					po.update_status("Submitted")
 
-			po.notify_modified()
-
 	frappe.local.message_log = []
 
 
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 09152ee..c6b26bc 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -83,7 +83,6 @@
 	refresh: function() {
 		erpnext.toggle_naming_series();
 		erpnext.hide_company();
-		this.hide_currency_and_price_list()
 		this.show_item_wise_taxes();
 		this.set_dynamic_labels();
 		erpnext.pos.make_pos_btn(this.frm);
@@ -140,14 +139,6 @@
 		}
 	},
 
-	hide_currency_and_price_list: function() {
-		if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) {
-			hide_field("currency_and_price_list");
-		} else {
-			unhide_field("currency_and_price_list");
-		}
-	},
-
 	barcode: function(doc, cdt, cdn) {
 		var d = locals[cdt][cdn];
 		if(d.barcode=="" || d.barcode==null) {