Commit Graph

3054 Commits

Author SHA1 Message Date
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
Frank Schubert
fd9367bd8d Now listing creator and editor in Building/Index 2025-02-07 14:08:37 +01:00
Daniel Spitzer
f4408c3458 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1003
2025-02-07 11:29:39 +00:00
Daniel Spitzer
c38a9919b6 Zeiterfassung
* Feature Implementation Arbeitszeitänderungen mit History für alle möglichen historischen Berechnungen und Auswertung
 * neue Migration
2025-02-07 12:27:19 +01:00
Frank Schubert
e39a0355a6 Merge branch 'fronkdev' into 'master'
Everyone can delete Workorders now in Preorder

See merge request fronk/thetool!1002
2025-02-06 13:48:08 +00:00
Frank Schubert
234dd0c27f Everyone can delete Workorders now in Preorder 2025-02-06 14:47:34 +01:00
Frank Schubert
276ef38089 Merge branch 'fronkdev' into 'master'
Everyone can create Workorders for Preorders now

See merge request fronk/thetool!1001
2025-02-06 13:44:29 +00:00
Frank Schubert
3715e81419 Everyone can create Workorders for Preorders now 2025-02-06 14:12:37 +01:00
Luca Haid
740ec1f3d7 Merge branch 'radius-add-auto-live' into 'master'
Radius added auto fetching for under 5 results / enabled checkbox

See merge request fronk/thetool!1000
2025-02-06 10:30:50 +00:00
Luca Haid
814e2e88e3 Merge branch 'preorder-improve-map' into 'master'
Added Tickets View for Customers

See merge request fronk/thetool!999
2025-02-06 10:24:32 +00:00
Luca Haid
e2ee980493 Radius added auto fetching for under 5 results / enabled checkbox 2025-02-06 11:24:14 +01:00
Luca Haid
b1521f8af8 Added Tickets View for Customers 2025-02-06 11:03:49 +01:00
Daniel Spitzer
dcc24a8465 Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!998
2025-02-05 20:02:35 +00:00
Daniel Spitzer
3c4cba8562 Kalender Bugfix
* Grüne Kategorie Bug behoben
2025-02-05 21:01:33 +01:00
Daniel Spitzer
7d040ebc98 Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!997
2025-02-05 19:51:00 +00:00
Daniel Spitzer
f8d0264d6b Kalender Bugfix
* 1 day Reminder Checkbox Bug behoben
2025-02-05 20:44:33 +01:00
Daniel Spitzer
95c69a5e23 Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!996
2025-02-05 19:13:42 +00:00
Daniel Spitzer
c6d3a98b3d Kalender Bugfix
* Wenn bei einem Termin auf info senden geklickt wurde und die Kundeninformation leer war macht er ein NullFeld für die Textinfo, das blockierte das JS beim öffen -> ist behoben
2025-02-05 20:11:01 +01:00
Luca Haid
eb526280b0 Merge branch 'preorder-improve-map' into 'master'
Added Preorder View Url inside the Map

See merge request fronk/thetool!995
2025-02-05 14:35:38 +00:00
Luca Haid
1f317de7a2 Added Preorder View Url inside the Map 2025-02-05 15:35:00 +01:00
Frank Schubert
9fb02e6c7d Merge branch 'fronkdev' into 'master'
Greenfields now exempt from unit count calculation in ADBWohneinheit

See merge request fronk/thetool!993
2025-02-05 13:52:54 +00:00
Frank Schubert
bbd00ffa99 Greenfields now exempt from unit count calculation in ADBWohneinheit 2025-02-05 14:51:13 +01:00
Frank Schubert
ab2067ac10 Merge branch 'fronkdev' into 'master'
everyone can create/delete workorders now in Preorder

See merge request fronk/thetool!992
2025-02-05 12:49:41 +00:00
Frank Schubert
30902fc094 everyone can create/delete workorders now in Preorder 2025-02-05 13:48:37 +01:00
Luca Haid
2ce75b766d Merge branch 'construction-consent-permissions' into 'master'
Updated ConstructionConsent Permissions

See merge request fronk/thetool!991
2025-02-05 08:36:50 +00:00
Luca Haid
04a31770ed Updated ConstructionConsent Permissions 2025-02-05 09:35:34 +01:00
Frank Schubert
3257c612bc Merge branch 'fronkdev' into 'master'
Leska Import / workflow script

See merge request fronk/thetool!990
2025-02-04 22:04:15 +00:00
Frank Schubert
a8c2bcc198 Leska Import / workflow script 2025-02-04 23:02:13 +01:00