Commit Graph
711 Commits
Author SHA1 Message Date
Daniel Spitzer 56b35eb665 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!707
2024-11-11 06:34:58 +00:00
Daniel Spitzer 8ab5f87109 Kalender
* Update Suche (Suche wird nun auf aktive Kalender eingeschränkt)
2024-11-11 07:33:23 +01:00
Daniel Spitzer be18972f92 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!704
2024-11-10 19:48:50 +00:00
Daniel Spitzer de7330e331 Kalender
* Generelle Updates
2024-11-10 20:47:09 +01:00
Frank Schubert c9c74fd17c Merge branch 'fronkdev2' into 'master'
Preorder AHA Report Download

See merge request fronk/thetool!703
2024-11-08 15:57:25 +00:00
Frank Schubert bddc73ce79 Cleanup of old dev stuff 2024-11-08 16:56:31 +01:00
Frank Schubert 6c0d334bbc WIP tmp 2024-11-07 16:28:05 +01:00
Luca Haid a696f60383 Feature/add historic bills 2024-11-06 12:39:14 +00:00
Luca Haid 7960531197 hotfix on if check 2024-11-05 20:45:16 +01:00
Luca Haid a148da16e4 hotfix on if check 2024-11-05 20:44:31 +01:00
Luca Haid eb9a1a3995 added zabbix sync and view for Device 2024-11-05 20:42:16 +01:00
Luca Haid bea341f869 added new view for device congestion 2024-11-05 19:12:19 +01:00
Daniel Spitzer 7e1dae3fa4 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!688
2024-11-03 20:45:30 +00:00
Daniel Spitzer 44e8be482c Kalender
* Updates
2024-11-03 21:43:33 +01:00
Daniel Spitzer 9a659106a6 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!687
2024-11-03 18:01:07 +00:00
Daniel Spitzer 6ab580c11b Kalender
* Updates
2024-11-03 18:59:39 +01:00
Daniel Spitzer df9945d946 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!686
2024-11-03 17:39:46 +00:00
Daniel Spitzer 6b2b169f25 Kalender
* 1st Upload aller Files Inclusive API Controller
2024-11-03 18:38:11 +01:00
Luca a874099126 added mobile view for eshop 2024-10-29 16:29:45 +01:00
Daniel Spitzer 43e9b14e79 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix

See merge request fronk/thetool!674
2024-10-21 18:08:00 +00:00
Daniel Spitzer 1f24baf4e0 Zeiterfassung Bugfix
* Filter löschen bei Reports wurde angepasst.
2024-10-21 20:07:00 +02:00
Luca 5ca9aedce8 added possibility to set shipping notes as billed 2024-10-14 12:55:59 +02:00
Luca 8d10d56d0a fixed emailing error 2024-10-14 09:25:16 +02:00
Luca 08ac981fde fixed emailing error 2024-10-14 08:57:30 +02:00
Luca 6b2e0eb14e added shipping notes for warehouse e shop 2024-10-10 11:19:35 +02:00
Luca fd70379db6 fixed error because it is now object instead of array 2024-10-10 10:58:37 +02:00
Luca c57eef6e8d update for warehouse 2024-10-10 08:49:50 +02:00
Luca 8a2b8c0b20 fixed creating csv 2024-09-27 12:27:54 +02:00
Luca 3eeb0d3697 added new tracking support 2024-09-20 11:13:08 +02:00
Daniel Spitzer 07b3edbf3d Externe Referenz Fix 2024-09-18 10:15:07 +02:00
Luca Haid ace714413b Merge branch 'feature/warehouse-improvement' into 'master'
added new et ref field for eshop

See merge request fronk/thetool!630
2024-09-12 06:45:23 +00:00
Luca f5dde09ea5 added new et ref field for eshop 2024-09-12 08:36:14 +02:00
Luca 4305c9f473 fixed utf8 encoding in email 2024-09-10 13:55:07 +02:00
Luca 11e2b6f2e2 added confirmation email for eshop 2024-09-10 13:43:32 +02:00
Luca Haid a47bd176eb Merge branch 'feature/warehouse-improvement' into 'master'
Feature/warehouse improvement

See merge request fronk/thetool!628
2024-09-10 09:56:44 +00:00
Luca Haid ca525d998b Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!626
2024-09-10 09:44:06 +00:00
Daniel Spitzer 77fb674913 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix Buttonanzeige Verrechnung

See merge request fronk/thetool!624
2024-09-05 14:03:48 +00:00
Daniel Spitzer e18cc21d34 Zeiterfassung Abwesenheitskalender Änderung
* Mitarbeiter die ausgetreten sind werden im Kalender mit dem Geburtstag nicht mehr angezeigt
2024-09-05 16:00:29 +02:00
Frank Schubert aefa952410 Merge branch 'fronkdev' into 'master'
Added Status Flags to descriptions

See merge request fronk/thetool!623
2024-09-03 16:58:08 +00:00
Frank Schubert 0168c951e9 Added Status Flags to descriptions 2024-09-03 18:57:40 +02:00
Frank Schubert e34a2a7730 Merge branch 'fronkdev' into 'master'
changed flag code to int in preorder api docs

See merge request fronk/thetool!622
2024-09-03 16:46:54 +00:00
Frank Schubert 7f5c3fca8d changed flag code to int in preorder api docs 2024-09-03 18:46:12 +02:00
Frank Schubert 81b98de8a6 Merge branch 'fronkdev' into 'master'
Updated preoder api docs with status flags

See merge request fronk/thetool!621
2024-09-03 16:44:12 +00:00
Frank Schubert 66066acdc6 Updated preoder api docs with status flags 2024-09-03 18:43:05 +02:00
Frank Schubert 5c495f1e3f Merge branch 'fronkdev' into 'master'
Added Mailtemplate

See merge request fronk/thetool!615
2024-08-29 21:23:32 +00:00
Frank Schubert ebd5d6182a Added Mailtemplate 2024-08-29 23:22:49 +02:00
Luca Haid 96a4d79c63 Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
fixed page 0 on client side rendered tables

See merge request fronk/thetool!602
2024-08-21 06:18:16 +00:00
Luca 4221eb7f45 fixed page 0 on client side rendered tables 2024-08-21 09:18:02 +02:00
Frank Schubert df5c215c7f Merge branch 'fronkdev' into 'master'
Fixed productchange for partners

See merge request fronk/thetool!590
2024-08-20 13:38:50 +00:00
Frank Schubert 37a91e63e5 Fixed productchange for partners 2024-08-20 15:37:57 +02:00