Commit Graph

4988 Commits

Author SHA1 Message Date
Luca Haid
cf8b120a3d Merge branch 'Workorder/improve' into 'master'
updated rml workorder

See merge request fronk/thetool!1851
2025-10-20 13:55:49 +00:00
Luca Haid
fc8bcc2e5d updated rml workorder 2025-10-20 13:55:49 +00:00
Luca Haid
42efc73cc6 Merge branch 'PreorderLogistics/add-multiple-campaigns' into 'master'
preorderlogistcs fix fcp filter and fix multiple campaigns

See merge request fronk/thetool!1850
2025-10-20 10:59:10 +00:00
d2ecafb348 preorderlogistcs fix fcp filter and fix multiple campaigns 2025-10-20 12:58:41 +02:00
Luca Haid
336236a0d0 Merge branch 'PreorderLogistics/add-multiple-campaigns' into 'master'
preorderlogistcs fix fcp filter and fix multiple campaigns

See merge request fronk/thetool!1849
2025-10-20 10:56:57 +00:00
40940db8f8 preorderlogistcs fix fcp filter and fix multiple campaigns 2025-10-20 12:56:44 +02:00
Luca Haid
84c21ce203 fixed beigestelltes Material for custom texts 2025-10-20 09:42:18 +00:00
Luca Haid
b6fbe36cd0 fixed beigestelltes Material for custom texts 2025-10-20 09:40:04 +00:00
Luca Haid
63126351dd Merge branch 'WarehouseOffer/add-drag-drop' into 'master'
offer fix

See merge request fronk/thetool!1848
2025-10-16 06:13:07 +00:00
e6d9260441 offer fix 2025-10-16 08:12:54 +02:00
Luca Haid
7a85e5821b Merge branch 'CpeProvisioning/fix' into 'master'
cpeprov fix

See merge request fronk/thetool!1847
2025-10-15 11:07:33 +00:00
030114987c cpeprov fix 2025-10-15 13:07:16 +02:00
Luca Haid
35f27e4713 Merge branch 'WarehouseShippingNote/fix-perm-checkl' into 'master'
fxied permissions in WarehouseShippingNoteController.php

See merge request fronk/thetool!1846
2025-10-14 14:48:53 +00:00
8196a23ede fxied permissions in WarehouseShippingNoteController.php 2025-10-14 16:45:20 +02:00
Luca Haid
1319876194 Update RadiusController.php 2025-10-14 08:58:28 +00:00
Luca Haid
71a49ffac4 Update application/Radius/RadiusController.php 2025-10-14 08:56:44 +00:00
Luca Haid
e060edf7a5 Update Index.php 2025-10-14 08:54:01 +00:00
Luca Haid
0a559d0e5b fixed billed filter 2025-10-14 07:06:29 +00:00
Luca Haid
81cbf5fb6f Merge branch 'Radius/v2-fix' into 'master'
radius-v2-fix

See merge request fronk/thetool!1845
2025-10-13 10:04:50 +00:00
Luca Haid
41a8877ca7 radius-v2-fix 2025-10-13 12:04:39 +02:00
Luca Haid
b5acbd9bea Update WarehouseShippingNoteModal.js 2025-10-13 07:47:03 +00:00
Daniel Spitzer
20338e57fd Merge branch 'spidev' into 'master'
Poprack

See merge request fronk/thetool!1844
2025-10-12 10:20:51 +00:00
Daniel Spitzer
4ef8e733a3 Poprack
Features:

* Komplettes kabelmanagement auf Rack He Modul Basis
2025-10-12 12:19:54 +02:00
Daniel Spitzer
954e3212d1 Merge branch 'spidev' into 'master'
Pop Update

See merge request fronk/thetool!1843
2025-10-12 10:14:01 +00:00
Daniel Spitzer
e17e638263 Pop Update
Features:
* Komplettes kabelmanagement auf Rack He Modul Basis
2025-10-12 12:13:42 +02:00
Daniel Spitzer
fb30c0c771 Merge branch 'spidev' into 'master'
Pop Update

