CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: production analytics report

Browse Source 
(cherry picked from commit 772e9ecfaa)
This commit is contained in:
Mihir Kandoi
2025-03-05 13:48:34 +05:30
committed by Mergify
parent aaf35c5df9
commit 5668795884
1 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
erpnext/manufacturing/report/production_analytics/production_analytics.py
View File

@@ -4,7 +4,7 @@
import frappe import frappe
from frappe import _, scrub from frappe import _, scrub
from frappe.utils import getdate from frappe.utils import getdate, today
from erpnext.stock.report.stock_analytics.stock_analytics import get_period, get_period_date_ranges from erpnext.stock.report.stock_analytics.stock_analytics import get_period, get_period_date_ranges
@@ -30,7 +30,6 @@ def get_columns(filters):
def get_periodic_data(filters, entry): def get_periodic_data(filters, entry):
periodic_data = { periodic_data = {
"All Work Orders": {},
"Not Started": {}, "Not Started": {},
"Overdue": {}, "Overdue": {},
"Pending": {}, "Pending": {},
@@ -42,33 +41,26 @@ def get_periodic_data(filters, entry):
for from_date, end_date in ranges: for from_date, end_date in ranges:
period = get_period(end_date, filters) period = get_period(end_date, filters)
for d in entry: for d in entry:
if getdate(d.creation) <= getdate(from_date) or getdate(d.creation) <= getdate(end_date): if getdate(from_date) <= getdate(d.creation) <= getdate(end_date) and d.status not in [
periodic_data = update_periodic_data(periodic_data, "All Work Orders", period) "Draft",
if d.status == "Completed": "Submitted",
if getdate(d.actual_end_date) < getdate(from_date) or getdate(d.modified) < getdate( "Completed",
from_date "Stopped",
): "Closed",
periodic_data = update_periodic_data(periodic_data, "Completed", period) "Cancelled",
elif getdate(d.actual_start_date) < getdate(from_date): ]:
periodic_data = update_periodic_data(periodic_data, "Pending", period) if d.status == "Not Started":
elif getdate(d.planned_start_date) < getdate(from_date): periodic_data = update_periodic_data(periodic_data, "Not Started", period)
periodic_data = update_periodic_data(periodic_data, "Overdue", period) elif today() > getdate(d.planned_end_date):
else: periodic_data = update_periodic_data(periodic_data, "Overdue", period)
periodic_data = update_periodic_data(periodic_data, "Not Started", period) elif today() < getdate(d.planned_end_date):
periodic_data = update_periodic_data(periodic_data, "Pending", period)
elif d.status == "In Process": if (
if getdate(d.actual_start_date) < getdate(from_date): getdate(from_date) <= getdate(d.actual_end_date) <= getdate(end_date)
periodic_data = update_periodic_data(periodic_data, "Pending", period) and d.status == "Completed"
elif getdate(d.planned_start_date) < getdate(from_date): ):
periodic_data = update_periodic_data(periodic_data, "Overdue", period) periodic_data = update_periodic_data(periodic_data, "Completed", period)
else:
periodic_data = update_periodic_data(periodic_data, "Not Started", period)
elif d.status == "Not Started":
if getdate(d.planned_start_date) < getdate(from_date):
periodic_data = update_periodic_data(periodic_data, "Overdue", period)
else:
periodic_data = update_periodic_data(periodic_data, "Not Started", period)
return periodic_data return periodic_data
@@ -88,10 +80,7 @@ def get_data(filters, columns):
"Work Order", "Work Order",
fields=[ fields=[
"creation", "creation",
"modified",
"actual_start_date",
"actual_end_date", "actual_end_date",
"planned_start_date",
"planned_end_date", "planned_end_date",
"status", "status",
], ],
@@ -100,7 +89,7 @@ def get_data(filters, columns):
periodic_data = get_periodic_data(filters, entry) periodic_data = get_periodic_data(filters, entry)
labels = ["All Work Orders", "Not Started", "Overdue", "Pending", "Completed"] labels = ["Not Started", "Overdue", "Pending", "Completed"]
chart_data = get_chart_data(periodic_data, columns) chart_data = get_chart_data(periodic_data, columns)
ranges = get_period_date_ranges(filters) ranges = get_period_date_ranges(filters)
@@ -121,17 +110,15 @@ def get_data(filters, columns):
def get_chart_data(periodic_data, columns): def get_chart_data(periodic_data, columns):
labels = [d.get("label") for d in columns[1:]] labels = [d.get("label") for d in columns[1:]]
all_data, not_start, overdue, pending, completed = [], [], [], [], [] not_start, overdue, pending, completed = [], [], [], []
datasets = [] datasets = []
for d in labels: for d in labels:
all_data.append(periodic_data.get("All Work Orders").get(d))
not_start.append(periodic_data.get("Not Started").get(d)) not_start.append(periodic_data.get("Not Started").get(d))
overdue.append(periodic_data.get("Overdue").get(d)) overdue.append(periodic_data.get("Overdue").get(d))
pending.append(periodic_data.get("Pending").get(d)) pending.append(periodic_data.get("Pending").get(d))
completed.append(periodic_data.get("Completed").get(d)) completed.append(periodic_data.get("Completed").get(d))
datasets.append({"name": _("All Work Orders"), "values": all_data})
datasets.append({"name": _("Not Started"), "values": not_start}) datasets.append({"name": _("Not Started"), "values": not_start})
datasets.append({"name": _("Overdue"), "values": overdue}) datasets.append({"name": _("Overdue"), "values": overdue})
datasets.append({"name": _("Pending"), "values": pending}) datasets.append({"name": _("Pending"), "values": pending})