Merge branch 'staging' into develop

2018-10-04 11:51:30 +00:00
parent 36cca6a64e c6eac7c60b
commit da10f6ebd8
101 changed files with 11205 additions and 9538 deletions
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -661,7 +661,7 @@ class BuyingController(StockController):
 		if self.doctype == 'Purchase Invoice' and not self.get('update_stock'):
 			return

-		frappe.db.sql("delete from `tabAsset Movement` where reference_name=%s and docstatus = 0", self.name)
+		frappe.db.sql("delete from `tabAsset Movement` where reference_name=%s", self.name)
 		frappe.db.sql("delete from `tabSerial No` where purchase_document_no=%s", self.name)

 	def validate_schedule_date(self):