mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-07 23:31:20 +00:00
fix: Cost center not getting saved in PSOA
(cherry picked from commit 58f7039630)
# Conflicts:
# erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
# erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
This commit is contained in:
@@ -11,13 +11,19 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "cost_center_name",
|
"fieldname": "cost_center_name",
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
|
"in_list_view": 1,
|
||||||
"label": "Cost Center",
|
"label": "Cost Center",
|
||||||
"options": "Cost Center"
|
"options": "Cost Center",
|
||||||
|
"reqd": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2020-08-03 16:56:45.744905",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "PSOA Cost Center",
|
"name": "PSOA Cost Center",
|
||||||
|
|||||||
@@ -7,4 +7,21 @@ from frappe.model.document import Document
|
|||||||
|
|
||||||
|
|
||||||
class PSOACostCenter(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
|
pass
|
||||||
|
|||||||
Reference in New Issue
Block a user