Fixed conflict while merging v4 into v5

2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -197,9 +197,9 @@ class StockController(AccountsController):
 		sl_dict.update(args)
 		return sl_dict

-	def make_sl_entries(self, sl_entries, is_amended=None):
+	def make_sl_entries(self, sl_entries, is_amended=None, allow_negative_stock=False):
 		from erpnext.stock.stock_ledger import make_sl_entries
-		make_sl_entries(sl_entries, is_amended)
+		make_sl_entries(sl_entries, is_amended, allow_negative_stock)

 	def make_gl_entries_on_cancel(self):
 		if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s