From fbbc0af7bcb6f12d5c3249ff670ebe09fb81626e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 3 May 2024 18:34:27 +0530 Subject: [PATCH 1/2] fix: Cost center not getting saved in PSOA (cherry picked from commit 58f70396307846ac014398f3016cc94c0318d656) # Conflicts: # erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json --- .../doctype/psoa_cost_center/psoa_cost_center.json | 8 +++++++- .../accounts/doctype/psoa_cost_center/psoa_cost_center.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) 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 683cd78df04..61961147069 100644 --- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py +++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py @@ -15,7 +15,7 @@ class PSOACostCenter(Document): if TYPE_CHECKING: from frappe.types import DF - cost_center_name: DF.Link | None + cost_center_name: DF.Link parent: DF.Data parentfield: DF.Data parenttype: DF.Data From 0b44cebe00bc07818d99bbbed69ed994393e6022 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 6 May 2024 11:12:11 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../accounts/doctype/psoa_cost_center/psoa_cost_center.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 9a19ff9ad90..ef4a55861fb 100644 --- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json +++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json @@ -19,11 +19,7 @@ ], "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", @@ -33,4 +29,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +}