Commit Graph

3978 Commits

Author SHA1 Message Date
Luca Haid
abf4e798f6 added rml in duplicate list again 2025-06-12 09:00:20 +02:00
Frank Schubert
efc9767f69 Merge branch 'fronkdev' into 'master'
Fixed counting homes in Rimo Import

See merge request fronk/thetool!1444
2025-06-12 02:52:29 +00:00
Frank Schubert
64e0bd6367 Fixed counting homes in Rimo Import 2025-06-12 04:51:58 +02:00
Luca Haid
57e1f5b22a Merge branch 'ADBWohneinheit/remove-sbidi-duplicate-view' into 'master'
removed sbidi and rml from duplicate view

See merge request fronk/thetool!1443
2025-06-11 12:18:30 +00:00
Luca Haid
f57042b514 removed sbidi and rml from duplicate view 2025-06-11 14:18:21 +02:00
Luca Haid
d29c9f6128 Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new features

See merge request fronk/thetool!1439
2025-06-11 10:56:16 +00:00
Luca Haid
60566944fd added new features 2025-06-11 12:56:09 +02:00
Luca Haid
8b4922f98a Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new features

See merge request fronk/thetool!1438
2025-06-11 10:55:22 +00:00
Luca Haid
a03d840b58 added new features 2025-06-11 12:54:54 +02:00
Luca Haid
1fea6b5f8f Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new features

See merge request fronk/thetool!1437
2025-06-11 10:47:34 +00:00
Luca Haid
f7c4cbef6c added new features 2025-06-11 12:47:08 +02:00
Luca Haid
b840a57b6c Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new features

See merge request fronk/thetool!1436
2025-06-11 10:25:25 +00:00
Luca Haid
cb28d88acf added new features 2025-06-11 12:25:14 +02:00
Luca Haid
0446c708e6 Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new features

See merge request fronk/thetool!1435
2025-06-11 10:24:07 +00:00
Luca Haid
a8e552416b added new features 2025-06-11 11:40:56 +02:00
Frank Schubert
3953a24c46 Merge branch 'fronkdev' into 'master'
Added admin-button to remove OAID from Wohneinheit

See merge request fronk/thetool!1434
2025-06-11 09:00:06 +00:00
Frank Schubert
d237fd6f4b Added admin-button to remove OAID from Wohneinheit 2025-06-11 10:59:10 +02:00
Frank Schubert
ab2d233054 Merge branch 'fronkdev' into 'master'
Can now delete Wohneinheit even if it has a canceled order

See merge request fronk/thetool!1433
2025-06-11 06:32:16 +00:00
Frank Schubert
a6971cded6 Can now delete Wohneinheit even if it has a canceled order 2025-06-11 08:31:36 +02:00
Luca Haid
4e9f558cf7 Merge branch 'ADBWohneinheit/show-deleted-without-oaid' into 'master'
show deleted without oaid

See merge request fronk/thetool!1432
2025-06-10 13:14:24 +00:00
Luca Haid
3c2d87497d show deleted without oaid 2025-06-10 15:14:12 +02:00
Luca Haid
0943f54907 Merge branch 'ADBWohneinheit/show-deleted-without-oaid' into 'master'
show deleted without oaid

See merge request fronk/thetool!1431
2025-06-10 13:09:19 +00:00
Luca Haid
831cb573e9 show deleted without oaid 2025-06-10 15:09:01 +02:00
Luca Haid
29b67ac8e5 Merge branch 'AddressDB/improve-adb-gwr-view-and-filter' into 'master'
added new filter and changed displaying

See merge request fronk/thetool!1430
2025-06-10 12:18:46 +00:00
Luca Haid
4dd53c3a78 added new filter and changed displaying 2025-06-10 14:18:28 +02:00
Luca Haid
a2a2bf54b7 Merge branch 'Preorder/add-new-custom-notification' into 'master'
added new custom preorder notification

