From acf65a72255c823409840c2cb76c821902f04764 Mon Sep 17 00:00:00 2001
From: Akhilesh Darjee <akhileshdarjee@gmail.com>
Date: Thu, 17 Oct 2013 13:04:26 +0530
Subject: [PATCH 1/2] [fix] [minor] conversion rate related fixes

---
 .../doctype/sales_invoice/sales_invoice.js    | 28 +++++++++++--------
 public/js/transaction.js                      |  5 ++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 8192fe5c52..b5c1646176 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -18,21 +18,21 @@ wn.provide("erpnext.accounts");
 erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({
 	onload: function() {
 		this._super();
-		
-		if(!this.frm.doc.__islocal) {
+
+		if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
 			// show debit_to in print format
-			if(!this.frm.doc.customer && this.frm.doc.debit_to) {
-				this.frm.set_df_property("debit_to", "print_hide", 0);
-			}
+			this.frm.set_df_property("debit_to", "print_hide", 0);
 		}
 		
 		// toggle to pos view if is_pos is 1 in user_defaults
-		if ((cint(wn.defaults.get_user_defaults("is_pos"))===1 || cur_frm.doc.is_pos) && 
-				cint(wn.defaults.get_user_defaults("fs_pos_view"))===1) {
-					if(this.frm.doc.__islocal && !this.frm.doc.amended_from && !this.frm.doc.customer) {
-						this.frm.set_value("is_pos", 1);
-						this.is_pos(function() {cur_frm.cscript.toggle_pos(true);});
-					}
+		if ((cint(wn.defaults.get_user_defaults("is_pos"))===1 || cur_frm.doc.is_pos)) {
+			if(this.frm.doc.__islocal && !this.frm.doc.amended_from && !this.frm.doc.customer) {
+				this.frm.set_value("is_pos", 1);
+				this.is_pos(function() {
+					if (cint(wn.defaults.get_user_defaults("fs_pos_view"))===1)
+						cur_frm.cscript.toggle_pos(true);
+				});
+			}
 		}
 		
 		// if document is POS then change default print format to "POS Invoice"
@@ -44,7 +44,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 	
 	refresh: function(doc, dt, dn) {
 		this._super();
-		
+
 		cur_frm.cscript.is_opening(doc, dt, dn);
 		cur_frm.dashboard.reset();
 
@@ -141,6 +141,10 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
 					callback: function(r) {
 						if(!r.exc) {
 							me.frm.script_manager.trigger("update_stock");
+							me.set_default_values();
+							me.set_dynamic_labels();
+							me.calculate_taxes_and_totals();
+
 							if(callback_fn) callback_fn()
 						}
 					}
diff --git a/public/js/transaction.js b/public/js/transaction.js
index c1b83702d6..6b777204e7 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -48,7 +48,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 						// remove this call when using client side mapper
 						me.set_default_values();
 						me.set_dynamic_labels();
-						me.calculate_taxes_and_totals()
+						me.calculate_taxes_and_totals();
 					}
 				});
 			} else {
@@ -171,7 +171,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 	conversion_rate: function() {
 		if(this.frm.doc.currency === this.get_company_currency()) {
 			this.frm.set_value("conversion_rate", 1.0);
-		} else if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
+		}
+		if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
 			this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
 				this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
 		}

From 04638a5f77af24480df21c9051615b3c41860b4a Mon Sep 17 00:00:00 2001
From: Akhilesh Darjee <akhileshdarjee@gmail.com>
Date: Thu, 17 Oct 2013 13:19:46 +0530
Subject: [PATCH 2/2] [fix] [minor] onload post render also check for supplier

---
 public/js/transaction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/transaction.js b/public/js/transaction.js
index 6b777204e7..e948829af9 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -39,7 +39,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 	onload_post_render: function() {
 		var me = this;
 		if(this.frm.doc.__islocal && this.frm.doc.company && !this.frm.doc.is_pos) {
-			if(!this.frm.doc.customer) {
+			if(!this.frm.doc.customer || !this.frm.doc.supplier) {
 				return this.frm.call({
 					doc: this.frm.doc,
 					method: "onload_post_render",