From 4f8a8a5e9901e3a3b8f24d195f1354e833648e3e Mon Sep 17 00:00:00 2001 From: CaseSolved Date: Wed, 25 Sep 2024 19:09:05 +0100 Subject: [PATCH 1/3] fix: SO link on PO and add in missing dashboard references on both (cherry picked from commit 2017fd80d1bf930fd5185ddb3ddb427eb73841f8) # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py # erpnext/selling/doctype/sales_order/sales_order_dashboard.py --- .../purchase_order_dashboard.py | 27 ++++++++++++++++--- .../sales_order/sales_order_dashboard.py | 7 +++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py index 05b5a8e7b8c..80b2bec2a59 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py @@ -14,15 +14,36 @@ def get_data(): "Material Request": ["items", "material_request"], "Supplier Quotation": ["items", "supplier_quotation"], "Project": ["items", "project"], + "Sales Order": ["items", "sales_order"], + "BOM": ["items", "bom"], + "Production Plan": ["items", "production_plan"], + "Blanket Order": ["items", "blanket_order"], }, "transactions": [ - {"label": _("Related"), "items": ["Purchase Receipt", "Purchase Invoice"]}, - {"label": _("Payment"), "items": ["Payment Entry", "Journal Entry", "Payment Request"]}, + { + "label": _("Related"), + "items": ["Purchase Receipt", "Purchase Invoice", "Sales Order"] + }, + { + "label": _("Payment"), + "items": ["Payment Entry", "Journal Entry", "Payment Request"] + }, { "label": _("Reference"), - "items": ["Material Request", "Supplier Quotation", "Project", "Auto Repeat"], + "items": ["Supplier Quotation", "Project", "Auto Repeat"], }, + { + "label": _("Manufacturing"), + "items": ["Material Request", "BOM", "Production Plan", "Blanket Order"], + }, +<<<<<<< HEAD {"label": _("Sub-contracting"), "items": ["Subcontracting Order", "Stock Entry"]}, {"label": _("Internal"), "items": ["Sales Order"]}, +======= + { + "label": _("Sub-contracting"), + "items": ["Subcontracting Order", "Subcontracting Receipt", "Stock Entry"], + }, +>>>>>>> 2017fd80d1 (fix: SO link on PO and add in missing dashboard references on both) ], } diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py index cbc40bbf90b..18eed5d8096 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py @@ -14,6 +14,8 @@ def get_data(): }, "internal_links": { "Quotation": ["items", "prevdoc_docname"], + "BOM": ["items", "bom_no"], + "Blanket Order": ["items", "blanket_order"], }, "transactions": [ { @@ -22,8 +24,13 @@ def get_data(): }, {"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]}, {"label": _("Projects"), "items": ["Project"]}, +<<<<<<< HEAD {"label": _("Manufacturing"), "items": ["Work Order"]}, {"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]}, +======= + {"label": _("Manufacturing"), "items": ["Work Order", "BOM", "Blanket Order"]}, + {"label": _("Reference"), "items": ["Quotation", "Auto Repeat", "Stock Reservation Entry"]}, +>>>>>>> 2017fd80d1 (fix: SO link on PO and add in missing dashboard references on both) {"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]}, ], } From 7906c21bdff2ba2424ac741166d5dde8b79e396f Mon Sep 17 00:00:00 2001 From: CaseSolved Date: Wed, 25 Sep 2024 19:27:21 +0100 Subject: [PATCH 2/3] chore: linting (cherry picked from commit be6970c850d3c81f1b32ae00ede2e49c588ab2e9) --- .../doctype/purchase_order/purchase_order_dashboard.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py index 80b2bec2a59..eba11068055 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py @@ -20,14 +20,8 @@ def get_data(): "Blanket Order": ["items", "blanket_order"], }, "transactions": [ - { - "label": _("Related"), - "items": ["Purchase Receipt", "Purchase Invoice", "Sales Order"] - }, - { - "label": _("Payment"), - "items": ["Payment Entry", "Journal Entry", "Payment Request"] - }, + {"label": _("Related"), "items": ["Purchase Receipt", "Purchase Invoice", "Sales Order"]}, + {"label": _("Payment"), "items": ["Payment Entry", "Journal Entry", "Payment Request"]}, { "label": _("Reference"), "items": ["Supplier Quotation", "Project", "Auto Repeat"], From 0f4c5dd26cff47c2a6387a5b349d27566daf27f2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 4 Nov 2024 14:14:49 +0530 Subject: [PATCH 3/3] chore: resolve conflicts Stock Reservation Entry is unavailable in v14 --- .../doctype/purchase_order/purchase_order_dashboard.py | 6 +----- .../selling/doctype/sales_order/sales_order_dashboard.py | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py index eba11068055..958d277bb84 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py @@ -30,14 +30,10 @@ def get_data(): "label": _("Manufacturing"), "items": ["Material Request", "BOM", "Production Plan", "Blanket Order"], }, -<<<<<<< HEAD - {"label": _("Sub-contracting"), "items": ["Subcontracting Order", "Stock Entry"]}, - {"label": _("Internal"), "items": ["Sales Order"]}, -======= { "label": _("Sub-contracting"), "items": ["Subcontracting Order", "Subcontracting Receipt", "Stock Entry"], }, ->>>>>>> 2017fd80d1 (fix: SO link on PO and add in missing dashboard references on both) + {"label": _("Internal"), "items": ["Sales Order"]}, ], } diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py index 18eed5d8096..03701745c56 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py @@ -24,13 +24,8 @@ def get_data(): }, {"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]}, {"label": _("Projects"), "items": ["Project"]}, -<<<<<<< HEAD - {"label": _("Manufacturing"), "items": ["Work Order"]}, {"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]}, -======= {"label": _("Manufacturing"), "items": ["Work Order", "BOM", "Blanket Order"]}, - {"label": _("Reference"), "items": ["Quotation", "Auto Repeat", "Stock Reservation Entry"]}, ->>>>>>> 2017fd80d1 (fix: SO link on PO and add in missing dashboard references on both) {"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]}, ], }