From 57e458cc1eee41d46bfe8767828f0a71737aae70 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 13 Apr 2026 15:30:56 +0530 Subject: [PATCH] fix: conflicting issue --- erpnext/controllers/accounts_controller.py | 3 --- erpnext/public/js/print.js | 3 --- erpnext/setup/install.py | 3 --- 3 files changed, 9 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index dfe257aa86c..febcc596868 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -4423,11 +4423,8 @@ 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( diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index b853b27f023..8e775feab96 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -5,11 +5,8 @@ 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", diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 1e46eb0c519..2007a3bf84c 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -310,11 +310,8 @@ 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():