Commit Graph
2253 Commits
Author SHA1 Message Date
Luca Haid d4cd3128d6 Merge branch 'warehouse-add-email-parsing' into 'master'
added new tracking support

See merge request fronk/thetool!636
2024-09-20 09:14:04 +00:00
Luca 3eeb0d3697 added new tracking support 2024-09-20 11:13:08 +02:00
Daniel Spitzer aae4443f01 Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!635
2024-09-18 08:18:10 +00:00
Daniel Spitzer 07b3edbf3d Externe Referenz Fix 2024-09-18 10:15:07 +02:00
Daniel Spitzer 299473aee0 Merge branch 'spidev' into 'master'
Externe Referenz Fix Revert

See merge request fronk/thetool!634
2024-09-18 07:46:44 +00:00
Daniel Spitzer 82fba3eb5b Externe Referenz Fix 2024-09-18 09:45:22 +02:00
Daniel Spitzer 059dff3cf7 Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!633
2024-09-18 07:35:02 +00:00
Daniel Spitzer 24e00899cb Externe Referenz Fix 2024-09-18 09:34:28 +02:00
Daniel Spitzer fb9dad9b0e Merge branch 'spidev' into 'master'
Externe Referenz Fix

See merge request fronk/thetool!632
2024-09-18 07:25:30 +00:00
Daniel Spitzer e8dcd81f40 Externe Referenz Fix 2024-09-18 09:24:06 +02:00
Frank Schubert 65e212615b Merge branch 'fronkdev' into 'master'
Added Mailtemplate::renderBody() function

See merge request fronk/thetool!631
2024-09-17 16:19:37 +00:00
Frank Schubert ade1e0897f Added Mailtemplate::renderBody() function 2024-09-17 18:18:38 +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 19e786abd0 fixed typo 2024-09-10 13:57:29 +02:00
Luca d97cd56f01 fixed utf8 encoding in email 2024-09-10 13:56:27 +02:00
Luca 4305c9f473 fixed utf8 encoding in email 2024-09-10 13:55:07 +02:00
Luca 335a3be876 fixed email not sending 2024-09-10 13:45:46 +02:00
Luca 11e2b6f2e2 added confirmation email for eshop 2024-09-10 13:43:32 +02:00
Luca 39c1604db4 added confirmation email for eshop 2024-09-10 12:47:03 +02:00
Luca Haid 432828dd27 Merge branch 'feature/warehouse-improvement' into 'master'
fixed typo

See merge request fronk/thetool!629
2024-09-10 09:57:47 +00: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 0d65e2c1bd Merge branch 'feature/warehouse-improvement' into 'master'
fixed email not sending

See merge request fronk/thetool!627
2024-09-10 09:46:30 +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
Luca Haid e6d5f7ce4c Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!625
2024-09-10 08:47:31 +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 fbebfaadc0 Merge branch 'fronkdev' into 'master'
fixed invoice_file filter in InvoiceModel

See merge request fronk/thetool!620
2024-09-01 17:16:50 +00:00
Frank Schubert 3d749800c0 fixed invoice_file filter in InvoiceModel 2024-09-01 19:11:33 +02:00
Frank Schubert ae396b2709 Merge branch 'fronkdev' into 'master'
updated Invoice PDF generation task for more performance

See merge request fronk/thetool!619
2024-09-01 17:09:35 +00:00
Frank Schubert e770f32bc3 updated Invoice PDF generation task for more performance 2024-09-01 19:08:11 +02:00
Frank Schubert 6bdd96917c Merge branch 'fronkdev' into 'master'
voiceplan PDF font size tweak

See merge request fronk/thetool!618
2024-08-30 11:28:02 +00:00
Frank Schubert c56b7c238a voiceplan PDF font size tweak 2024-08-30 13:27:20 +02:00
Frank Schubert f3fd94a3d3 Merge branch 'fronkdev' into 'master'
Added Voiceplan PDF export

See merge request fronk/thetool!617
2024-08-30 11:17:52 +00:00
Frank Schubert ebace237da Added Voiceplan PDF export 2024-08-30 13:17:22 +02:00
Frank Schubert 46c97221eb Merge branch 'master' into fronkdev 2024-08-30 11:54:30 +02:00
Frank Schubert 69cd4d79e9 Merge branch 'fronkdev' into 'master'
small layout change

See merge request fronk/thetool!616
2024-08-30 09:47:20 +00:00
Frank Schubert 38149de505 small layout change 2024-08-30 11:46:02 +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
Frank Schubert 8d6fbe14a1 Merge branch 'fronkdev' into 'master'
small change in Invoice/Index

See merge request fronk/thetool!614
2024-08-29 14:02:20 +00:00
Frank Schubert 42d2541f6a small change in Invoice/Index 2024-08-29 16:01:43 +02:00
Frank Schubert 0f1e72bc9e Merge branch 'fronkdev' into 'master'
small InvoiceJob update

See merge request fronk/thetool!613
2024-08-29 13:30:49 +00:00
Frank Schubert c9552055dd small InvoiceJob update 2024-08-29 15:29:47 +02:00