From 0f4c5dd26cff47c2a6387a5b349d27566daf27f2 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 4 Nov 2024 14:14:49 +0530 Subject: [PATCH] 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"]}, ], }