See merge request fronk/thetool!1429
2025-06-10 08:55:31 +00:00
Luca Haid
4f5dfa57ae added new custom preorder notification 2025-06-10 10:54:59 +02:00
Luca Haid
15cf695111 Merge branch 'DashboardNew/fix-estmk-export' into 'master'
fixed utf8 encoding for excel

See merge request fronk/thetool!1428
2025-06-10 08:16:47 +00:00
Luca Haid
088afe035c fixed utf8 encoding for excel 2025-06-10 10:15:53 +02:00
Luca Haid
32975a5b94 Merge branch 'DashboardNew/fix-estmk-export' into 'master'
Added all Export Fields

See merge request fronk/thetool!1427
2025-06-10 08:02:53 +00:00
Luca Haid
ffd8c46bba Added all Export Fields 2025-06-10 10:02:02 +02:00
Luca Haid
4bbdf2e37a Merge branch 'Preorder/change-unit-counting-logic' into 'master'
changed logic of unit count calculation based on internal tool type

See merge request fronk/thetool!1426
2025-06-10 07:46:48 +00:00
Luca Haid
28546cf4d0 changed logic of unit count calculation based on internal tool type 2025-06-10 09:45:57 +02:00
Frank Schubert
83de1934fd Merge branch 'fronkdev' into 'master'
fixed typo in PreorderBilling

See merge request fronk/thetool!1425
2025-06-10 01:58:48 +00:00
Frank Schubert
ee3e41f4bf fixed typo in PreorderBilling 2025-06-10 03:58:01 +02:00
Daniel Spitzer
321e4b3307 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1424
2025-06-09 10:35:09 +00:00
Daniel Spitzer
0aac71668a Kalender Anpassungen
- Kalender Termin Kopierfeature
2025-06-09 12:34:49 +02:00
Daniel Spitzer
4895ee25e3 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1423
2025-06-09 10:11:07 +00:00
Daniel Spitzer
488457ccd8 Kalender Anpassungen
- Kalender Termin Kopierfeature
2025-06-09 12:10:16 +02:00
Daniel Spitzer
a46e74e15b Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1422
2025-06-06 11:10:04 +00:00
Daniel Spitzer
630af363f9 Kalender Anpassungen
- Anpassungen bei neuen Kalenderbenutzern
2025-06-06 13:09:47 +02:00
Luca Haid
ae77f55a47 Merge branch 'AddressDB/fix-leibnit-import' into 'master'
fixed import to create new strasse if needed

See merge request fronk/thetool!1421
2025-06-06 09:55:36 +00:00
Luca Haid
327d6686fb fixed import to create new strasse if needed 2025-06-06 11:55:22 +02:00
Daniel Spitzer
d395e3b811 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1420
2025-06-06 07:38:56 +00:00
Daniel Spitzer
6d485ed234 Kalender Anpassungen
- Anpassungen bei neuen Kalenderbenutzern
2025-06-06 09:38:29 +02:00
Daniel Spitzer
356bf330d7 Merge branch 'spidev' into 'master'
Zeiterfassung Ersatzruhe Implementierung

See merge request fronk/thetool!1419
2025-06-06 07:35:29 +00:00
Daniel Spitzer
df2dd9c596 Kalender Anpassungen
- Anpassungen bei neuen Kalenderbenutzern
2025-06-06 09:29:25 +02:00
Frank Schubert
e2daf5656b Merge branch 'fronkdev' into 'master'
rimo import: fixed hausnummer deletion log string

See merge request fronk/thetool!1418
2025-06-06 01:50:46 +00:00
Frank Schubert
adc5fd3895 rimo import: fixed hausnummer deletion log string 2025-06-06 03:46:20 +02:00
Luca Haid
77460b368a Merge branch 'Dashboard/add-new-export' into 'master'
added new estmk export

See merge request fronk/thetool!1417
2025-06-05 13:25:15 +00:00