From e82ea12cbc19f52491b4fdc3922abd829ab07f40 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 3 May 2024 18:34:27 +0530
Subject: [PATCH] fix: Cost center not getting saved in PSOA

(cherry picked from commit 58f70396307846ac014398f3016cc94c0318d656)

# Conflicts:
#	erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
#	erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
---
 .../psoa_cost_center/psoa_cost_center.json      |  8 +++++++-
 .../psoa_cost_center/psoa_cost_center.py        | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
index e292b60d68d..9a19ff9ad90 100644
--- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
+++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
@@ -11,13 +11,19 @@
   {
    "fieldname": "cost_center_name",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Cost Center",
-   "options": "Cost Center"
+   "options": "Cost Center",
+   "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2020-08-03 16:56:45.744905",
+=======
+ "modified": "2024-05-03 17:16:51.666461",
+>>>>>>> 58f7039630 (fix: Cost center not getting saved in PSOA)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "PSOA Cost Center",
diff --git a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
index 877998a187c..275d57a336f 100644
--- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
+++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
@@ -7,4 +7,21 @@ from frappe.model.document import Document
 
 
 class PSOACostCenter(Document):
+<<<<<<< HEAD
+=======
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		cost_center_name: DF.Link
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+	# end: auto-generated types
+
+>>>>>>> 58f7039630 (fix: Cost center not getting saved in PSOA)
 	pass