Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes

Browse Source 
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
This commit is contained in:
Rushabh Mehta 2016-07-04 10:59:11 +05:30 committed by GitHub
commit 6703792472
6 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -177,11 +177,10 @@ def make_supplier_quotation(source_name, for_supplier, target_doc=None):
}, },
"Request for Quotation Item": { "Request for Quotation Item": {
"doctype": "Supplier Quotation Item", "doctype": "Supplier Quotation Item",
"field_map": [ "field_map": {
["name", "request_for_quotation_item"], "name": "request_for_quotation_item",
["parent", "request_for_quotation"], "parent": "request_for_quotation"
["uom", "uom"] },
],
} }
}, target_doc, postprocess) }, target_doc, postprocess)

8
erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
View File

@ -469,11 +469,11 @@
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request", "label": "Material Request",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"options": "Material Request", "options": "Material Request",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"report_hide": 0, "report_hide": 0,
@ -519,7 +519,7 @@
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request Item", "label": "Material Request Item",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
@ -626,7 +626,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-06-28 14:25:08.330508", "modified": "2016-07-01 01:07:59.541478",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Request for Quotation Item", "name": "Request for Quotation Item",

20
erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
View File

@ -3,6 +3,7 @@
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"autoname": "hash", "autoname": "hash",
"beta": 0,
"creation": "2013-05-22 12:43:10", "creation": "2013-05-22 12:43:10",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
@ -854,16 +855,16 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "prevdoc_docname", "fieldname": "material_request",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request No", "label": "Material Request",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"oldfieldname": "prevdoc_docname", "oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Material Request", "options": "Material Request",
@ -932,16 +933,16 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"fieldname": "prevdoc_detail_docname", "fieldname": "material_request_item",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1, "hidden": 1,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request Detail No", "label": "Material Request Item",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"oldfieldname": "prevdoc_detail_docname", "oldfieldname": "prevdoc_detail_docname",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
@ -1091,20 +1092,23 @@
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 1, "idx": 1,
"image_view": 0,
"in_create": 0, "in_create": 0,
"in_dialog": 0, "in_dialog": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-03-25 17:01:59.632826", "modified": "2016-07-01 01:07:29.202856",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation Item", "name": "Supplier Quotation Item",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC",
"track_seen": 0
} }

1
erpnext/patches.txt
View File

@ -283,3 +283,4 @@ erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetime
erpnext.patches.v7_0.remove_doctypes_and_reports erpnext.patches.v7_0.remove_doctypes_and_reports
erpnext.patches.v7_0.set_is_group_for_warehouse erpnext.patches.v7_0.set_is_group_for_warehouse
erpnext.patches.v7_0.update_maintenance_module_in_doctype erpnext.patches.v7_0.update_maintenance_module_in_doctype
erpnext.patches.v7_0.update_prevdoc_values_for_supplier_quotation_item

8
erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py Normal file
View File

@ -0,0 +1,8 @@
import frappe
from frappe.utils import cint
def execute():
for data in frappe.db.sql(""" select prevdoc_docname, prevdoc_detail_docname, name
from `tabSupplier Quotation Item` where prevdoc_docname is not null""", as_dict=True):
frappe.db.set_value("Supplier Quotation Item", data.name, "material_request", data.prevdoc_docname)
frappe.db.set_value("Supplier Quotation Item", data.name, "material_request_item", data.prevdoc_detail_docname)

5
erpnext/stock/doctype/material_request/material_request.py
View File

@ -321,9 +321,8 @@ def make_supplier_quotation(source_name, target_doc=None):
"Material Request Item": { "Material Request Item": {
"doctype": "Supplier Quotation Item", "doctype": "Supplier Quotation Item",
"field_map": { "field_map": {
"name": "prevdoc_detail_docname", "name": "material_request_item",
"parent": "prevdoc_docname", "parent": "material_request"
"parenttype": "prevdoc_doctype"
} }
} }
}, target_doc, postprocess) }, target_doc, postprocess)