[fix] [minor] merged with master

This commit is contained in:
Nabin Hait
2013-08-26 16:55:42 +05:30
37 changed files with 723 additions and 103 deletions

View File

@@ -248,8 +248,7 @@ def reorder_item():
and exists (select name from `tabItem`
where `tabItem`.name = `tabBin`.item_code and
is_stock_item='Yes' and (is_purchase_item='Yes' or is_sub_contracted_item='Yes') and
(ifnull(end_of_life, '')='') or end_of_life > now())""",
as_dict=True)
(ifnull(end_of_life, '')='' or end_of_life > now()))""", as_dict=True)
for bin in bin_list:
#check if re-order is required
item_reorder = webnotes.conn.get("Item Reorder",
@@ -389,4 +388,4 @@ def repost():
"""
from webnotes.model.code import get_obj
for wh in webnotes.conn.sql("select name from tabWarehouse"):
get_obj('Warehouse', wh[0]).repost_stock()
get_obj('Warehouse', wh[0]).repost_stock()