bsiggel/espocrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor termination and rental object entities

Browse Source 
- Removed the "Kündigungen" field from the German and English rental object JSON files.
- Updated the termination JSON files to reflect new field names and structure, including renaming "kuendigungsart" to "beendigungsTatbestand" and "kuendigungsgrund" to "kuendigungsgrund" with updated options.
- Deleted the old "CKuendigung" entity definition and related metadata, consolidating functionality into "CKndigung".
- Adjusted the service logic to accommodate the new structure, ensuring proper linking of landlords and tenants.
- Updated dynamic visibility logic for fields based on conditions related to termination reasons and delivery methods.
- Cleaned up metadata definitions for both termination and rental object entities, removing unnecessary relationships and fields.
- Incremented cache and microtime values in the configuration file.
This commit is contained in:
bsiggel
2026-01-25 11:41:57 +01:00
parent 4e4597e124
commit 292a0b57b9
17 changed files with 173 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
custom/Espo/Custom/Resources/metadata/entityDefs/CKndigung.json
View File

@@ -90,32 +90,40 @@
"tooltip": true,
"isCustom": true
},
"kuendigungsart": {
"beendigungsTatbestand": {
"type": "enum",
"required": false,
"required": true,
"options": [
"Ordentlich",
"Ausserordentlich",
"Fristlos",
"AufgabeerklärungMieter"
"Kündigung Vermieter",
"Kündigung Mieter",
"Aufhebungsvertrag",
"Befristung",
"ZVG Zuschlagsbeschluss"
],
"default": "Ordentlich",
"style": {
"Kündigung Vermieter": null,
"Kündigung Mieter": null,
"Aufhebungsvertrag": null,
"Befristung": null,
"ZVG Zuschlagsbeschluss": null
},
"default": "Kündigung Vermieter",
"isCustom": true
},
"kuendigungsgrund": {
"type": "enum",
"type": "multiEnum",
"required": false,
"options": [
"Zahlungsverzug",
"Pflichtverletzung",
"Mietrückstand",
"Eigenbedarf",
"Fehlverhalten",
"Verwertung",
"VerhaltensbedingteLaermruhestoerung",
"BeschaedigungSubstanz",
"UnerlaubteUntervermietung",
"StoerendeGeschaeftsfuehrung",
"Sonstiges"
"ZVG Eigenbedarf",
"573a Abs. 1 (nicht mehr als 2 Whng.)",
"573a Abs. 2 (Einliegerwohnung)",
"GewerbeOrdentlich"
],
"tooltip": true,
"isCustom": true
},
"kuendigungsgrundDetails": {
@@ -165,44 +173,41 @@
"options": [
"Einschreiben",
"Persoenlich",
"Gerichtsvollzieher",
"Oeffentlich",
"Sonstiges"
"Bote",
"Brief"
],
"isCustom": true
},
"reaktionMieter": {
"sendungsverfolgungsnummer": {
"type": "varchar",
"required": false,
"maxLength": 100,
"tooltip": true,
"isCustom": true
},
"vorzeitigeRaeumungZulaessig": {
"type": "enum",
"required": false,
"options": [
"Nein",
"JaKeinWohnraum257ZPO",
"JaBesorgnisgrund259ZPO"
],
"default": "Nein",
"tooltip": true,
"isCustom": true
},
"beschreibungBesorgnisgrund": {
"type": "text",
"required": false,
"tooltip": true,
"isCustom": true
},
"notizen": {
"type": "text",
"required": false,
"isCustom": true
},
"rueckstandMiete": {
"type": "currency",
"required": false,
"default": 0,
"isCustom": true
},
"rueckstandNebenkosten": {
"type": "currency",
"required": false,
"default": 0,
"isCustom": true
},
"sonstigeForderungen": {
"type": "currency",
"required": false,
"default": 0,
"isCustom": true
},
"aussergerichtlicheGebuehren13": {
"mietrueckstand": {
"type": "currency",
"required": false,
"default": 0,
"tooltip": true,
"isCustom": true
}
},
@@ -254,14 +259,6 @@
"audited": false,
"isCustom": true
},
"mietobjekte": {
"type": "hasMany",
"relationName": "cMietobjektKuendigung",
"foreign": "kndigungen",
"entity": "CMietobjekt",
"audited": false,
"isCustom": true
},
"freigeschalteteNutzer": {
"type": "belongsTo",
"foreign": "cKndigungen",

338
custom/Espo/Custom/Resources/metadata/entityDefs/CKuendigung.json
View File

@@ -1,338 +0,0 @@
{
"fields": {
"name": {
"type": "varchar",
"required": true,
"pattern": "$noBadCharacters"
},
"description": {
"type": "text"
},
"createdAt": {
"type": "datetime",
"readOnly": true
},
"modifiedAt": {
"type": "datetime",
"readOnly": true
},
"createdBy": {
"type": "link",
"readOnly": true,
"view": "views/fields/user"
},
"modifiedBy": {
"type": "link",
"readOnly": true,
"view": "views/fields/user"
},
"assignedUser": {
"type": "link",
"required": false,
"view": "views/fields/assigned-user"
},
"teams": {
"type": "linkMultiple",
"view": "views/fields/teams"
},
"collaborators": {
"type": "linkMultiple",
"view": "views/fields/collaborators",
"maxCount": 30,
"fieldManagerParamList": [
"readOnly",
"readOnlyAfterCreate",
"audited",
"autocompleteOnEmpty",
"maxCount",
"inlineEditDisabled",
"tooltipText"
]
},
"kuendigungsdatum": {
"type": "date",
"required": true,
"tooltip": true,
"isCustom": true
},
"kuendigungsfrist": {
"type": "date",
"required": true,
"after": "kuendigungsdatum",
"tooltip": true,
"isCustom": true
},
"kuendigungsgrund": {
"type": "multiEnum",
"required": true,
"options": [
"Mietrückstand",
"Eigenbedarf",
"Fehlverhalten",
"Verwertung",
"ZVG Eigenbedarf",
"573a Abs. 1 (nicht mehr als 2 Whng.)",
"573a Abs. 2 (Einliegerwohnung)",
"GewerbeOrdentlich",
"Sonstige"
],
"default": ["Mietrückstand"],
"tooltip": true,
"isCustom": true
},
"kuendigungsart": {
"type": "enum",
"required": true,
"options": [
"Ordentlich",
"Außerordentlich (fristlos)",
"Außerordentlich (mit sozialer Frist)"
],
"style": {
"Ordentlich": "success",
"Außerordentlich (fristlos)": "danger",
"Außerordentlich (mit sozialer Frist)": "warning"
},
"default": "Ordentlich",
"tooltip": true,
"isCustom": true
},
"kuendigenderPartei": {
"type": "enum",
"required": true,
"options": [
"Vermieter",
"Mieter"
],
"style": {
"Vermieter": "primary",
"Mieter": "info"
},
"default": "Vermieter",
"tooltip": true,
"isCustom": true
},
"status": {
"type": "enum",
"required": true,
"options": [
"Entwurf",
"Versendet",
"Zugestellt",
"Anerkannt",
"Bestritten",
"Vollzogen",
"Widerrufen"
],
"style": {
"Entwurf": null,
"Versendet": "warning",
"Zugestellt": "info",
"Anerkannt": "success",
"Bestritten": "danger",
"Vollzogen": "success",
"Widerrufen": null
},
"default": "Entwurf",
"tooltip": true,
"isCustom": true
},
"zustellungsdatum": {
"type": "date",
"required": false,
"tooltip": true,
"isCustom": true
},
"zustellungsart": {
"type": "enum",
"required": false,
"options": [
"Persönlich",
"Einschreiben",
"Gerichtlicher Zustellungsbevollmächtigter",
"E-Mail (sofern vereinbart)",
"Sonstige"
],
"tooltip": true,
"isCustom": true
},
"rueckstandsbetrag": {
"type": "currency",
"required": false,
"onlyDefaultCurrency": true,
"conversionDisabled": true,
"min": 0,
"decimal": true,
"tooltip": true,
"isCustom": true
},
"monateMietrückstand": {
"type": "int",
"required": false,
"min": 0,
"tooltip": true,
"isCustom": true
},
"schonfristGewaehrt": {
"type": "bool",
"default": false,
"tooltip": true,
"isCustom": true
},
"schonfristDatum": {
"type": "date",
"required": false,
"tooltip": true,
"isCustom": true
},
"besorgnisNichtRechtzeitigerAuszug": {
"type": "bool",
"default": false,
"tooltip": true,
"isCustom": true
},
"anmerkungen": {
"type": "text",
"required": false,
"isCustom": true
},
"vmhMietverhltnis": {
"type": "link",
"required": false,
"isCustom": true
},
"mietobjekt": {
"type": "link",
"required": false,
"isCustom": true
}
},
"links": {
"createdBy": {
"type": "belongsTo",
"entity": "User"
},
"modifiedBy": {
"type": "belongsTo",
"entity": "User"
},
"assignedUser": {
"type": "belongsTo",
"entity": "User"
},
"teams": {
"type": "hasMany",
"entity": "Team",
"relationName": "entityTeam",
"layoutRelationshipsDisabled": true
},
"collaborators": {
"type": "hasMany",
"entity": "User",
"relationName": "entityCollaborator",
"layoutRelationshipsDisabled": true
},
"meetings": {
"type": "hasMany",
"entity": "Meeting",
"foreign": "parent"
},
"calls": {
"type": "hasMany",
"entity": "Call",
"foreign": "parent"
},
"tasks": {
"type": "hasChildren",
"entity": "Task",
"foreign": "parent"
},
"emails": {
"type": "hasChildren",
"entity": "Email",
"foreign": "parent",
"layoutRelationshipsDisabled": true
},
"vmhMietverhltnis": {
"type": "belongsTo",
"foreign": "kuendigungen",
"entity": "CVmhMietverhltnis",
"audited": false,
"isCustom": true
},
"mietobjekt": {
"type": "belongsTo",
"foreign": "kuendigungen",
"entity": "CMietobjekt",
"audited": false,
"isCustom": true
},
"vermieter": {
"type": "hasMany",
"relationName": "cBeteiligteKuendigungVermieter",
"foreign": "kuendigungenVermieter",
"entity": "CBeteiligte",
"audited": false,
"isCustom": true
},
"mieter": {
"type": "hasMany",
"relationName": "cBeteiligteKuendigungMieter",
"foreign": "kuendigungenMieter",
"entity": "CBeteiligte",
"audited": false,
"isCustom": true
},
"dokumenteKuendigung": {
"type": "hasMany",
"relationName": "cDokumenteKuendigung",
"foreign": "kuendigungDokumente",
"entity": "CDokumente",
"audited": false,
"isCustom": true
},
"contactsKuendigung": {
"type": "hasMany",
"relationName": "cKuendigungContact",
"foreign": "cKuendigungContact",
"entity": "Contact",
"audited": false,
"isCustom": true
}
},
"collection": {
"orderBy": "createdAt",
"order": "desc",
"textFilterFields": [
"name"
],
"fullTextSearch": false,
"countDisabled": false
},
"indexes": {
"name": {
"columns": [
"name",
"deleted"
]
},
"assignedUser": {
"columns": [
"assignedUserId",
"deleted"
]
},
"createdAt": {
"columns": [
"createdAt",
"deleted"
]
},
"kuendigungsdatum": {
"columns": [
"kuendigungsdatum",
"deleted"
]
}
}
}

8
custom/Espo/Custom/Resources/metadata/entityDefs/CMietobjekt.json
View File

@@ -157,14 +157,6 @@
"entity": "CMietinkasso",
"audited": false,
"isCustom": true
},
"kndigungen": {
"type": "hasMany",
"relationName": "cMietobjektKuendigung",
"foreign": "mietobjekte",
"entity": "CKndigung",
"audited": false,
"isCustom": true
}
},
"collection": {

8
custom/Espo/Custom/Resources/metadata/entityDefs/CVmhMietverhltnis.json
View File

@@ -288,14 +288,6 @@
"entity": "CMietobjekt",
"audited": false,
"isCustom": true
},
"kuendigungen": {
"type": "hasMany",
"relationName": "cKuendigungVmhMietverhltnis",
"foreign": "vmhMietverhltnis",
"entity": "CKuendigung",
"audited": false,
"isCustom": true
}
},
"collection": {