See merge request fronk/thetool!1842
2025-10-12 10:12:34 +00:00
Daniel Spitzer
3d19e8c77b Pop Update
Features:
* Komplettes kabelmanagement auf Rack He Modul Basis
2025-10-12 12:12:18 +02:00
Daniel Spitzer
a9ae10660d Merge branch 'spidev' into 'master'
Pop Update

See merge request fronk/thetool!1841
2025-10-12 10:10:59 +00:00
Daniel Spitzer
0b545ef62a Pop Update
Features:
* Komplettes kabelmanagement auf Rack He Modul Basis
2025-10-12 12:10:37 +02:00
Daniel Spitzer
6fcdea330b Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1840
2025-10-11 17:12:32 +00:00
Daniel Spitzer
6543e0b79b Zeiterfassung Update
* Nachtzulage wird nun in der Personaladministration Übersicht gekennzeichnet
2025-10-11 19:12:10 +02:00
Daniel Spitzer
acd274b00b Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1839
2025-10-11 16:31:01 +00:00
Daniel Spitzer
e4a1e2a85e Zeiterfassung Update
* Nachtzulage wurde in der Personaladministration hinzugefügt
* Bei der Verrechnung werden Ü100 wenn Nachtzulage aktiv ist anders bewertet
2025-10-11 18:29:53 +02:00
Daniel Spitzer
e560ae03b7 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1838
2025-10-11 15:29:44 +00:00
Daniel Spitzer
06a148c915 Zeiterfassung Update
* Monatsansicht für Mitarbeiter nun 3 Monate in der Zukunft
2025-10-11 17:29:05 +02:00
Luca Haid
4d6e5a3387 Merge branch 'Radius/v2' into 'master'
Add new components for managing free users and ONT lookup, enhance UI styling,...

See merge request fronk/thetool!1837
2025-10-11 11:40:17 +00:00
Luca Haid
bea94c3f7e Add new components for managing free users and ONT lookup, enhance UI styling,... 2025-10-11 11:40:17 +00:00
Frank Schubert
0158429bec Merge branch 'fronkdev' into 'master'
Fixed saving ConstructionConsentOwner in History

See merge request fronk/thetool!1835
2025-10-10 12:38:17 +00:00
Frank Schubert
6cd61a2750 Fixed saving ConstructionConsentOwner in History 2025-10-10 14:37:51 +02:00
Frank Schubert
4566e09428 Merge branch 'fronkdev' into 'master'
ignoring non-existant status code in ADBHausnummer::setStatusflag()

See merge request fronk/thetool!1834
2025-10-10 10:31:40 +00:00
Frank Schubert
ae0c4c16b8 ignoring non-existant status code in ADBHausnummer::setStatusflag() 2025-10-10 12:30:32 +02:00
Luca Haid
bd2a0c52a0 Merge branch 'Radius/v2' into 'master'
Add new components for managing free users and ONT lookup, enhance UI styling,...

See merge request fronk/thetool!1833
2025-10-10 07:28:38 +00:00
Luca Haid
67e5a1c94c Add new components for managing free users and ONT lookup, enhance UI styling,... 2025-10-10 07:28:37 +00:00
Luca Haid
44b0eebb7c Merge branch 'WarehouseShippingNote/fix-calendar-entries' into 'master'
Add SNOPP type to available shipping note types

See merge request fronk/thetool!1832
2025-10-09 14:04:17 +00:00
Luca Haid
83342cb532 Add SNOPP type to available shipping note types 2025-10-09 16:04:02 +02:00
Frank Schubert
afed63385a Merge branch 'fronkdev' into 'master'
Order/Form: documents can be uploaded even if order is closed already

See merge request fronk/thetool!1831
2025-10-09 13:35:27 +00:00
Frank Schubert
15bb02de52 Order/Form: documents can be uploaded even if order is closed already 2025-10-09 15:33:24 +02:00
Frank Schubert
4917c9b822 Merge branch 'fronkdev' into 'master'
Fixed showing some orders with termination in special orders in Order/Index

See merge request fronk/thetool!1830
2025-10-09 11:57:20 +00:00
Frank Schubert
c5f60f96c3 Fixed showing some orders with termination in special orders in Order/Index 2025-10-09 13:55:55 +02:00
Luca Haid
3f9572209a Update public/js/pages/WarehouseShippingNote/WarehouseShippingNote.js 2025-10-09 11:41:28 +00:00