From 8e9ddb7a698266b287606a6c1e8c995025cf8fdb Mon Sep 17 00:00:00 2001
From: diptanilsaha <diptanil@frappe.io>
Date: Wed, 9 Apr 2025 11:37:51 +0530
Subject: [PATCH 1/2] fix: added missing project field on pos profile

(cherry picked from commit 821d64241af6ad4672390b599b741349f882461d)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.json
---
 .../doctype/pos_profile/pos_profile.json      | 20 ++++++++++++++++---
 .../doctype/pos_profile/pos_profile.py        |  1 +
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index c38f9563eb2..1d7a962cf1f 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -56,7 +56,8 @@
   "apply_discount_on",
   "accounting_dimensions_section",
   "cost_center",
-  "dimension_col_break"
+  "dimension_col_break",
+  "project"
  ],
  "fields": [
   {
@@ -389,6 +390,14 @@
    "fieldname": "disable_grand_total_to_default_mop",
    "fieldtype": "Check",
    "label": "Disable auto setting Grand Total to default Payment Mode"
+  },
+  {
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "label": "Project",
+   "oldfieldname": "cost_center",
+   "oldfieldtype": "Link",
+   "options": "Project"
   }
  ],
  "icon": "icon-cog",
@@ -416,7 +425,7 @@
    "link_fieldname": "pos_profile"
   }
  ],
- "modified": "2025-01-29 13:12:30.796630",
+ "modified": "2025-04-09 11:35:13.779613",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile",
@@ -442,7 +451,12 @@
    "role": "Accounts User"
   }
  ],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> 821d64241a (fix: added missing project field on pos profile)
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index 2bcfb66ce73..c8049c25d07 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -54,6 +54,7 @@ class POSProfile(Document):
 		payments: DF.Table[POSPaymentMethod]
 		print_format: DF.Link | None
 		print_receipt_on_order_complete: DF.Check
+		project: DF.Link | None
 		select_print_heading: DF.Link | None
 		selling_price_list: DF.Link | None
 		tax_category: DF.Link | None

From b8ef83e1ea2473024a18ef49fbb3d2316f5f0fc7 Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Wed, 9 Apr 2025 15:39:15 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 erpnext/accounts/doctype/pos_profile/pos_profile.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 1d7a962cf1f..e74fd72d9e5 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -451,12 +451,8 @@
    "role": "Accounts User"
   }
  ],
-<<<<<<< HEAD
- "sort_field": "modified",
-=======
  "row_format": "Dynamic",
  "sort_field": "creation",
->>>>>>> 821d64241a (fix: added missing project field on pos profile)
  "sort_order": "DESC",
  "states": []
 }