nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-23 16:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicting issue

Browse Source
This commit is contained in:
khushi8112
2026-04-13 15:30:56 +05:30
parent bb77018f7b
commit 57e458cc1e
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/accounts_controller.py
View File

@@ -4423,11 +4423,8 @@ def update_doc_company_address(current_doctype, docname, company_address, detail
"Sales Invoice": ("company_address", "company_address_display"), "Sales Invoice": ("company_address", "company_address_display"),
"Delivery Note": ("company_address", "company_address_display"), "Delivery Note": ("company_address", "company_address_display"),
"POS Invoice": ("company_address", "company_address_display"), "POS Invoice": ("company_address", "company_address_display"),
<<<<<<< HEAD
=======
"Quotation": ("company_address", "company_address_display"), "Quotation": ("company_address", "company_address_display"),
"Request for Quotation": ("shipping_address", "shipping_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( address_field, display_field = address_field_map.get(

3
erpnext/public/js/print.js
View File

@@ -5,11 +5,8 @@ const doctype_list = [
"Purchase Order", "Purchase Order",
"Purchase Invoice", "Purchase Invoice",
"POS Invoice", "POS Invoice",
<<<<<<< HEAD
=======
"Quotation", "Quotation",
"Request for Quotation", "Request for Quotation",
>>>>>>> 4307cd5b1c (feat: default print format for Quotation)
]; ];
const allowed_print_formats = [ const allowed_print_formats = [
"Sales Order Standard", "Sales Order Standard",

3
erpnext/setup/install.py
View File

@@ -310,11 +310,8 @@ def set_default_print_formats():
"Purchase Order": "Purchase Order with Item Image", "Purchase Order": "Purchase Order with Item Image",
"Purchase Invoice": "Purchase Invoice with Item Image", "Purchase Invoice": "Purchase Invoice with Item Image",
"POS Invoice": "POS Invoice with Item Image", "POS Invoice": "POS Invoice with Item Image",
<<<<<<< HEAD
=======
"Quotation": "Quotation with Item Image", "Quotation": "Quotation with Item Image",
"Request for Quotation": "Request for 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(): for doctype, print_format in default_map.items():