mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-11 10:55:09 +00:00
feat: default print format for Quotation
(cherry picked from commit 4307cd5b1c)
# Conflicts:
# erpnext/controllers/accounts_controller.py
# erpnext/public/js/print.js
# erpnext/setup/install.py
This commit is contained in:
@@ -4423,6 +4423,11 @@ def update_doc_company_address(current_doctype, docname, company_address, detail
|
||||
"Sales Invoice": ("company_address", "company_address_display"),
|
||||
"Delivery Note": ("company_address", "company_address_display"),
|
||||
"POS Invoice": ("company_address", "company_address_display"),
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"Quotation": ("company_address", "company_address_display"),
|
||||
"Request for Quotation": ("shipping_address", "shipping_address_display"),
|
||||
>>>>>>> 4307cd5b1c (feat: default print format for Quotation)
|
||||
}
|
||||
|
||||
address_field, display_field = address_field_map.get(
|
||||
|
||||
@@ -5,6 +5,11 @@ const doctype_list = [
|
||||
"Purchase Order",
|
||||
"Purchase Invoice",
|
||||
"POS Invoice",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"Quotation",
|
||||
"Request for Quotation",
|
||||
>>>>>>> 4307cd5b1c (feat: default print format for Quotation)
|
||||
];
|
||||
const allowed_print_formats = [
|
||||
"Sales Order Standard",
|
||||
|
||||
0
erpnext/selling/print_format/quotation/__init__.py
Normal file
0
erpnext/selling/print_format/quotation/__init__.py
Normal file
33
erpnext/selling/print_format/quotation/quotation.json
Normal file
33
erpnext/selling/print_format/quotation/quotation.json
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -310,6 +310,11 @@ def set_default_print_formats():
|
||||
"Purchase Order": "Purchase Order with Item Image",
|
||||
"Purchase Invoice": "Purchase Invoice with Item Image",
|
||||
"POS Invoice": "POS Invoice with Item Image",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"Quotation": "Quotation with Item Image",
|
||||
"Request for Quotation": "Request for Quotation with Item Image",
|
||||
>>>>>>> 4307cd5b1c (feat: default print format for Quotation)
|
||||
}
|
||||
|
||||
for doctype, print_format in default_map.items():
|
||||
|
||||
Reference in New Issue
Block a user