Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Procurement tracker #148

Merged
merged 2 commits into from
Oct 1, 2024
Merged

fix: Procurement tracker #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b1147d
requested_items_to_order_and_receive_report
Gopal8848 Oct 1, 2024
dce11d9
fix: procurement tracker report fix
Gopal8848 Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion erpnext/buying/report/procurement_tracker/procurement_tracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,25 @@ def get_po_entries(filters):
& (parent.name == child.parent)
& (parent.status.notin(("Closed", "Completed", "Cancelled")))
)
.groupby(parent.name, child.material_request_item)
.groupby(
child.name,
child.parent,
child.cost_center,
child.project,
child.warehouse,
child.material_request,
child.material_request_item,
child.item_code,
child.stock_uom,
child.qty,
child.amount,
child.base_amount,
child.schedule_date,
parent.transaction_date,
parent.supplier,
parent.status,
parent.owner,
)
)
query = apply_filters_on_query(filters, parent, child, query)

Expand Down
117 changes: 63 additions & 54 deletions ...uying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,67 +33,76 @@ def validate_filters(filters):
elif date_diff(to_date, from_date) < 0:
frappe.throw(_("To Date cannot be before From Date."))


def get_data(filters):
mr = frappe.qb.DocType("Material Request")
mr_item = frappe.qb.DocType("Material Request Item")

query = (
frappe.qb.from_(mr)
.join(mr_item)
.on(mr_item.parent == mr.name)
.select(
mr.name.as_("material_request"),
mr.transaction_date.as_("date"),
mr_item.schedule_date.as_("required_date"),
mr_item.item_code.as_("item_code"),
Sum(Coalesce(mr_item.qty, 0)).as_("qty"),
Sum(Coalesce(mr_item.stock_qty, 0)).as_("stock_qty"),
Coalesce(mr_item.uom, "").as_("uom"),
Coalesce(mr_item.stock_uom, "").as_("stock_uom"),
Sum(Coalesce(mr_item.ordered_qty, 0)).as_("ordered_qty"),
Sum(Coalesce(mr_item.received_qty, 0)).as_("received_qty"),
(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.received_qty, 0))).as_(
"qty_to_receive"
),
Sum(Coalesce(mr_item.received_qty, 0)).as_("received_qty"),
(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.ordered_qty, 0))).as_("qty_to_order"),
mr_item.item_name,
mr_item.description,
mr.company,
)
.where(
(mr.material_request_type == "Purchase")
& (mr.docstatus == 1)
& (mr.status != "Stopped")
& (mr.per_received < 100)
)
)

query = get_conditions(filters, query, mr, mr_item) # add conditional conditions

query = query.groupby(mr.name, mr_item.item_code).orderby(mr.transaction_date, mr.schedule_date)
data = query.run(as_dict=True)
return data
mr = frappe.qb.DocType("Material Request")
mr_item = frappe.qb.DocType("Material Request Item")

query = (
frappe.qb.from_(mr)
.join(mr_item)
.on(mr_item.parent == mr.name)
.select(
mr.name.as_("material_request"),
mr.transaction_date.as_("date"),
mr_item.schedule_date.as_("required_date"),
mr_item.item_code.as_("item_code"),
Sum(Coalesce(mr_item.qty, 0)).as_("qty"),
Sum(Coalesce(mr_item.stock_qty, 0)).as_("stock_qty"),
Coalesce(mr_item.uom, "").as_("uom"),
Coalesce(mr_item.stock_uom, "").as_("stock_uom"),
Sum(Coalesce(mr_item.ordered_qty, 0)).as_("ordered_qty"),
Sum(Coalesce(mr_item.received_qty, 0)).as_("received_qty"),
(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.received_qty, 0))).as_(
"qty_to_receive"
),
(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.ordered_qty, 0))).as_("qty_to_order"),
mr_item.item_name,
mr_item.description,
mr.company,
)
.where(
(mr.material_request_type == "Purchase")
& (mr.docstatus == 1)
& (mr.status != "Stopped")
& (mr.per_received < 100)
)
)

query = get_conditions(filters, query, mr, mr_item)

# Add the missing columns to the GROUP BY clause
query = query.groupby(
mr.name,
mr.transaction_date,
mr_item.schedule_date,
mr_item.item_code,
mr_item.uom,
mr_item.stock_uom,
mr_item.item_name,
mr_item.description,
mr.company
).orderby(mr.transaction_date, mr_item.schedule_date)

data = query.run(as_dict=True)
return data


def get_conditions(filters, query, mr, mr_item):
if filters.get("from_date") and filters.get("to_date"):
query = query.where(
(mr.transaction_date >= filters.get("from_date"))
& (mr.transaction_date <= filters.get("to_date"))
)
if filters.get("company"):
query = query.where(mr.company == filters.get("company"))

if filters.get("material_request"):
query = query.where(mr.name == filters.get("material_request"))
if filters.get("from_date") and filters.get("to_date"):
query = query.where(
(mr.transaction_date >= filters.get("from_date"))
& (mr.transaction_date <= filters.get("to_date"))
)
if filters.get("company"):
query = query.where(mr.company == filters.get("company"))

if filters.get("item_code"):
query = query.where(mr_item.item_code == filters.get("item_code"))
if filters.get("material_request"):
query = query.where(mr.name == filters.get("material_request"))

return query
if filters.get("item_code"):
query = query.where(mr_item.item_code == filters.get("item_code"))

return query

def update_qty_columns(row_to_update, data_row):
fields = ["qty", "stock_qty", "ordered_qty", "received_qty", "qty_to_receive", "qty_to_order"]
Expand Down
Loading