Commit Graph

3937 Commits

Author SHA1 Message Date
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
Luca Haid
b70ff13164 Merge branch 'ADBWohneinheit/add-rimo-deleted-to-list' into 'master'
added rimo deleted to ADBWohneinheit Checks

See merge request fronk/thetool!1407
2025-06-03 11:02:00 +00:00
Luca Haid
83d297bb5a added rimo deleted to ADBWohneinheit Checks 2025-06-03 13:00:46 +02:00
Daniel Spitzer
1a603b56f2 Merge branch 'spidev' into 'master'
Pop Erweiterung

See merge request fronk/thetool!1406
2025-06-03 10:53:58 +00:00
Daniel Spitzer
5058166d0c Pop Erweiterung
- RackModule können nun beim Bearbeiten getauscht werden
2025-06-03 12:53:35 +02:00
Daniel Spitzer
dcb7e971cc Merge branch 'spidev' into 'master'
Pop Erweiterung

See merge request fronk/thetool!1405
2025-06-03 10:51:09 +00:00
Daniel Spitzer
fc088d8ab1 Pop Erweiterung
- RackModule können nun beim Bearbeiten getauscht werden
2025-06-03 12:50:39 +02:00
Frank Schubert
7068a7093b Merge branch 'fronkdev' into 'master'
Added Admin function mass prouductchange

See merge request fronk/thetool!1404
2025-06-03 10:33:58 +00:00
Frank Schubert
26a59fb588 Added Admin function mass prouductchange 2025-06-03 12:33:00 +02:00
Daniel Spitzer
bf91f44574 Merge branch 'spidev' into 'master'
API Anpassungen

See merge request fronk/thetool!1403
2025-06-03 10:07:16 +00:00
Daniel Spitzer
0fbce611eb API Anpassungen
* Abwesenenheiten für Kalender implementiert
2025-06-03 12:06:51 +02:00
Daniel Spitzer
c1b37df08b Merge branch 'spidev' into 'master'
Pop Anpassungen

See merge request fronk/thetool!1402
2025-06-03 09:54:55 +00:00
Daniel Spitzer
5adf0d0c5e API Anpassungen
* Abwesenenheiten für Kalender implementiert
2025-06-03 11:53:33 +02:00
Luca Haid
1791ebe6b7 Merge branch 'ConstructionConsent/add-street-error' into 'master'
added new street filter

See merge request fronk/thetool!1401
2025-06-03 09:25:15 +00:00
Luca Haid
a2b806b2e5 added new street filter 2025-06-03 11:24:39 +02:00
Luca Haid
bb17b6a718 Merge branch 'ConstructionConsent/add-street-error' into 'master'
added new street filter

See merge request fronk/thetool!1400
2025-06-03 09:18:01 +00:00
Luca Haid
9b10230806 added new street filter 2025-06-03 11:17:26 +02:00
Luca Haid
35f1ed22a8 Merge branch 'AddressDB/add-leibnitz-to-weekly-email' into 'master'
added leibnitz to pipework email

See merge request fronk/thetool!1399
2025-06-02 08:05:21 +00:00
Luca Haid
5893fad67b added leibnitz to pipework email 2025-06-02 10:05:08 +02:00
Luca Haid
99f44c2b3e Merge branch 'ADBWohneinheit/duplicate-view-add-netzgebiet-filter' into 'master'
added netzgebiet filter in duplicate view

See merge request fronk/thetool!1398
2025-06-02 07:37:11 +00:00
Luca Haid
f12a6d9666 added netzgebiet filter in duplicate view 2025-06-02 09:36:58 +02:00
Luca Haid
20968f6aa2 Merge branch 'ADBWohneinheit/duplicate-view-add-netzgebiet-filter' into 'master'
added netzgebiet filter in duplicate view

See merge request fronk/thetool!1397
2025-06-02 07:33:00 +00:00
Luca Haid
30f1c9dbc8 added netzgebiet filter in duplicate view 2025-06-02 09:32:45 +02:00