diff --git a/public/js/transaction.js b/public/js/transaction.js
index 4a647adc1cf..6348e5a30e6 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -195,6 +195,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 		var company_currency = this.get_company_currency();
 		this.change_form_labels(company_currency);
 		this.change_grid_labels(company_currency);
+		this.frm.refresh_fields();
 	},
 	
 	recalculate: function() {
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index 964a9847494..20d3a2323c9 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -617,7 +617,9 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 		// set labels
 		var $wrapper = $(this.frm.wrapper);
 		$.each(field_label_map, function(fname, label) {
-			$wrapper.find('[data-grid-fieldname="'+fname+'"]').text(label);
+			fname = fname.split("-");
+			var df = wn.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
+			if(df) df.label = label;
 		});
 	},