Merge branch 'master' of github.com:webnotes/erpnext into webshop

stock/doctype/delivery_note/delivery_note.py

@@ -408,4 +408,4 @@ class DocType(SellingController):
 				
 		if gl_entries:
 			from accounts.general_ledger import make_gl_entries
-			make_gl_entries(gl_entries)
+			make_gl_entries(gl_entries, cancel=(self.doc.docstatus == 2))

stock/stock_ledger.py

@@ -35,6 +35,9 @@ def update_entries_after(args, verbose=1):
 			"posting_time": "12:00"
 		}
 	"""
+	global _exceptions
+	_exceptions = []
+	
 	previous_sle = get_sle_before_datetime(args)
 	
 	qty_after_transaction = flt(previous_sle.get("qty_after_transaction"))