fix: resolve pick list backport conflicts

erpnext/selling/doctype/sales_order/mapper.py

@@ -12,7 +12,7 @@ from frappe.model.utils import get_fetch_values
 from frappe.query_builder.functions import Sum
 from frappe.utils import add_days, cint, flt, nowdate, strip_html
 
-from erpnext.accounts.party import CROSS_PARTY_FIELD_NO_MAP, get_party_account
+from erpnext.accounts.party import get_party_account
 from erpnext.manufacturing.doctype.production_plan.production_plan import (
 	get_items_for_material_requests,
 	get_sales_orders,
@@ -736,7 +736,16 @@ def make_purchase_order(
 			{
 				"Sales Order": {
 					"doctype": "Purchase Order",
-					"field_no_map": [*CROSS_PARTY_FIELD_NO_MAP],
+					"field_no_map": [
+						"address_display",
+						"contact_display",
+						"contact_mobile",
+						"contact_email",
+						"contact_person",
+						"taxes_and_charges",
+						"shipping_address",
+						"dispatch_address",
+					],
 					"validation": {"docstatus": ["=", 1]},
 				},
 				"Sales Order Item": {

erpnext/stock/doctype/pick_list/pick_list.js

@@ -239,14 +239,10 @@ frappe.ui.form.on("Pick List", {
 	},
 	create_delivery(frm, doctype) {
 		frappe.model.open_mapped_doc({
-<<<<<<< HEAD
-			method: "erpnext.stock.doctype.pick_list.pick_list.create_delivery_note",
-=======
 			method: "erpnext.stock.doctype.pick_list.mapper.create_delivery",
 			args: {
 				target: doctype,
 			},
->>>>>>> d6a201ed4a (feat: create sales invoice from pick list (#55594))
 			frm: frm,
 		});
 	},

erpnext/stock/doctype/pick_list/test_pick_list.py

@@ -9,15 +9,11 @@ from erpnext.selling.doctype.sales_order.sales_order import create_pick_list
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import create_item, make_item
 from erpnext.stock.doctype.packed_item.test_packed_item import create_product_bundle
-<<<<<<< HEAD
-from erpnext.stock.doctype.pick_list.pick_list import create_delivery_note, create_dn_for_pick_lists
-=======
 from erpnext.stock.doctype.pick_list.mapper import (
 	create_delivery,
 	create_delivery_note,
 	create_dn_for_pick_lists,
 )
->>>>>>> d6a201ed4a (feat: create sales invoice from pick list (#55594))
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
 	get_batch_from_bundle,