nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source 
Stock Reservation Entry is unavailable in v14
This commit is contained in:
ruthra kumar
2024-11-04 14:14:49 +05:30
parent 7906c21bdf
commit 0f4c5dd26c
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
View File

@@ -30,14 +30,10 @@ def get_data():
"label": _("Manufacturing"), "label": _("Manufacturing"),
"items": ["Material Request", "BOM", "Production Plan", "Blanket Order"], "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"), "label": _("Sub-contracting"),
"items": ["Subcontracting Order", "Subcontracting Receipt", "Stock Entry"], "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"]},
], ],
} }

5
erpnext/selling/doctype/sales_order/sales_order_dashboard.py
View File

@@ -24,13 +24,8 @@ def get_data():
}, },
{"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]}, {"label": _("Purchasing"), "items": ["Material Request", "Purchase Order"]},
{"label": _("Projects"), "items": ["Project"]}, {"label": _("Projects"), "items": ["Project"]},
<<<<<<< HEAD
{"label": _("Manufacturing"), "items": ["Work Order"]},
{"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]}, {"label": _("Reference"), "items": ["Quotation", "Auto Repeat"]},
=======
{"label": _("Manufacturing"), "items": ["Work Order", "BOM", "Blanket Order"]}, {"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"]}, {"label": _("Payment"), "items": ["Payment Entry", "Payment Request", "Journal Entry"]},
], ],
} }