Merge branch 'develop'

gaurav-naik · Oct 4, 2016 · f7de366 · f7de366
2 parents 603b2fa + e2d5662
commit f7de366
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/awfis_erpnext/__init__.py b/awfis_erpnext/__init__.py
@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '1.0.19'
+__version__ = '1.0.20'
diff --git a/awfis_erpnext/awfis_erpnext/report/item_batch_expiry_status/item_batch_expiry_status.py b/awfis_erpnext/awfis_erpnext/report/item_batch_expiry_status/item_batch_expiry_status.py
@@ -50,6 +50,14 @@ def get_conditions(filters):
 	return conditions
 
 #get all details
+# def get_stock_ledger_entries(filters):
+# 	conditions = get_conditions(filters)
+# 	return frappe.db.sql("""select A.item_code, A.batch_no, warehouse,
+# 		posting_date, actual_qty
+# 		from `tabStock Ledger Entry` A inner join `tabBatch` ON A.batch_no = B.batch_no
+# 		where A.docstatus < 2 and ifnull(batch_no, '') != '' %s order by A.item_code, warehouse""" %
+# 		conditions, as_dict=1)
+
 def get_stock_ledger_entries(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""select item_code, batch_no, warehouse,

diff --git a/awfis_erpnext/hooks.py b/awfis_erpnext/hooks.py
@@ -75,7 +75,7 @@
 		"validate": "awfis_erpnext.awfis_erpnext.awf.validate_stock_entry"
 	},
 	"Purchase Receipt": {
-		"validate": "awfis_erpnext.awfis_erpnext.awf.validate_stock_entry"
+		"on_submit": "awfis_erpnext.awfis_erpnext.awf.validate_stock_entry"
 	}
 }