Merge pull request #34065 from barredterra/print-rfq-letterhead

fix: change parameter name for letter head
This commit is contained in:
rohitwaghchaure 2023-02-15 09:31:06 +05:30 committed by GitHub
commit 2e43123048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 18 deletions

View File

@ -124,12 +124,11 @@ frappe.ui.form.on("Request for Quotation",{
frappe.urllib.get_full_url( frappe.urllib.get_full_url(
"/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?" + "/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?" +
new URLSearchParams({ new URLSearchParams({
doctype: frm.doc.doctype,
name: frm.doc.name, name: frm.doc.name,
supplier: data.supplier, supplier: data.supplier,
print_format: data.print_format || "Standard", print_format: data.print_format || "Standard",
language: data.language || frappe.boot.lang, language: data.language || frappe.boot.lang,
letter_head: data.letter_head || frm.doc.letter_head || "", letterhead: data.letter_head || frm.doc.letter_head || "",
}).toString() }).toString()
) )
); );

View File

@ -3,6 +3,7 @@
import json import json
from typing import Optional
import frappe import frappe
from frappe import _ from frappe import _
@ -388,24 +389,26 @@ def create_rfq_items(sq_doc, supplier, data):
@frappe.whitelist() @frappe.whitelist()
def get_pdf(doctype, name, supplier, print_format=None, language=None, letter_head=None): def get_pdf(
# permissions get checked in `download_pdf` name: str,
if doc := get_rfq_doc(doctype, name, supplier): supplier: str,
download_pdf( print_format: Optional[str] = None,
doctype, language: Optional[str] = None,
name, letterhead: Optional[str] = None,
print_format, ):
doc=doc, doc = frappe.get_doc("Request for Quotation", name)
language=language,
letter_head=letter_head or None,
)
def get_rfq_doc(doctype, name, supplier):
if supplier: if supplier:
doc = frappe.get_doc(doctype, name)
doc.update_supplier_part_no(supplier) doc.update_supplier_part_no(supplier)
return doc
# permissions get checked in `download_pdf`
download_pdf(
doc.doctype,
doc.name,
print_format,
doc=doc,
language=language,
letterhead=letterhead or None,
)
@frappe.whitelist() @frappe.whitelist()

View File

@ -8,6 +8,7 @@ from frappe.utils import nowdate
from erpnext.buying.doctype.request_for_quotation.request_for_quotation import ( from erpnext.buying.doctype.request_for_quotation.request_for_quotation import (
create_supplier_quotation, create_supplier_quotation,
get_pdf,
make_supplier_quotation_from_rfq, make_supplier_quotation_from_rfq,
) )
from erpnext.crm.doctype.opportunity.opportunity import make_request_for_quotation as make_rfq from erpnext.crm.doctype.opportunity.opportunity import make_request_for_quotation as make_rfq
@ -124,6 +125,11 @@ class TestRequestforQuotation(FrappeTestCase):
rfq.status = "Draft" rfq.status = "Draft"
rfq.submit() rfq.submit()
def test_get_pdf(self):
rfq = make_request_for_quotation()
get_pdf(rfq.name, rfq.get("suppliers")[0].supplier)
self.assertEqual(frappe.local.response.type, "pdf")
def make_request_for_quotation(**args): def make_request_for_quotation(**args):
""" """