diff --git a/selling/doctype/sales_order/sales_order.py b/selling/doctype/sales_order/sales_order.py
index 03530dce480..602674e0728 100644
--- a/selling/doctype/sales_order/sales_order.py
+++ b/selling/doctype/sales_order/sales_order.py
@@ -357,7 +357,12 @@ def make_delivery_note(source_name, target_doclist=None):
 	return [d.fields for d in doclist]
 
 @webnotes.whitelist()
-def make_sales_invoice(source_name, target_doclist=None):	
+def make_sales_invoice(source_name, target_doclist=None):
+	def set_missing_values(source, target):
+		bean = webnotes.bean(target)
+		bean.doc.is_pos = 0
+		bean.run_method("onload_post_render")
+		
 	def update_item(obj, target, source_parent):
 		target.export_amount = flt(obj.export_amount) - flt(obj.billed_amt)
 		target.amount = target.export_amount * flt(source_parent.conversion_rate)
diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
index 1647aaccc84..eb39944fd45 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/stock/doctype/delivery_note/delivery_note.py
@@ -387,6 +387,7 @@ def make_sales_invoice(source_name, target_doclist=None):
 	
 	def update_accounts(source, target):
 		si = webnotes.bean(target)
+		si.doc.is_pos = 0
 		si.run_method("onload_post_render")
 		
 		si.set_doclist(si.doclist.get({"parentfield": ["!=", "entries"]}) +