Commit Graph

3081 Commits

Author SHA1 Message Date
Frank Schubert
3ed34a8aab Merge branch 'fronkdev' into 'master'
ConstructionConsent Changes

See merge request fronk/thetool!1022
2025-02-13 13:36:53 +00:00
Frank Schubert
ea9e91e6ab ConstructionConsent Changes 2025-02-13 14:35:57 +01:00
Luca Haid
7c5045812f Merge branch 'construction-consent-add-popover' into 'master'
Added Popover to Inform Users

See merge request fronk/thetool!1021
2025-02-13 11:48:32 +00:00
Luca Haid
9e513dfb35 Added Popover to Inform Users 2025-02-13 12:47:54 +01:00
Luca Haid
6f1ec33a1e Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOffer Modal

See merge request fronk/thetool!1020
2025-02-13 11:37:35 +00:00
Luca Haid
ac5c09c8be Fixed WarehouseOffer Modal 2025-02-13 12:37:10 +01:00
Luca Haid
57f7a1c9fe Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOrderModel.php

See merge request fronk/thetool!1019
2025-02-13 11:33:42 +00:00
Luca Haid
71b72151f6 Fixed WarehouseOrderModel.php 2025-02-13 12:33:21 +01:00
Luca Haid
c3e1af6649 Merge branch 'improve-warehouse' into 'master'
Allowed ingena for cons consent

See merge request fronk/thetool!1018
2025-02-13 11:10:04 +00:00
Luca Haid
8f20ce39d6 Allowed ingena for cons consent 2025-02-13 12:09:35 +01:00
Luca Haid
1661469d06 Merge branch 'improve-warehouse' into 'master'
Updated Warehouse

See merge request fronk/thetool!1017
2025-02-13 10:57:41 +00:00
Luca Haid
c8d11661d0 Updated Warehouse 2025-02-13 11:56:27 +01:00
Luca Haid
bbe841875e Added gstnr to ConstructionConsent/Index 2025-02-13 08:19:54 +00:00
Luca Haid
2159035675 Added gstnr to ConstructionConsent/Index 2025-02-13 08:18:55 +00:00
Daniel Spitzer
a01e13c52c Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!1016
2025-02-12 17:22:49 +00:00
Daniel Spitzer
5e8ec1d07d Kalender Bugfix
* Ab und zu passiert es das Kalendereinträge doppelt angezeigt werden. Es gab eine überschneidung mit den Event id -> gefixt
2025-02-12 18:19:20 +01:00
Luca Haid
bb5a993c27 Update DashboardNew.js 2025-02-12 17:03:08 +00:00
Luca Haid
5a5fc9d3d9 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1015
2025-02-12 16:56:48 +00:00
Luca Haid
cc58b32312 Changed Dashboard 2025-02-12 17:56:34 +01:00
Luca Haid
3da43ea0e7 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1014
2025-02-12 16:52:00 +00:00
Luca Haid
14308d3285 Changed Dashboard 2025-02-12 17:51:29 +01:00
Frank Schubert
9f3ce3a019 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!1013
2025-02-12 14:33:19 +00:00
Frank Schubert
21ae4fe212 Added ConstructionConsentProjectAddress classes 2025-02-12 15:32:03 +01:00
Frank Schubert
b583990ca8 Fixed to filter in Invoice 2025-02-12 15:31:32 +01:00
Frank Schubert
c2c2a97db0 saving edit_by in snopp opsdata api 2025-02-12 15:31:12 +01:00
Frank Schubert
df75f9a26a Merge branch 'fronkdev' into 'master'
rimo-import: new applying changed status flags from hausnummer to preorder

See merge request fronk/thetool!1012
2025-02-12 14:30:35 +00:00
Frank Schubert
b4bf3e304c rimo-import: new applying changed status flags from hasnummer to preorder 2025-02-12 15:29:34 +01:00
Luca Haid
6feece50bd Merge branch 'improve-warehouse' into 'master'
Updated Shipping Note so that Status is now a iconSelect

See merge request fronk/thetool!1011
2025-02-12 10:14:20 +00:00
Luca Haid
1e868e9b84 Updated Shipping Note so that Status is now a iconSelect 2025-02-12 11:13:33 +01:00
Daniel Spitzer
9233b30b15 Merge branch 'spidev' into 'master'
Devicecontroller Bugfix

See merge request fronk/thetool!1010
2025-02-11 14:30:35 +00:00
Daniel Spitzer
9bd5b9f9b1 Merge remote-tracking branch 'origin/spidev' into spidev 2025-02-11 15:29:53 +01:00
Daniel Spitzer
114378ded7 Devicecontroller Bugfix
* Admin hat keine Devices mehr gesehen
2025-02-11 15:28:50 +01:00
Daniel Spitzer
cfe6409871 Merge-Konflikt in DeviceController.php behoben 2025-02-11 15:27:26 +01:00
Frank Schubert
bb32d97fdf Merge branch 'fronkdev' into 'master'
ADB Rimo Import Broker

See merge request fronk/thetool!1009
2025-02-11 14:02:54 +00:00
Daniel Spitzer
5e0a8aaf4c Merge branch 'master' into 'spidev'
# Conflicts:
#   application/Device/DeviceController.php
2025-02-11 14:02:08 +00:00
Daniel Spitzer
23185bedb5 Devicecontroller Bugfix
* Admin hat keine Devices mehr gesehen
2025-02-11 15:00:53 +01:00
Frank Schubert
0dc103887e Merge branch 'master' into fronkdev 2025-02-11 14:32:51 +01:00
Frank Schubert
b5124f3dab ConstructionConsentProject: Added company permissions 2025-02-11 14:32:02 +01:00
Frank Schubert
3520642930 Added ADB Rimo Import Broker 2025-02-11 14:30:18 +01:00
Frank Schubert
827817a895 Merge branch 'fronkdev' into 'master'
Added rimo_external_id to preorderadressreporting api

See merge request fronk/thetool!1007
2025-02-10 15:28:40 +00:00
Frank Schubert
bef7dcb48c Added rimo_external_id to preorderadressreporting api 2025-02-10 16:28:15 +01:00
Frank Schubert
def9c94c25 Merge branch 'fronkdev' into 'master'
new OAID type "other" / added adrcd to preorderreporting api

See merge request fronk/thetool!1006
2025-02-10 15:12:17 +00:00
Frank Schubert
5a1c07882b new OAID type "other" / added adrcd to preorderreporting api 2025-02-10 16:11:12 +01:00
Luca Haid
11b09c6b93 Update DeviceController.php 2025-02-10 13:06:59 +00:00
Luca Haid
1bcc192399 Update TTCrud.php 2025-02-10 08:08:12 +00:00
Luca Haid
131506d74e Update TTCrud.php 2025-02-10 08:04:04 +00:00
Luca Haid
9022b464d9 Update WarehouseEShopOrderController.php 2025-02-10 07:59:39 +00:00
Daniel Spitzer
230ed330ee Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1005
2025-02-08 19:57:27 +00:00
Daniel Spitzer
6ed34fe676 Zeiterfassung
* Feature Implementation Arbeitszeitänderungen mit History für alle möglichen historischen Berechnungen und Auswertung fertigstellung
2025-02-08 20:56:29 +01:00
Frank Schubert
8ce7bcc6de Merge branch 'fronkdev' into 'master'
Now listing creator and editor in Building/Index

See merge request fronk/thetool!1004
2025-02-07 13:09:16 +00:00