From 1dc124cf757726389ffe30ce2ab6f30884b82851 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Wed, 10 Jul 2019 14:49:25 +0530 Subject: [PATCH 1/6] fix: Changed columns to new dict form --- .../stock/report/stock_ageing/stock_ageing.py | 79 +++++++++++++++++-- 1 file changed, 74 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 969284598c..f81e1c0b91 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -45,14 +45,83 @@ def get_average_age(fifo_queue, to_date): return (age_qty / total_qty) if total_qty else 0.0 def get_columns(filters): - columns = [_("Item Code") + ":Link/Item:100", _("Item Name") + "::100", _("Description") + "::200", - _("Item Group") + ":Link/Item Group:100", _("Brand") + ":Link/Brand:100"] + columns = [ + { + "label": _("Item Code"), + "fieldname": "item_code", + "fieldtype": "Link", + "options": "Item", + "width": 100 + }, + { + "label": _("Item Name"), + "fieldname": "item_name", + "fieldtype": "Data", + "width": 100 + }, + { + "label": _("Description"), + "fieldname": "description", + "fieldtype": "Data", + "width": 200 + }, + { + "label": _("Item Group"), + "fieldname": "item_group", + "fieldtype": "Link", + "options": "Item Group", + "width": 100 + }, + { + "label": _("Brand"), + "fieldname": "brand", + "fieldtype": "Link", + "options": "Brand", + "width": 100 + }] if filters.get("show_ageing_warehouse_wise"): - columns.extend([_("Warehouse") + ":Link/Warehouse:100"]) + columns +=[{ + "label": _("Warehouse"), + "fieldname": "warehouse", + "fieldtype": "Link", + "options": "Warehouse", + "width": 100 + }] - columns.extend([_("Available Qty") + ":Float:100", _("Average Age") + ":Float:100", - _("Earliest") + ":Int:80", _("Latest") + ":Int:80", _("UOM") + ":Link/UOM:100"]) + columns.extend([ + { + "label": _("Available Qty"), + "fieldname": "qty", + "fieldtype": "Float", + "width": 100 + }, + { + "label": _("Average Age"), + "fieldname": "average_age", + "fieldtype": "Float", + "width": 100 + }, + { + "label": _("Earliest"), + "fieldname": "earliest", + "fieldtype": "Int", + "width": 80 + }, + { + "label": _("Latest"), + "fieldname": "latest", + "fieldtype": "Int", + "width": 80 + }, + { + "label": _("UOM"), + "fieldname": "uom", + "fieldtype": "Link", + "options": "UOM", + "width": 100 + } + ]) return columns From 581d9310312830fef77ba3787c5964b1c72a4887 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Sat, 13 Jul 2019 21:58:32 +0530 Subject: [PATCH 2/6] fix: Enhancement in stock ageing report --- .../stock/report/stock_ageing/stock_ageing.js | 4 +- .../stock/report/stock_ageing/stock_ageing.py | 37 ++++++++++++++----- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.js b/erpnext/stock/report/stock_ageing/stock_ageing.js index aad8df426a..ccde61a167 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.js +++ b/erpnext/stock/report/stock_ageing/stock_ageing.js @@ -37,8 +37,8 @@ frappe.query_reports["Stock Ageing"] = { "options": "Brand" }, { - "fieldname":"show_ageing_warehouse_wise", - "label": __("Show Ageing Warehouse-wise"), + "fieldname":"show_warehouse_wise_stock", + "label": __("Show Warehouse-wise Stock"), "fieldtype": "Check", "default": 0 } diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index f81e1c0b91..54498934b3 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -14,7 +14,7 @@ def execute(filters=None): to_date = filters["to_date"] data = [] for item, item_dict in iteritems(item_details): - fifo_queue = item_dict["fifo_queue"] + fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) details = item_dict["details"] if not fifo_queue: continue @@ -25,7 +25,7 @@ def execute(filters=None): row = [details.name, details.item_name, details.description, details.item_group, details.brand] - if filters.get("show_ageing_warehouse_wise"): + if filters.get("show_warehouse_wise_stock"): row.append(details.warehouse) row.extend([item_dict.get("total_qty"), average_age, @@ -80,7 +80,7 @@ def get_columns(filters): "width": 100 }] - if filters.get("show_ageing_warehouse_wise"): + if filters.get("show_warehouse_wise_stock"): columns +=[{ "label": _("Warehouse"), "fieldname": "warehouse", @@ -127,16 +127,34 @@ def get_columns(filters): def get_fifo_queue(filters): item_details = {} - for d in get_stock_ledger_entries(filters): - key = (d.name, d.warehouse) if filters.get('show_ageing_warehouse_wise') else d.name + transfered_item_details = {} + + sle = get_stock_ledger_entries(filters) + + for d in sle: + key = (d.name, d.warehouse) if filters.get('show_warehouse_wise_stock') else d.name item_details.setdefault(key, {"details": d, "fifo_queue": []}) fifo_queue = item_details[key]["fifo_queue"] + transfered_item_details.setdefault((d.voucher_no, d.name), []) + if d.voucher_type == "Stock Reconciliation": d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) if d.actual_qty > 0: - fifo_queue.append([d.actual_qty, d.posting_date]) + if filters.get('show_warehouse_wise_stock') and transfered_item_details.get((d.voucher_no, d.name)): + qty_to_add = d.actual_qty + while qty_to_add: + batch = transfered_item_details[(d.voucher_no, d.name)][0] + if 0 < batch[0] <= qty_to_add: + qty_to_add -= batch[0] + fifo_queue.append(batch) + transfered_item_details[((d.voucher_no, d.name))].pop(0) + else: + batch[0] -= qty_to_add + fifo_queue.append([qty_to_add, batch[1]]) + else: + fifo_queue.append([d.actual_qty, d.posting_date]) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: @@ -145,10 +163,11 @@ def get_fifo_queue(filters): # if batch qty > 0 # not enough or exactly same qty in current batch, clear batch qty_to_pop -= batch[0] - fifo_queue.pop(0) + transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) else: # all from current batch batch[0] -= qty_to_pop + transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) qty_to_pop = 0 item_details[key]["qty_after_transaction"] = d.qty_after_transaction @@ -163,7 +182,7 @@ def get_fifo_queue(filters): def get_stock_ledger_entries(filters): return frappe.db.sql("""select item.name, item.item_name, item_group, brand, description, item.stock_uom, - actual_qty, posting_date, voucher_type, qty_after_transaction, warehouse + actual_qty, posting_date, voucher_type, voucher_no, qty_after_transaction, warehouse from `tabStock Ledger Entry` sle, (select name, item_name, description, stock_uom, brand, item_group from `tabItem` {item_conditions}) item @@ -171,7 +190,7 @@ def get_stock_ledger_entries(filters): company = %(company)s and posting_date <= %(to_date)s {sle_conditions} - order by posting_date, posting_time, sle.creation"""\ + order by posting_date, posting_time, sle.creation, actual_qty"""\ .format(item_conditions=get_item_conditions(filters), sle_conditions=get_sle_conditions(filters)), filters, as_dict=True) From 4a7f370b15d547d0c8c7a4c9bec8e6f706c485e5 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 16 Jul 2019 16:08:50 +0530 Subject: [PATCH 3/6] fix: Consider serial no and batches in Stock ageing report --- .../stock/report/stock_ageing/stock_ageing.py | 69 +++++++++++++------ 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 54498934b3..7529ae6aa7 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -16,8 +16,9 @@ def execute(filters=None): for item, item_dict in iteritems(item_details): fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1]) details = item_dict["details"] - if not fifo_queue: continue + if not fifo_queue or (not item_dict.get("total_qty")): continue + print(fifo_queue) average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) @@ -39,8 +40,13 @@ def get_average_age(fifo_queue, to_date): batch_age = age_qty = total_qty = 0.0 for batch in fifo_queue: batch_age = date_diff(to_date, batch[1]) - age_qty += batch_age * batch[0] - total_qty += batch[0] + + if type(batch[0]) in ['int', 'float']: + age_qty += batch_age * batch[0] + total_qty += batch[0] + else: + age_qty += batch_age * 1 + total_qty += 1 return (age_qty / total_qty) if total_qty else 0.0 @@ -128,6 +134,7 @@ def get_columns(filters): def get_fifo_queue(filters): item_details = {} transfered_item_details = {} + serial_no_batch_purchase_details = {} sle = get_stock_ledger_entries(filters) @@ -142,7 +149,7 @@ def get_fifo_queue(filters): d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) if d.actual_qty > 0: - if filters.get('show_warehouse_wise_stock') and transfered_item_details.get((d.voucher_no, d.name)): + if transfered_item_details.get((d.voucher_no, d.name)): qty_to_add = d.actual_qty while qty_to_add: batch = transfered_item_details[(d.voucher_no, d.name)][0] @@ -154,21 +161,43 @@ def get_fifo_queue(filters): batch[0] -= qty_to_add fifo_queue.append([qty_to_add, batch[1]]) else: - fifo_queue.append([d.actual_qty, d.posting_date]) - else: - qty_to_pop = abs(d.actual_qty) - while qty_to_pop: - batch = fifo_queue[0] if fifo_queue else [0, None] - if 0 < batch[0] <= qty_to_pop: - # if batch qty > 0 - # not enough or exactly same qty in current batch, clear batch - qty_to_pop -= batch[0] - transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) + if d.serial_no or d.batch_no: + if d.serial_no: + for no in d.serial_no.split("\n"): + if serial_no_batch_purchase_details.get(no): + fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) + else: + serial_no_batch_purchase_details.setdefault(no, d.posting_date) + fifo_queue.append([no, d.posting_date]) + else: + if serial_no_batch_purchase_details.get(d.batch_no): + fifo_queue.append([d.batch_no, serial_no_batch_purchase_details.get(d.batch_no)]) + else: + serial_no_batch_purchase_details.setdefault(d.batch_no, d.posting_date) + fifo_queue.append([d.batch_no, d.posting_date]) + else: - # all from current batch - batch[0] -= qty_to_pop - transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) - qty_to_pop = 0 + fifo_queue.append([d.actual_qty, d.posting_date]) + else: + if d.serial_no or d.batch_no: + serial_no_list = d.serial_no.split("\n") + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) + else: + qty_to_pop = abs(d.actual_qty) + while qty_to_pop: + batch = fifo_queue[0] if fifo_queue else [0, None] + if 0 < batch[0] <= qty_to_pop: + # if batch qty > 0 + # not enough or exactly same qty in current batch, clear batch + qty_to_pop -= batch[0] + transfered_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0)) + else: + # all from current batch + batch[0] -= qty_to_pop + transfered_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]]) + qty_to_pop = 0 item_details[key]["qty_after_transaction"] = d.qty_after_transaction @@ -182,7 +211,7 @@ def get_fifo_queue(filters): def get_stock_ledger_entries(filters): return frappe.db.sql("""select item.name, item.item_name, item_group, brand, description, item.stock_uom, - actual_qty, posting_date, voucher_type, voucher_no, qty_after_transaction, warehouse + actual_qty, posting_date, voucher_type, voucher_no, serial_no, batch_no, qty_after_transaction, warehouse from `tabStock Ledger Entry` sle, (select name, item_name, description, stock_uom, brand, item_group from `tabItem` {item_conditions}) item @@ -190,7 +219,7 @@ def get_stock_ledger_entries(filters): company = %(company)s and posting_date <= %(to_date)s {sle_conditions} - order by posting_date, posting_time, sle.creation, actual_qty"""\ + order by posting_date, posting_time, sle.creation, actual_qty""" #nosec .format(item_conditions=get_item_conditions(filters), sle_conditions=get_sle_conditions(filters)), filters, as_dict=True) From 3877b5407cdd1c2caa4b76922031c8c4183ff59a Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 22 Jul 2019 15:30:18 +0530 Subject: [PATCH 4/6] fix: Remove batch --- .../stock/report/stock_ageing/stock_ageing.py | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 7529ae6aa7..790cd8fc26 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -6,6 +6,7 @@ import frappe from frappe import _ from frappe.utils import date_diff, flt from six import iteritems +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos def execute(filters=None): @@ -18,7 +19,6 @@ def execute(filters=None): details = item_dict["details"] if not fifo_queue or (not item_dict.get("total_qty")): continue - print(fifo_queue) average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) @@ -151,39 +151,27 @@ def get_fifo_queue(filters): if d.actual_qty > 0: if transfered_item_details.get((d.voucher_no, d.name)): qty_to_add = d.actual_qty - while qty_to_add: - batch = transfered_item_details[(d.voucher_no, d.name)][0] - if 0 < batch[0] <= qty_to_add: - qty_to_add -= batch[0] - fifo_queue.append(batch) - transfered_item_details[((d.voucher_no, d.name))].pop(0) - else: - batch[0] -= qty_to_add - fifo_queue.append([qty_to_add, batch[1]]) + batch = transfered_item_details[(d.voucher_no, d.name)][0] + fifo_queue.append(batch) + transfered_item_details[((d.voucher_no, d.name))].pop(0) else: - if d.serial_no or d.batch_no: + if d.serial_no: if d.serial_no: - for no in d.serial_no.split("\n"): + for no in get_serial_nos(d.serial_no): if serial_no_batch_purchase_details.get(no): fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) else: serial_no_batch_purchase_details.setdefault(no, d.posting_date) fifo_queue.append([no, d.posting_date]) - else: - if serial_no_batch_purchase_details.get(d.batch_no): - fifo_queue.append([d.batch_no, serial_no_batch_purchase_details.get(d.batch_no)]) - else: - serial_no_batch_purchase_details.setdefault(d.batch_no, d.posting_date) - fifo_queue.append([d.batch_no, d.posting_date]) - else: fifo_queue.append([d.actual_qty, d.posting_date]) else: if d.serial_no or d.batch_no: - serial_no_list = d.serial_no.split("\n") - for serial_no in fifo_queue: - if serial_no[0] in serial_no_list: - fifo_queue.remove(serial_no) + if d.serial_no: + serial_no_list = d.serial_no.split("\n") + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: From d9cc84892be7cafac01540a9124b95d65c7a7153 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 22 Jul 2019 15:56:41 +0530 Subject: [PATCH 5/6] fix: Use get_serial_no and remove batch --- erpnext/stock/report/stock_ageing/stock_ageing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 790cd8fc26..91ba463683 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -166,9 +166,9 @@ def get_fifo_queue(filters): else: fifo_queue.append([d.actual_qty, d.posting_date]) else: - if d.serial_no or d.batch_no: + if d.serial_no: if d.serial_no: - serial_no_list = d.serial_no.split("\n") + serial_no_list = get_serial_nos(d.serial_no) for serial_no in fifo_queue: if serial_no[0] in serial_no_list: fifo_queue.remove(serial_no) From a19d1d692658d7377aebd27974d76753cabaf6a4 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 23 Jul 2019 08:30:09 +0530 Subject: [PATCH 6/6] fix: Fixes in stock ageing report --- .../stock/report/stock_ageing/stock_ageing.py | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 91ba463683..83a1d7b62b 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -148,30 +148,28 @@ def get_fifo_queue(filters): if d.voucher_type == "Stock Reconciliation": d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0)) + serial_no_list = get_serial_nos(d.serial_no) if d.serial_no else [] + if d.actual_qty > 0: if transfered_item_details.get((d.voucher_no, d.name)): - qty_to_add = d.actual_qty batch = transfered_item_details[(d.voucher_no, d.name)][0] fifo_queue.append(batch) transfered_item_details[((d.voucher_no, d.name))].pop(0) else: - if d.serial_no: - if d.serial_no: - for no in get_serial_nos(d.serial_no): - if serial_no_batch_purchase_details.get(no): - fifo_queue.append([no, serial_no_batch_purchase_details.get(no)]) - else: - serial_no_batch_purchase_details.setdefault(no, d.posting_date) - fifo_queue.append([no, d.posting_date]) + if serial_no_list: + for serial_no in serial_no_list: + if serial_no_batch_purchase_details.get(serial_no): + fifo_queue.append([serial_no, serial_no_batch_purchase_details.get(serial_no)]) + else: + serial_no_batch_purchase_details.setdefault(serial_no, d.posting_date) + fifo_queue.append([serial_no, d.posting_date]) else: fifo_queue.append([d.actual_qty, d.posting_date]) else: - if d.serial_no: - if d.serial_no: - serial_no_list = get_serial_nos(d.serial_no) - for serial_no in fifo_queue: - if serial_no[0] in serial_no_list: - fifo_queue.remove(serial_no) + if serial_no_list: + for serial_no in fifo_queue: + if serial_no[0] in serial_no_list: + fifo_queue.remove(serial_no) else: qty_to_pop = abs(d.actual_qty) while qty_to_pop: