From eaf09503a998ef27aec916b1b3acf7ec720bec07 Mon Sep 17 00:00:00 2001 From: Vishal Date: Wed, 9 Nov 2022 12:47:34 +0530 Subject: [PATCH] fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt (cherry picked from commit 71412f6877b558a84f5e8a60ba9822a89147d6f0) --- .../doctype/sales_invoice/sales_invoice.py | 2 ++ .../sales_order_item/sales_order_item.json | 15 ++++++++++++++- .../stock/doctype/delivery_note/delivery_note.py | 2 ++ .../delivery_note/delivery_note_dashboard.py | 3 +++ .../delivery_note_item/delivery_note_item.json | 15 ++++++++++++++- .../material_request_dashboard.py | 1 + 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 51df37044d5..4748826ec37 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -2071,6 +2071,8 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None): if source.doctype == "Purchase Order Item" and target.doctype == "Sales Order Item": target.purchase_order = source.parent target.purchase_order_item = source.name + target.material_request = source.material_request + target.material_request_item = source.material_request_item if ( source.get("purchase_order") diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 8c7c5520a40..5b0b3958da6 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -95,8 +95,10 @@ "item_tax_rate", "transaction_date", "inter_transfer_reference_section", + "material_request", "purchase_order", "column_break_89", + "material_request_item", "purchase_order_item" ], "fields": [ @@ -847,7 +849,18 @@ "label": "quotation_item", "no_copy": 1, "read_only": 1 - } + }, + { + "fieldname": "material_request", + "fieldtype": "Link", + "label": "Material Request", + "options": "Material Request" + }, + { + "fieldname": "material_request_item", + "fieldtype": "Data", + "label": "Material Request Item" + } ], "idx": 1, "istable": 1, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 9dd28dc60b3..a1df764ea9d 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -902,6 +902,8 @@ def make_inter_company_transaction(doctype, source_name, target_doc=None): "serial_no": "serial_no", "purchase_order": "purchase_order", "purchase_order_item": "purchase_order_item", + "material_request": "material_request", + "Material_request_item": "material_request_item", }, "field_no_map": ["warehouse"], }, diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py index fd44e9cee5c..ba816cef9b5 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py @@ -11,11 +11,14 @@ def get_data(): }, "internal_links": { "Sales Order": ["items", "against_sales_order"], + "Material Request": ["items", "material_request"], + "Purchase Order": ["items", "purchase_order"] }, "transactions": [ {"label": _("Related"), "items": ["Sales Invoice", "Packing Slip", "Delivery Trip"]}, {"label": _("Reference"), "items": ["Sales Order", "Shipment", "Quality Inspection"]}, {"label": _("Returns"), "items": ["Stock Entry"]}, {"label": _("Subscription"), "items": ["Auto Repeat"]}, + {"label": _("Internal Transfer"), "items": ["Material Request", "Purchase Order"]} ], } diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index 32294630700..916ab2a05be 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -88,9 +88,11 @@ "allow_zero_valuation_rate", "column_break_71", "internal_transfer_section", + "material_request", "purchase_order", "column_break_82", "purchase_order_item", + "material_request_item", "accounting_dimensions_section", "cost_center", "dimension_col_break", @@ -818,13 +820,24 @@ "fieldtype": "Check", "label": "Has Item Scanned", "read_only": 1 + }, + { + "fieldname": "material_request", + "fieldtype": "Link", + "label": "Material Request", + "options": "Material Request" + }, + { + "fieldname": "material_request_item", + "fieldtype": "Data", + "label": "Material Request Item" } ], "idx": 1, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-11-02 12:54:07.225623", + "modified": "2022-11-09 12:17:50.850142", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item", diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py index 691a8b39b1b..2bba52a4e25 100644 --- a/erpnext/stock/doctype/material_request/material_request_dashboard.py +++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py @@ -14,5 +14,6 @@ def get_data(): }, {"label": _("Stock"), "items": ["Stock Entry", "Purchase Receipt", "Pick List"]}, {"label": _("Manufacturing"), "items": ["Work Order"]}, + {"label": _("Internal Transfer"), "items": ["Sales Order"]}, ], }