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

fix: Fixed consumed qty based on Stock Ledger Entry (#19305)

Browse Source 
* fix: Fixed consumed qty based on Stock Ledger Entry

* Update itemwise_recommended_reorder_level.py
This commit is contained in:
Nabin Hait 2019-10-21 13:41:42 +05:30 committed by GitHub
parent f2d37a7280
commit dfc10bb5ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
View File

@ -24,7 +24,7 @@ def execute(filters=None):
data = [] data = []
for item in items: for item in items:
total_outgoing = consumed_item_map.get(item.name, 0) + delivered_item_map.get(item.name,0) total_outgoing = flt(consumed_item_map.get(item.name, 0)) + flt(delivered_item_map.get(item.name,0))
avg_daily_outgoing = flt(total_outgoing / diff, float_preceision) avg_daily_outgoing = flt(total_outgoing / diff, float_preceision)
reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock) reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
@ -55,18 +55,20 @@ def get_item_info(filters):
def get_consumed_items(condition): def get_consumed_items(condition):
cn_items = frappe.db.sql("""select se_item.item_code, consumed_items = frappe.db.sql("""
sum(se_item.transfer_qty) as 'consume_qty' select item_code, abs(sum(actual_qty)) as consumed_qty
from `tabStock Entry` se, `tabStock Entry Detail` se_item from `tabStock Ledger Entry`
where se.name = se_item.parent and se.docstatus = 1 where actual_qty < 0
and (ifnull(se_item.t_warehouse, '') = '' or se.purpose = 'Send to Subcontractor') %s and voucher_type not in ('Delivery Note', 'Sales Invoice')
group by se_item.item_code""" % (condition), as_dict=1) %s
group by item_code
""" % condition, as_dict=1)
cn_items_map = {} consumed_items_map = {}
for item in cn_items: for item in consumed_items:
cn_items_map.setdefault(item.item_code, item.consume_qty) consumed_items_map.setdefault(item.item_code, item.consumed_qty)
return cn_items_map return consumed_items_map
def get_delivered_items(condition): def get_delivered_items(condition):
dn_items = frappe.db.sql("""select dn_item.item_code, sum(dn_item.stock_qty) as dn_qty dn_items = frappe.db.sql("""select dn_item.item_code, sum(dn_item.stock_qty) as dn_qty