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

Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop

Browse Source 
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
This commit is contained in:
rohitwaghchaure 2021-06-21 22:36:03 +05:30 committed by GitHub
commit 82adb4f16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,19 +317,21 @@ def add_items(sq_doc, supplier, items):
create_rfq_items(sq_doc, supplier, data) create_rfq_items(sq_doc, supplier, data)
def create_rfq_items(sq_doc, supplier, data): def create_rfq_items(sq_doc, supplier, data):
sq_doc.append('items', { args = {}
"item_code": data.item_code,
"item_name": data.item_name, for field in ['item_code', 'item_name', 'description', 'qty', 'rate', 'conversion_factor',
"description": data.description, 'warehouse', 'material_request', 'material_request_item', 'stock_qty']:
"qty": data.qty, args[field] = data.get(field)
"rate": data.rate,
"conversion_factor": data.conversion_factor if data.conversion_factor else None, args.update({
"supplier_part_no": frappe.db.get_value("Item Supplier", {'parent': data.item_code, 'supplier': supplier}, "supplier_part_no"),
"warehouse": data.warehouse or '',
"request_for_quotation_item": data.name, "request_for_quotation_item": data.name,
"request_for_quotation": data.parent "request_for_quotation": data.parent,
"supplier_part_no": frappe.db.get_value("Item Supplier",
{'parent': data.item_code, 'supplier': supplier}, "supplier_part_no")
}) })
sq_doc.append('items', args)
@frappe.whitelist() @frappe.whitelist()
def get_pdf(doctype, name, supplier): def get_pdf(doctype, name, supplier):
doc = get_rfq_doc(doctype, name, supplier) doc = get_rfq_doc(doctype, name, supplier)

8
erpnext/templates/includes/transaction_row.html
View File

@ -13,9 +13,11 @@
{{ doc.items_preview }} {{ doc.items_preview }}
</div> </div>
</div> </div>
<div class="col-sm-3 text-right bold"> {% if doc.get('grand_total') %}
{{ doc.get_formatted("grand_total") }} <div class="col-sm-3 text-right bold">
</div> {{ doc.get_formatted("grand_total") }}
</div>
{% endif %}
</div> </div>
<a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a> <a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a>
</div> </div>