Daniel Spitzer
d04afb4dec
Merge branch 'spidev' into 'master'
...
Zeiterfassung neues Feature:
See merge request fronk/thetool!1096
2025-03-10 14:51:52 +00:00
Daniel Spitzer
e57a9a0eed
Zeiterfassung neues Feature:
...
* bei only-admin benutzer werden die Überstunden nun ignoriert
2025-03-10 15:51:19 +01:00
Daniel Spitzer
fd0247c363
Merge branch 'spidev' into 'master'
...
Zeiterfassung neues Feature:
See merge request fronk/thetool!1095
2025-03-10 14:01:13 +00:00
Daniel Spitzer
e6131cda88
Zeiterfassung neues Feature:
...
Features für Project 7832:
* Das Pickerldatum Zusatzfeld
* Auftrennen PKW und Anhänger
* Dokumente Upload
* Standardsortierung
* Ausgeschieden Flag mit Datum
* zusätzliche migration
2025-03-10 14:32:45 +01:00
Luca Haid
105e1a39a0
Merge branch 'constr-consent-add-ez' into 'master'
...
Changed
See merge request fronk/thetool!1094
2025-03-10 13:10:55 +00:00
Luca Haid
2b36a8ea57
Changed
2025-03-10 14:10:37 +01:00
Frank Schubert
478ad7cf09
Merge branch 'fronkdev' into 'master'
...
Fixed Network list in Pop/Index
See merge request fronk/thetool!1093
2025-03-10 12:37:59 +00:00
Frank Schubert
669f5cdc59
Fixed Network list in Pop/Index
2025-03-10 13:36:50 +01:00
Luca Haid
6d7501cce4
Merge branch 'constr-consent-add-ez' into 'master'
...
Added EZ to ConstructionConsent
See merge request fronk/thetool!1092
2025-03-10 12:26:00 +00:00
Luca Haid
d44b8509ea
Added EZ to ConstructionConsent
2025-03-10 13:25:43 +01:00
Luca Haid
5368e7bd91
Merge branch 'warehouse-improve' into 'master'
...
Fixed Issue in TTCrud for PermissionCheck
See merge request fronk/thetool!1091
2025-03-10 12:00:09 +00:00
Luca Haid
d10ffc1be8
Fixed Issue in TTCrud for PermissionCheck
2025-03-10 12:59:47 +01:00
Luca Haid
ae22776c00
Merge branch 'warehouse-improve' into 'master'
...
added new warehouseorder features
See merge request fronk/thetool!1090
2025-03-10 09:40:31 +00:00
Luca Haid
8174902d88
added new warehouseorder features
2025-03-10 10:39:39 +01:00
Daniel Spitzer
b2dabed9a2
Merge branch 'spidev' into 'master'
...
Zeiterfassung neues Feature:
See merge request fronk/thetool!1089
2025-03-10 07:36:40 +00:00
Daniel Spitzer
c42b409972
Zeiterfassung neues Feature:
...
Features für Project 7832:
* Das Pickerldatum Zusatzfeld
* Auftrennen PKW und Anhänger
* Dokumente Upload
* Standardsortierung
* Ausgeschieden Flag mit Datum
* zusätzliche migration
2025-03-10 08:36:12 +01:00
Daniel Spitzer
2b9e09c3de
Merge branch 'spidev' into 'master'
...
Zeiterfassung neues Feature:
See merge request fronk/thetool!1088
2025-03-10 07:18:25 +00:00
Daniel Spitzer
7d176779c9
Zeiterfassung neues Feature:
...
Features für Project 7832:
* Das Pickerldatum Zusatzfeld
* Auftrennen PKW und Anhänger
* Dokumente Upload
* Standardsortierung
* Ausgeschieden Flag mit Datum
* zusätzliche migration
2025-03-10 08:04:56 +01:00
Daniel Spitzer
bad11a69fc
Merge branch 'spidev' into 'master'
...
Zeiterfassung neues Feature:
See merge request fronk/thetool!1087
2025-03-08 08:23:17 +00:00
Daniel Spitzer
6deca44063
Zeiterfassung neues Feature:
...
* Migrations für PRjoect
2025-03-08 09:21:53 +01:00
Luca Haid
182587c0ea
Merge branch 'order-change-email' into 'master'
...
added new warehouseorder features
See merge request fronk/thetool!1086
2025-03-07 07:05:16 +00:00
Luca Haid
7e3b1af54a
added new warehouseorder features
2025-03-07 08:04:36 +01:00
Luca Haid
8f71b2f43c
Merge branch 'order-change-email' into 'master'
...
changed email from office to einkauf
See merge request fronk/thetool!1085
2025-03-06 14:35:43 +00:00
Luca Haid
d24c1cc5dc
changed email from office to einkauf
2025-03-06 15:35:21 +01:00
Luca Haid
495dd2c886
Merge branch 'orderrequest-show-id' into 'master'
...
show id from now on
See merge request fronk/thetool!1084
2025-03-06 14:03:22 +00:00
Luca Haid
e510413abc
show id from now on
2025-03-06 15:03:07 +01:00
Luca Haid
54dd6257d8
Merge branch 'orderrequest-show-id' into 'master'
...
show id from now on
See merge request fronk/thetool!1083
2025-03-06 14:02:30 +00:00
Luca Haid
b5870a34ab
show id from now on
2025-03-06 15:02:14 +01:00
Luca Haid
41c41c7777
Merge branch 'eshop-add-ext-art-nr' into 'master'
...
added external article number for csv and email
See merge request fronk/thetool!1082
2025-03-06 13:08:32 +00:00
Luca Haid
0613e765fe
added external article number for csv and email
2025-03-06 14:07:58 +01:00
Frank Schubert
9f3bced079
Merge branch 'fronkdev' into 'master'
...
ADB Rimo Import Broker redirects its output to logfile now
See merge request fronk/thetool!1081
2025-03-06 13:05:34 +00:00
Frank Schubert
af321566af
ADB Rimo Import Broker redirects its output to logfile now
2025-03-06 14:04:37 +01:00
Luca Haid
1156cbec83
Merge branch 'preordercampaign-add-caching' into 'master'
...
fixed issue in preordercampaign that the total unit count * 2
See merge request fronk/thetool!1080
2025-03-06 12:53:29 +00:00
Luca Haid
187cc30c76
fixed issue in preordercampaign that the total unit count * 2
2025-03-06 13:52:51 +01:00
Luca Haid
e3f74fc822
Merge branch 'preordercampaign-add-caching' into 'master'
...
fixed issue in preordercampaign that the total unit count * 2
See merge request fronk/thetool!1079
2025-03-06 12:52:10 +00:00
Luca Haid
478779fec7
fixed issue in preordercampaign that the total unit count * 2
2025-03-06 13:51:07 +01:00
Luca Haid
cbc482d944
Merge branch 'preordercampaign-add-caching' into 'master'
...
added cache to preordercampaign
See merge request fronk/thetool!1078
2025-03-06 12:29:14 +00:00
Luca Haid
fc222cd7b9
added cache to preordercampaign
2025-03-06 13:28:43 +01:00
Luca Haid
a486c1521c
Merge branch 'fix/WarehouseOrderRequest' into 'master'
...
show warehouseorderrequest note from now on
See merge request fronk/thetool!1077
2025-03-06 12:21:06 +00:00
Luca Haid
b2064c1ef5
show warehouseorderrequest note from now on
2025-03-06 13:19:24 +01:00
Luca Haid
d8ab8421b8
Merge branch 'fix/WarehouseOrderRequest' into 'master'
...
fixed issue with cleartext tt-position-manager <-> tt-autocomplete
See merge request fronk/thetool!1076
2025-03-06 10:41:26 +00:00
Luca Haid
b1038e542d
fixed issue with cleartext tt-position-manager <-> tt-autocomplete
2025-03-06 11:38:41 +01:00
Luca Haid
a729e77781
Update WarehouseOrderRequestController.php
2025-03-06 09:33:07 +00:00
Luca Haid
7a34d2f00e
Merge branch 'warehouse-order-improvements' into 'master'
...
Updated WarehouseOrder and WarehouseOrderRequest
See merge request fronk/thetool!1075
2025-03-06 09:30:26 +00:00
Luca Haid
a4df764a49
Updated WarehouseOrder and WarehouseOrderRequest
2025-03-06 10:29:48 +01:00
Luca Haid
6385fe8371
Merge branch 'preorder-campaign-rework' into 'master'
...
Preorder campaign rework
See merge request fronk/thetool!1074
2025-03-05 16:39:27 +00:00
Luca Haid
0420480399
Preorder campaign rework
2025-03-05 16:39:27 +00:00
Frank Schubert
039c03acfb
Merge branch 'master' into fronkdev
2025-03-05 17:35:35 +01:00
Luca Haid
83d211ed10
Merge branch 'preorder-campaign-rework' into 'master'
...
Preorder campaign rework
See merge request fronk/thetool!1072
2025-03-05 16:32:21 +00:00
Luca Haid
f42e472000
Preorder campaign rework
2025-03-05 16:32:20 +00:00
