From 9ab8f8b4bf5451a7ff6352a16d7d01b44afd2a58 Mon Sep 17 00:00:00 2001 From: bsiggel Date: Wed, 11 Mar 2026 10:15:02 +0100 Subject: [PATCH] =?UTF-8?q?Add=20Mietinkasso=20and=20R=C3=A4umungsklage=20?= =?UTF-8?q?fields=20to=20translations=20and=20metadata,=20update=20layouts?= =?UTF-8?q?=20and=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/i18n/de_DE/CAICollection.json | 12 ++- .../Resources/i18n/de_DE/CAdvowareAkten.json | 12 ++- .../Resources/i18n/de_DE/CMietinkasso.json | 88 +++++++++--------- .../Resources/i18n/en_US/CAICollection.json | 12 ++- .../Resources/i18n/en_US/CAdvowareAkten.json | 12 ++- .../Resources/i18n/en_US/CMietinkasso.json | 92 +++++++++---------- .../CAICollection/bottomPanelsDetail.json | 15 +++ .../layouts/CAICollection/detail.json | 24 +++++ .../metadata/entityDefs/CAICollection.json | 26 +++++- .../metadata/entityDefs/CAdvowareAkten.json | 26 +++++- .../metadata/entityDefs/CMietinkasso.json | 32 ++----- .../metadata/entityDefs/CVmhRumungsklage.json | 8 +- .../metadata/scopes/CVMHBeteiligte.json | 28 ++++++ data/config.php | 2 +- data/state.php | 4 +- 15 files changed, 248 insertions(+), 145 deletions(-) create mode 100644 custom/Espo/Custom/Resources/layouts/CAICollection/bottomPanelsDetail.json create mode 100644 custom/Espo/Custom/Resources/layouts/CAICollection/detail.json create mode 100644 custom/Espo/Custom/Resources/metadata/scopes/CVMHBeteiligte.json diff --git a/custom/Espo/Custom/Resources/i18n/de_DE/CAICollection.json b/custom/Espo/Custom/Resources/i18n/de_DE/CAICollection.json index 9a6ff6d9..09adb740 100644 --- a/custom/Espo/Custom/Resources/i18n/de_DE/CAICollection.json +++ b/custom/Espo/Custom/Resources/i18n/de_DE/CAICollection.json @@ -5,7 +5,13 @@ "cAdvowareAkteName": "Advoware-Akte Name", "xaiCollectionId": "x.AI Collection ID", "syncStatus": "Sync-Status", - "lastSync": "Letzte Synchronisation" + "lastSync": "Letzte Synchronisation", + "cmietinkasso": "Mietinkasso", + "cmietinkassoId": "Mietinkasso ID", + "cmietinkassoName": "Mietinkasso Name", + "cvmhRumungsklage": "Räumungsklage", + "cvmhRumungsklageId": "Räumungsklage ID", + "cvmhRumungsklageName": "Räumungsklage Name" }, "links": { "meetings": "Termine", @@ -13,8 +19,8 @@ "tasks": "Aufgaben", "cDokumente": "Dokumente", "cAdvowareAkte": "Advoware-Akte", - "cmietinkassos": "Mietinkassos", - "cvmhRumungsklages": "Räumungsklagen" + "cmietinkasso": "Mietinkasso", + "cvmhRumungsklage": "Räumungsklage" }, "labels": { "Create CAICollection": "AI Collection erstellen" diff --git a/custom/Espo/Custom/Resources/i18n/de_DE/CAdvowareAkten.json b/custom/Espo/Custom/Resources/i18n/de_DE/CAdvowareAkten.json index 61e00080..721a4a2e 100644 --- a/custom/Espo/Custom/Resources/i18n/de_DE/CAdvowareAkten.json +++ b/custom/Espo/Custom/Resources/i18n/de_DE/CAdvowareAkten.json @@ -3,7 +3,13 @@ "advowareAktenzeichen": "Advoware Aktenzeichen", "aktennr": "Advoware Identifikator", "syncStatus": "Sync-Status", - "lastSync": "Letzte Synchronisation" + "lastSync": "Letzte Synchronisation", + "cmietinkasso": "Mietinkasso", + "cmietinkassoId": "Mietinkasso ID", + "cmietinkassoName": "Mietinkasso Name", + "cvmhRumungsklage": "Räumungsklage", + "cvmhRumungsklageId": "Räumungsklage ID", + "cvmhRumungsklageName": "Räumungsklage Name" }, "links": { "meetings": "Termine", @@ -11,8 +17,8 @@ "tasks": "Aufgaben", "cDokumente": "Dokumente", "cAICollection": "AI Collection", - "cmietinkassos": "Mietinkassos", - "cvmhRumungsklages": "Räumungsklagen" + "cmietinkasso": "Mietinkasso", + "cvmhRumungsklage": "Räumungsklage" }, "labels": { "Create CAdvowareAkten": "Advoware Akte erstellen" diff --git a/custom/Espo/Custom/Resources/i18n/de_DE/CMietinkasso.json b/custom/Espo/Custom/Resources/i18n/de_DE/CMietinkasso.json index f4f84212..ff5cc445 100644 --- a/custom/Espo/Custom/Resources/i18n/de_DE/CMietinkasso.json +++ b/custom/Espo/Custom/Resources/i18n/de_DE/CMietinkasso.json @@ -1,48 +1,44 @@ { - "fields": { - "klaeger": "Kläger", - "beklagte": "Beklagte", - "vmhMietverhltnises": "Mietverhältnisse", - "contactsMietinkasso": "Freigegebene Nutzer", - "dokumentesmietinkasso": "Dokumente", - "gerichtsrubrum": "Gerichtsrubrum", - "gegenstandswert": "Gegenstandswert", - "kuendigungsservice": "Kündigungsservice", - "aussergerichtlicheGebuehren13": "Außergerichtliche Gebühren 1,3", - "gerichtskosten1Instanz": "Gerichtskosten 1. Instanz", - "anwaltskosten1Instanz": "Anwaltskosten 1. Instanz", - "freigeschalteteNutzer": "Freigeschaltete Nutzer (veraltet)", - "collaborators": "Mitarbeiter", - "vmhVermietersMIK": "Vermieter", - "cAdvowareAkte": "Advoware-Akte", - "cAdvowareAkteId": "Advoware-Akte ID", - "cAdvowareAkteName": "Advoware-Akte Name", - "cAICollection": "AI Collection", - "cAICollectionId": "AI Collection ID", - "cAICollectionName": "AI Collection Name" - }, - "links": { - "meetings": "Termine", - "calls": "Anrufe", - "tasks": "Aufgaben", - "klaeger": "Kläger", - "beklagte": "Beklagte", - "vmhMietverhltnises": "Mietverhältnisse", - "contactsMietinkasso": "Freigegebene Nutzer", - "dokumentesmietinkasso": "Dokumente", - "freigeschalteteNutzer": "Freigeschaltete Nutzer (veraltet)", - "collaborators": "Mitarbeiter", - "vmhVermietersMIK": "Vermieter", - "pulse": "Pulse", - "cAdvowareAkte": "Advoware-Akte", - "cAICollection": "AI Collection" - }, - "labels": { - "Create CMietinkasso": "Mietinkasso erstellen" - }, - "tooltips": { - "gerichtsrubrum": "Rubrum des Gerichtsverfahrens", - "gegenstandswert": "Wert des Streitgegenstands", - "kuendigungsservice": "Kündigungsservice aktiviert" - } + "fields": { + "klaeger": "Kläger", + "beklagte": "Beklagte", + "vmhMietverhltnises": "Mietverhältnisse", + "contactsMietinkasso": "Freigegebene Nutzer", + "dokumentesmietinkasso": "Dokumente", + "gerichtsrubrum": "Gerichtsrubrum", + "gegenstandswert": "Gegenstandswert", + "kuendigungsservice": "Kündigungsservice", + "aussergerichtlicheGebuehren13": "Außergerichtliche Gebühren 1,3", + "gerichtskosten1Instanz": "Gerichtskosten 1. Instanz", + "anwaltskosten1Instanz": "Anwaltskosten 1. Instanz", + "freigeschalteteNutzer": "Freigeschaltete Nutzer (veraltet)", + "collaborators": "Mitarbeiter", + "vmhVermietersMIK": "Vermieter", + "cAdvowareAkte": "Advoware-Akte", + "cAICollection": "AI Collection" + }, + "links": { + "meetings": "Termine", + "calls": "Anrufe", + "tasks": "Aufgaben", + "klaeger": "Kläger", + "beklagte": "Beklagte", + "vmhMietverhltnises": "Mietverhältnisse", + "contactsMietinkasso": "Freigegebene Nutzer", + "dokumentesmietinkasso": "Dokumente", + "freigeschalteteNutzer": "Freigeschaltete Nutzer (veraltet)", + "collaborators": "Mitarbeiter", + "vmhVermietersMIK": "Vermieter", + "pulse": "Pulse", + "cAdvowareAkte": "Advoware-Akte", + "cAICollection": "AI Collection" + }, + "labels": { + "Create CMietinkasso": "Mietinkasso erstellen" + }, + "tooltips": { + "gerichtsrubrum": "Rubrum des Gerichtsverfahrens", + "gegenstandswert": "Wert des Streitgegenstands", + "kuendigungsservice": "Kündigungsservice aktiviert" + } } \ No newline at end of file diff --git a/custom/Espo/Custom/Resources/i18n/en_US/CAICollection.json b/custom/Espo/Custom/Resources/i18n/en_US/CAICollection.json index c358271e..cef5b461 100644 --- a/custom/Espo/Custom/Resources/i18n/en_US/CAICollection.json +++ b/custom/Espo/Custom/Resources/i18n/en_US/CAICollection.json @@ -5,7 +5,13 @@ "cAdvowareAkteName": "Advoware File Name", "xaiCollectionId": "x.AI Collection ID", "syncStatus": "Sync Status", - "lastSync": "Last Sync" + "lastSync": "Last Sync", + "cmietinkasso": "Mietinkasso", + "cmietinkassoId": "Mietinkasso ID", + "cmietinkassoName": "Mietinkasso Name", + "cvmhRumungsklage": "Räumungsklage", + "cvmhRumungsklageId": "Räumungsklage ID", + "cvmhRumungsklageName": "Räumungsklage Name" }, "links": { "meetings": "Meetings", @@ -13,8 +19,8 @@ "tasks": "Tasks", "cDokumente": "Documents", "cAdvowareAkte": "Advoware File", - "cmietinkassos": "Mietinkassos", - "cvmhRumungsklages": "Räumungsklagen" + "cmietinkasso": "Mietinkasso", + "cvmhRumungsklage": "Räumungsklage" }, "labels": { "Create CAICollection": "Create AI Collection" diff --git a/custom/Espo/Custom/Resources/i18n/en_US/CAdvowareAkten.json b/custom/Espo/Custom/Resources/i18n/en_US/CAdvowareAkten.json index 4b79375a..f85b6164 100644 --- a/custom/Espo/Custom/Resources/i18n/en_US/CAdvowareAkten.json +++ b/custom/Espo/Custom/Resources/i18n/en_US/CAdvowareAkten.json @@ -3,7 +3,13 @@ "advowareAktenzeichen": "Advoware Case Number", "aktennr": "Advoware Identifier", "syncStatus": "Sync Status", - "lastSync": "Last Sync" + "lastSync": "Last Sync", + "cmietinkasso": "Mietinkasso", + "cmietinkassoId": "Mietinkasso ID", + "cmietinkassoName": "Mietinkasso Name", + "cvmhRumungsklage": "Räumungsklage", + "cvmhRumungsklageId": "Räumungsklage ID", + "cvmhRumungsklageName": "Räumungsklage Name" }, "links": { "meetings": "Meetings", @@ -11,8 +17,8 @@ "tasks": "Tasks", "cDokumente": "Documents", "cAICollection": "AI Collection", - "cmietinkassos": "Mietinkassos", - "cvmhRumungsklages": "Räumungsklagen" + "cmietinkasso": "Mietinkasso", + "cvmhRumungsklage": "Räumungsklage" }, "labels": { "Create CAdvowareAkten": "Create Advoware Akte" diff --git a/custom/Espo/Custom/Resources/i18n/en_US/CMietinkasso.json b/custom/Espo/Custom/Resources/i18n/en_US/CMietinkasso.json index 0e294759..8520bcc8 100644 --- a/custom/Espo/Custom/Resources/i18n/en_US/CMietinkasso.json +++ b/custom/Espo/Custom/Resources/i18n/en_US/CMietinkasso.json @@ -1,48 +1,44 @@ -{ - "fields": { - "klaeger": "Plaintiff", - "beklagte": "Defendant", - "vmhMietverhltnises": "Tenancies", - "contactsMietinkasso": "Portal Users", - "dokumentesmietinkasso": "Documents", - "gerichtsrubrum": "Court Rubrum", - "gegenstandswert": "Claim Value", - "kuendigungsservice": "Termination Service", - "aussergerichtlicheGebuehren13": "Out-of-court Fees 1.3", - "gerichtskosten1Instanz": "Court Costs 1st Instance", - "anwaltskosten1Instanz": "Attorney Fees 1st Instance", - "freigeschalteteNutzer": "Activated Users (deprecated)", - "collaborators": "Collaborators", - "vmhVermietersMIK": "Landlord", - "cAdvowareAkte": "Advoware File", - "cAdvowareAkteId": "Advoware File ID", - "cAdvowareAkteName": "Advoware File Name", - "cAICollection": "AI Collection", - "cAICollectionId": "AI Collection ID", - "cAICollectionName": "AI Collection Name" - }, - "links": { - "meetings": "Meetings", - "calls": "Calls", - "tasks": "Tasks", - "klaeger": "Plaintiff", - "beklagte": "Defendant", - "vmhMietverhltnises": "Tenancies", - "contactsMietinkasso": "Portal Users", - "dokumentesmietinkasso": "Documents", - "freigeschalteteNutzer": "Activated Users (deprecated)", - "collaborators": "Collaborators", - "vmhVermietersMIK": "Landlord", - "pulse": "Pulses", - "cAdvowareAkte": "Advoware File", - "cAICollection": "AI Collection" - }, - "labels": { - "Create CMietinkasso": "Create Mietinkasso" - }, - "tooltips": { - "gerichtsrubrum": "Court proceeding rubrum", - "gegenstandswert": "Value of the disputed matter", - "kuendigungsservice": "Termination service enabled" - } -} +{ + "fields": { + "klaeger": "Plaintiff", + "beklagte": "Defendant", + "vmhMietverhltnises": "Tenancies", + "contactsMietinkasso": "Portal Users", + "dokumentesmietinkasso": "Documents", + "gerichtsrubrum": "Court Rubrum", + "gegenstandswert": "Claim Value", + "kuendigungsservice": "Termination Service", + "aussergerichtlicheGebuehren13": "Out-of-court Fees 1.3", + "gerichtskosten1Instanz": "Court Costs 1st Instance", + "anwaltskosten1Instanz": "Attorney Fees 1st Instance", + "freigeschalteteNutzer": "Activated Users (deprecated)", + "collaborators": "Collaborators", + "vmhVermietersMIK": "Landlord", + "cAdvowareAkte": "Advoware File", + "cAICollection": "AI Collection" + }, + "links": { + "meetings": "Meetings", + "calls": "Calls", + "tasks": "Tasks", + "klaeger": "Plaintiff", + "beklagte": "Defendant", + "vmhMietverhltnises": "Tenancies", + "contactsMietinkasso": "Portal Users", + "dokumentesmietinkasso": "Documents", + "freigeschalteteNutzer": "Activated Users (deprecated)", + "collaborators": "Collaborators", + "vmhVermietersMIK": "Landlord", + "pulse": "Pulses", + "cAdvowareAkte": "Advoware File", + "cAICollection": "AI Collection" + }, + "labels": { + "Create CMietinkasso": "Create Mietinkasso" + }, + "tooltips": { + "gerichtsrubrum": "Court proceeding rubrum", + "gegenstandswert": "Value of the disputed matter", + "kuendigungsservice": "Termination service enabled" + } +} \ No newline at end of file diff --git a/custom/Espo/Custom/Resources/layouts/CAICollection/bottomPanelsDetail.json b/custom/Espo/Custom/Resources/layouts/CAICollection/bottomPanelsDetail.json new file mode 100644 index 00000000..f46d622d --- /dev/null +++ b/custom/Espo/Custom/Resources/layouts/CAICollection/bottomPanelsDetail.json @@ -0,0 +1,15 @@ +{ + "_delimiter_": { + "disabled": true + }, + "activities": { + "disabled": true + }, + "history": { + "disabled": true + }, + "stream": { + "sticked": false, + "index": 0 + } +} \ No newline at end of file diff --git a/custom/Espo/Custom/Resources/layouts/CAICollection/detail.json b/custom/Espo/Custom/Resources/layouts/CAICollection/detail.json new file mode 100644 index 00000000..2d30ab5d --- /dev/null +++ b/custom/Espo/Custom/Resources/layouts/CAICollection/detail.json @@ -0,0 +1,24 @@ +[ + { + "rows": [ + [ + { + "name": "name" + }, + { + "name": "xaiCollectionId" + } + ], + [ + { + "name": "syncStatus" + }, + { + "name": "lastSync" + } + ] + ], + "style": "default", + "label": "Overview" + } +] \ No newline at end of file diff --git a/custom/Espo/Custom/Resources/metadata/entityDefs/CAICollection.json b/custom/Espo/Custom/Resources/metadata/entityDefs/CAICollection.json index fdba015c..2fca5ec1 100644 --- a/custom/Espo/Custom/Resources/metadata/entityDefs/CAICollection.json +++ b/custom/Espo/Custom/Resources/metadata/entityDefs/CAICollection.json @@ -70,6 +70,24 @@ "readOnly": true, "tooltip": true, "isCustom": true + }, + "cmietinkassoId": { + "type": "varchar", + "len": 17, + "isCustom": true + }, + "cmietinkassoName": { + "type": "varchar", + "isCustom": true + }, + "cvmhRumungsklageId": { + "type": "varchar", + "len": 17, + "isCustom": true + }, + "cvmhRumungsklageName": { + "type": "varchar", + "isCustom": true } }, "links": { @@ -136,14 +154,14 @@ "foreign": "cAICollection", "isCustom": true }, - "cmietinkassos": { - "type": "hasMany", + "cmietinkasso": { + "type": "belongsTo", "entity": "CMietinkasso", "foreign": "cAICollection", "isCustom": true }, - "cvmhRumungsklages": { - "type": "hasMany", + "cvmhRumungsklage": { + "type": "belongsTo", "entity": "CVmhRumungsklage", "foreign": "cAICollection", "isCustom": true diff --git a/custom/Espo/Custom/Resources/metadata/entityDefs/CAdvowareAkten.json b/custom/Espo/Custom/Resources/metadata/entityDefs/CAdvowareAkten.json index 1c6105b8..0e9eae80 100644 --- a/custom/Espo/Custom/Resources/metadata/entityDefs/CAdvowareAkten.json +++ b/custom/Espo/Custom/Resources/metadata/entityDefs/CAdvowareAkten.json @@ -76,6 +76,24 @@ "readOnly": true, "tooltip": true, "isCustom": true + }, + "cmietinkassoId": { + "type": "varchar", + "len": 17, + "isCustom": true + }, + "cmietinkassoName": { + "type": "varchar", + "isCustom": true + }, + "cvmhRumungsklageId": { + "type": "varchar", + "len": 17, + "isCustom": true + }, + "cvmhRumungsklageName": { + "type": "varchar", + "isCustom": true } }, "links": { @@ -142,14 +160,14 @@ "foreign": "cAdvowareAkte", "isCustom": true }, - "cmietinkassos": { - "type": "hasMany", + "cmietinkasso": { + "type": "belongsTo", "entity": "CMietinkasso", "foreign": "cAdvowareAkte", "isCustom": true }, - "cvmhRumungsklages": { - "type": "hasMany", + "cvmhRumungsklage": { + "type": "belongsTo", "entity": "CVmhRumungsklage", "foreign": "cAdvowareAkte", "isCustom": true diff --git a/custom/Espo/Custom/Resources/metadata/entityDefs/CMietinkasso.json b/custom/Espo/Custom/Resources/metadata/entityDefs/CMietinkasso.json index fa38a454..630cf6df 100644 --- a/custom/Espo/Custom/Resources/metadata/entityDefs/CMietinkasso.json +++ b/custom/Espo/Custom/Resources/metadata/entityDefs/CMietinkasso.json @@ -86,24 +86,6 @@ "required": false, "default": 0, "isCustom": true - }, - "cAdvowareAkteId": { - "type": "varchar", - "len": 17, - "isCustom": true - }, - "cAdvowareAkteName": { - "type": "varchar", - "isCustom": true - }, - "cAICollectionId": { - "type": "varchar", - "len": 17, - "isCustom": true - }, - "cAICollectionName": { - "type": "varchar", - "isCustom": true } }, "links": { @@ -205,22 +187,24 @@ "foreign": "mietinkassosBeklagte", "entity": "CBeteiligte", "audited": false, - "isCustom": true }, + "isCustom": true + }, "pulse": { "type": "hasMany", "entity": "CPuls", "foreign": "parent", - "isCustom": true }, + "isCustom": true + }, "cAdvowareAkte": { - "type": "belongsTo", + "type": "hasOne", "entity": "CAdvowareAkten", - "foreign": "cmietinkassos", + "foreign": "cmietinkasso", "isCustom": true }, "cAICollection": { - "type": "belongsTo", + "type": "hasOne", "entity": "CAICollection", - "foreign": "cmietinkassos", + "foreign": "cmietinkasso", "isCustom": true } }, diff --git a/custom/Espo/Custom/Resources/metadata/entityDefs/CVmhRumungsklage.json b/custom/Espo/Custom/Resources/metadata/entityDefs/CVmhRumungsklage.json index c602385c..58be5a89 100644 --- a/custom/Espo/Custom/Resources/metadata/entityDefs/CVmhRumungsklage.json +++ b/custom/Espo/Custom/Resources/metadata/entityDefs/CVmhRumungsklage.json @@ -196,15 +196,15 @@ "isCustom": true }, "cAdvowareAkte": { - "type": "belongsTo", + "type": "hasOne", "entity": "CAdvowareAkten", - "foreign": "cvmhRumungsklages", + "foreign": "cvmhRumungsklage", "isCustom": true }, "cAICollection": { - "type": "belongsTo", + "type": "hasOne", "entity": "CAICollection", - "foreign": "cvmhRumungsklages", + "foreign": "cvmhRumungsklage", "isCustom": true } }, diff --git a/custom/Espo/Custom/Resources/metadata/scopes/CVMHBeteiligte.json b/custom/Espo/Custom/Resources/metadata/scopes/CVMHBeteiligte.json new file mode 100644 index 00000000..6f78e2db --- /dev/null +++ b/custom/Espo/Custom/Resources/metadata/scopes/CVMHBeteiligte.json @@ -0,0 +1,28 @@ +{ + "entity": true, + "layouts": true, + "tab": true, + "acl": true, + "aclPortal": true, + "aclPortalLevelList": [ + "all", + "account", + "contact", + "own", + "no" + ], + "customizable": true, + "importable": true, + "notifications": true, + "hasPersonalData": true, + "duplicateCheckFieldList": [ + "name", + "emailAddress" + ], + "stream": true, + "disabled": false, + "type": "Person", + "module": "Custom", + "object": true, + "isCustom": true +} diff --git a/data/config.php b/data/config.php index ae8434a9..fb9d623c 100644 --- a/data/config.php +++ b/data/config.php @@ -360,7 +360,7 @@ return [ 0 => 'youtube.com', 1 => 'google.com' ], - 'microtime' => 1773152503.781747, + 'microtime' => 1773220427.381822, 'siteUrl' => 'https://crm.bitbylaw.com', 'fullTextSearchMinLength' => 4, 'webSocketUrl' => 'ws://api.bitbylaw.com:5000/espocrm/ws', diff --git a/data/state.php b/data/state.php index a4ed81f5..986ad2ab 100644 --- a/data/state.php +++ b/data/state.php @@ -1,7 +1,7 @@ 1773217601, - 'microtimeState' => 1773217601.985202, + 'cacheTimestamp' => 1773220427, + 'microtimeState' => 1773220427.504322, 'currencyRates' => [ 'EUR' => 1.0 ],