Commit Graph

4859 Commits

Author SHA1 Message Date
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
Luca Haid
a4a64a714b Update WarehouseShippingNote.js 2025-10-09 11:40:08 +00:00
Luca Haid
c50117a9c6 Update WarehouseShippingNote.js 2025-10-09 11:38:49 +00:00
Luca Haid
58c01eff89 Update UserEdit.js 2025-10-09 11:37:01 +00:00
Luca Haid
a8f409cc14 updated showing reservations in assetmanagement 2025-10-09 11:35:43 +00:00
Luca Haid
cf3dbd100f fixed in progress workorders not possible to change appointment 2025-10-09 11:13:12 +00:00
Daniel Spitzer
c87f298405 Merge branch 'spidev' into 'master'
Kalander Update

See merge request fronk/thetool!1829
2025-10-09 10:26:23 +00:00
Daniel Spitzer
c5ef436920 Zeiterfassung Update
* Nicht freigegebene Abwesenheiten werden nun in der Kalenderübersicht strichliert dargestellt
* Anpassungen in den Genehmigungsemails
2025-10-09 12:24:25 +02:00
Frank Schubert
5729688f83 Merge branch 'fronkdev' into 'master'
Fixed not setting cache in rimo import findHausnummerByStreet()

See merge request fronk/thetool!1828
2025-10-08 15:12:07 +00:00
Frank Schubert
fe08c5c3c0 Fixed not setting cache in rimo import findHausnummerByStreet() 2025-10-08 17:11:09 +02:00
Frank Schubert
40efb86fe7 Merge branch 'fronkdev' into 'master'
fixed unmarking rimo_deleted in rimo import

See merge request fronk/thetool!1827
2025-10-08 14:22:26 +00:00
Frank Schubert
81ae37bcf9 fixed unmarking rimo_deleted in rimo import 2025-10-08 16:21:48 +02:00
Luca Haid
693e0e1ef9 Merge branch 'tt-icon-select/v2' into 'master'
improved tt-select and tt-icon-select

See merge request fronk/thetool!1826
2025-10-08 12:55:26 +00:00
Luca Haid
4713fc7dd0 improved tt-select and tt-icon-select 2025-10-08 14:55:14 +02:00
Luca Haid
803655bec0 Merge branch 'Dashboard/fix-export' into 'master'
fixed export of dashboard

See merge request fronk/thetool!1825
2025-10-08 12:39:55 +00:00
Luca Haid
c8c46ff661 fixed export of dashboard 2025-10-08 14:38:27 +02:00
Luca Haid
022aa40a26 Merge branch 'Workorder/add-new-features' into 'master'
overhauled workorder module

See merge request fronk/thetool!1824
2025-10-08 12:32:14 +00:00
Luca Haid
41f941cfbc overhauled workorder module 2025-10-08 14:32:04 +02:00
Luca Haid
6ade410a7b Merge branch 'Workorder/add-new-features' into 'master'
overhauled workorder module

See merge request fronk/thetool!1823
2025-10-08 11:18:58 +00:00
Luca Haid
2ce870746b overhauled workorder module 2025-10-08 13:18:48 +02:00
Frank Schubert
200226a4bd Merge branch 'fronkdev' into 'master'
streamlined preorderstatusflag saving in Preorderselfservice API

See merge request fronk/thetool!1822
2025-10-07 17:57:34 +00:00
Frank Schubert
6631c1a030 streamlined preorderstatusflag saving in Preorderselfservice API 2025-10-07 19:56:55 +02:00
Frank Schubert
cf3ddd4291 Merge branch 'fronkdev' into 'master'
Changes to rimo import

See merge request fronk/thetool!1821
2025-10-07 17:41:13 +00:00
Frank Schubert
07c101ed6a Changed to rimo impot 2025-10-07 19:40:17 +02:00
Daniel Spitzer
9598fd276f Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1820
2025-10-07 16:43:58 +00:00
Daniel Spitzer
c6dd3c03d2 Zeiterfassung Update
* Nicht freigegebene Abwesenheiten werden nun in der Kalenderübersicht strichliert dargestellt
* Anpassungen in den Genehmigungsemails
2025-10-07 18:43:17 +02:00
Frank Schubert
d8f7f94fd6 Fixed preorder statusflag sync 2025-10-07 17:49:10 +02:00
Daniel Spitzer
4705e2c3b4 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1819
2025-10-07 15:02:58 +00:00
Daniel Spitzer
e2c0a3f963 Zeiterfassung Update
* Nicht freigegebene Abwesenheiten werden nun in der Kalenderübersicht strichliert dargestellt
* Anpassungen in den Genehmigungsemails
2025-10-07 17:02:32 +02:00
Frank Schubert
8424867d61 Merge branch 'fronkdev' into 'master'
Fixed marking units with rimo_deleted

See merge request fronk/thetool!1818
2025-10-07 14:06:11 +00:00