nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2024-05-06 11:52:26 +05:30
committed by GitHub
parent 6aa8d5fb4b
commit 7b9c22775c
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py
View File

@@ -7,21 +7,4 @@ 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