Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'creador30-reorder_level_zero' into develop

Browse Source
This commit is contained in:
Nabin Hait 2016-02-22 16:24:55 +05:30
commit 22d8198058
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/reorder_item.py
View File

@ -48,7 +48,8 @@ def _reorder_item():
# projected_qty will be 0 if Bin does not exist # projected_qty will be 0 if Bin does not exist
projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse)) projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
if reorder_level and projected_qty <= reorder_level: if ((reorder_level and projected_qty <= reorder_level)
or (not reorder_level and reorder_qty and projected_qty < 0)):
deficiency = reorder_level - projected_qty deficiency = reorder_level - projected_qty
if deficiency > reorder_qty: if deficiency > reorder_qty:
reorder_qty = deficiency reorder_qty = deficiency

2
erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
View File

@ -47,7 +47,7 @@ def get_data(filters):
re_order_level = d.warehouse_reorder_level re_order_level = d.warehouse_reorder_level
re_order_qty = d.warehouse_reorder_qty re_order_qty = d.warehouse_reorder_qty
shortage_qty = re_order_level - flt(bin.projected_qty) if re_order_level else 0 shortage_qty = re_order_level - flt(bin.projected_qty) if (re_order_level or re_order_qty) else 0
data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse, data.append([item.name, item.item_name, item.description, item.item_group, item.brand, bin.warehouse,
item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty, item.stock_uom, bin.actual_qty, bin.planned_qty, bin.indented_qty, bin.ordered_qty,