From fc05cc4e70911444563f11910a0ef31c4dcd31f1 Mon Sep 17 00:00:00 2001 From: Vishal Date: Thu, 25 Jan 2018 15:27:35 +0530 Subject: [PATCH] [fix] link with supplier quotation to purchase order --- .../supplier_quotation/supplier_quotation.py | 3 +- .../supplier_quotation_item.json | 33 ++++++++++++++++++- .../material_request/material_request.py | 3 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py index c395d0cfd7..b221a08959 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py @@ -124,7 +124,8 @@ def make_purchase_order(source_name, target_doc=None): ["name", "supplier_quotation_item"], ["parent", "supplier_quotation"], ["material_request", "material_request"], - ["material_request_item", "material_request_item"] + ["material_request_item", "material_request_item"], + ["sales_order", "sales_order"] ], "postprocess": update_item }, diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index b3a55b645d..da78c12ba0 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -1326,6 +1326,37 @@ "unique": 0, "width": "120px" }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "sales_order", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Sales Order", + "length": 0, + "no_copy": 0, + "options": "Sales Order", + "permlevel": 0, + "precision": "", + "print_hide": 1, + "print_hide_if_no_value": 0, + "read_only": 1, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 1, + "set_only_once": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1614,7 +1645,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2017-12-14 09:37:47.427897", + "modified": "2018-01-25 15:04:40.171617", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation Item", diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index c4059c1848..defce62e2e 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -345,7 +345,8 @@ def make_supplier_quotation(source_name, target_doc=None): "doctype": "Supplier Quotation Item", "field_map": { "name": "material_request_item", - "parent": "material_request" + "parent": "material_request", + "sales_order": "sales_order" } } }, target_doc, postprocess)