diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py
index 5fd0ba7e93e..904f31b7f59 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/accounts/doctype/sales_invoice/sales_invoice.py
@@ -521,6 +521,8 @@ class DocType(SellingController):
 			self.make_packing_list()
 		else:
 			self.doclist = self.doc.clear_table(self.doclist, 'packing_details')
+			
+		if not cint(self.doc.is_pos):
 			webnotes.conn.set(self.doc,'paid_amount',0)
 		
 	def check_prev_docstatus(self):
diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py
index d6bf392861b..a3dae8e2e87 100644
--- a/controllers/accounts_controller.py
+++ b/controllers/accounts_controller.py
@@ -75,7 +75,7 @@ class AccountsController(TransactionBase):
 						self.doc.conversion_rate = self.doc.plc_conversion_rate
 						
 		if self.meta.get_field("currency"):
-			if self.doc.currency != company_currency:
+			if self.doc.currency and self.doc.currency != company_currency:
 				if not self.doc.conversion_rate:
 					exchange = self.doc.currency + "-" + company_currency
 					self.doc.conversion_rate = flt(webnotes.conn.get_value("Currency Exchange",