Commit Graph

3959 Commits

Author SHA1 Message Date
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
Luca Haid
e2e19f86fd added new estmk export 2025-06-05 15:24:45 +02:00
Frank Schubert
86a6c753ba Merge branch 'fronkdev' into 'master'
Rimo Import: Added deletion of Buildings not in Rimo anymore

See merge request fronk/thetool!1416
2025-06-05 12:21:35 +00:00
Frank Schubert
ed8736be75 Rimo Import: Added deletion of Buildings not in Rimo anymore 2025-06-05 14:20:12 +02:00
Luca Haid
c5b60626b9 Merge branch 'WarehouseArticlePacket/enable-editing' into 'master'
fixed warehousearticlepacket editing

See merge request fronk/thetool!1415
2025-06-05 09:17:49 +00:00
Luca Haid
858d528525 fixed warehousearticlepacket editing 2025-06-05 11:17:36 +02:00
Luca Haid
45811a3e24 Merge branch 'Preorder/add-new-notification' into 'master'
added new 8 week notice email

See merge request fronk/thetool!1414
2025-06-05 08:16:00 +00:00
Luca Haid
73e3b49e0d added new 8 week notice email 2025-06-05 10:14:23 +02:00
Luca Haid
d9ce9da876 Merge branch 'Preorder/add-new-custom-logical-mails' into 'master'
added new custom logical mails for preorder

See merge request fronk/thetool!1413
2025-06-04 14:01:02 +00:00
Luca Haid
b3b41a95f5 added new custom logical mails for preorder 2025-06-04 15:31:11 +02:00
Luca Haid
ec09270472 Merge branch 'WarehouseArticle/fix-permissions' into 'master'
fixed permissions

See merge request fronk/thetool!1412
2025-06-04 11:47:14 +00:00
Luca Haid
761fa1c590 fixed permissions 2025-06-04 13:47:04 +02:00
Luca Haid
ecbb4c67a1 Merge branch 'AddressDB/leibnitz-import-add-status' into 'master'
added status rohr im haus -> 200

See merge request fronk/thetool!1411
2025-06-04 11:12:17 +00:00
Luca Haid
e61be7a2fc added status rohr im haus -> 200 2025-06-04 13:11:02 +02:00
Luca Haid
243106fc9e Merge branch 'WarehouseOffer/improve' into 'master'
updated warehouseoffer

See merge request fronk/thetool!1410
2025-06-04 10:51:10 +00:00
Luca Haid
b8ceba5220 updated warehouseoffer 2025-06-04 12:50:43 +02:00
Daniel Spitzer
c3237017a2 Merge branch 'spidev' into 'master'
Kalender Anpassungen

See merge request fronk/thetool!1409
2025-06-04 06:56:47 +00:00
Daniel Spitzer
a71ae02128 Kalender Anpassungen
- Anpassungen bei neuen Kalenderbenutzern
2025-06-04 08:55:58 +02:00
Luca Haid
e5e49096a6 Merge branch 'AddressDB/fix-mph' into 'master'
fixed typo

See merge request fronk/thetool!1408
2025-06-03 13:22:19 +00:00
Luca Haid
5ce799be00 fixed typo 2025-06-03 15:21:28 +02:00