Commit Graph

1931 Commits

Author SHA1 Message Date
Daniel Spitzer
8b4589523e Merge branch 'spidev' into 'master'
Zeiterfassung Anpassungen Jobrad Feature

See merge request fronk/thetool!488
2024-07-14 11:16:33 +00:00
Daniel Spitzer
d52d83327f Zeiterfassung Anpassungen Jobrad Feature
* Jobrad ist nun direkt in die Verrechnung inkludiert mit eigener DB Spalte
 * Migration Jobrad Verrechnung
 * Diverse Bugfixes
2024-07-14 13:11:51 +02:00
Frank Schubert
0817322c33 Merge branch 'fronkdev' into 'master'
Added credit invoice csv download csv template

See merge request fronk/thetool!487
2024-07-12 16:59:32 +00:00
Frank Schubert
8e6bbaec54 Added credit invoice csv download csv template 2024-07-12 18:59:05 +02:00
Frank Schubert
25e494b261 Merge branch 'fronkdev' into 'master'
Added Credit CSV download to Invoice/Index

See merge request fronk/thetool!486
2024-07-12 16:58:20 +00:00
Frank Schubert
5e5e4de27d Added Credit CSV download to Invoice/Index 2024-07-12 18:57:46 +02:00
Frank Schubert
acbe2e77e6 Merge branch 'fronkdev' into 'master'
Made address narrower in Invoice Pdf Header

See merge request fronk/thetool!485
2024-07-12 15:47:05 +00:00
Frank Schubert
1ca399786f Made address narrower in Invoice Pdf Header 2024-07-12 17:46:24 +02:00
Frank Schubert
9200919364 Merge branch 'fronkdev' into 'master'
now able to remove dates from Contract

See merge request fronk/thetool!484
2024-07-11 19:55:15 +00:00
Frank Schubert
d912ed324b now able to remove dates from Contract 2024-07-11 21:54:50 +02:00
Frank Schubert
37713cefa0 Merge branch 'fronkdev' into 'master'
Changed ticket Type in Cancel Form

See merge request fronk/thetool!483
2024-07-11 19:45:11 +00:00
Frank Schubert
f739566cc4 Changed ticket Type in Cancel Form 2024-07-11 21:44:50 +02:00
Frank Schubert
c18bf076d7 Merge branch 'fronkdev' into 'master'
Changed format for ticket system Cancel Notifcation

See merge request fronk/thetool!482
2024-07-11 19:39:09 +00:00
Frank Schubert
acef0be79c Changed format for ticket system Cancel Notifcation 2024-07-11 21:38:11 +02:00
Frank Schubert
b4bb07ed4c Merge branch 'fronkdev' into 'master'
Fixed email copies in Contract Cancel

See merge request fronk/thetool!481
2024-07-11 19:05:11 +00:00
Frank Schubert
1a56d37cd5 Fixed email copies in Contract Cancel 2024-07-11 21:04:36 +02:00
Frank Schubert
efdcec69c7 Merge branch 'fronkdev' into 'master'
Sending email to ticketsystem after Contract Cancel

See merge request fronk/thetool!480
2024-07-11 18:49:04 +00:00
Frank Schubert
ffbd465c3e Sending email to ticketsystem after Contract Cancel 2024-07-11 20:44:19 +02:00
Frank Schubert
fa72d24ffb Merge branch 'fronkdev' into 'master'
Size changes in cancel notification pdf

See merge request fronk/thetool!479
2024-07-11 16:32:56 +00:00
Frank Schubert
8c2c3cbcbe Size changes in cancel notification pdf 2024-07-11 18:32:17 +02:00
Frank Schubert
b9168336ef Merge branch 'fronkdev' into 'master'
Fixed showing linked contracts in CancelForm

See merge request fronk/thetool!478
2024-07-11 16:17:47 +00:00
Frank Schubert
806e63d5e2 Fixed showing linked contracts in CancelForm 2024-07-11 18:17:21 +02:00
Frank Schubert
9cf1da489b Merge branch 'fronkdev' into 'master'
Made billing_period==0 contracts uncancelable

See merge request fronk/thetool!477
2024-07-11 16:13:39 +00:00
Frank Schubert
714c73f905 Made billing_period==0 contracts uncancelable 2024-07-11 18:12:41 +02:00
Frank Schubert
2b5b50b040 Merge branch 'fronkdev' into 'master'
Sending email to customer after Cancel

See merge request fronk/thetool!476
2024-07-11 15:59:09 +00:00
Frank Schubert
2f2e748910 Sending email to customer after Cancel 2024-07-11 17:58:21 +02:00
Frank Schubert
84593236ce Merge branch 'fronkdev' into 'master'
Added emailtemplate for Cancel notification

See merge request fronk/thetool!475
2024-07-11 15:51:19 +00:00
Frank Schubert
8807d7197e Added emailtemplate for Cancel notification 2024-07-11 17:50:41 +02:00
Frank Schubert
f529f4dd26 Merge branch 'fronkdev' into 'master'
Finished Contract Cancel

See merge request fronk/thetool!474
2024-07-11 12:07:58 +00:00
Frank Schubert
3b35bd561e Finished Contract Cancel 2024-07-11 14:07:29 +02:00
Frank Schubert
45b9ddf053 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!473
2024-07-11 11:30:12 +00:00
Frank Schubert
87f3708fe8 Merge branch 'master' into fronkdev 2024-07-11 13:28:35 +02:00
Frank Schubert
b6d2a3107d Merge branch 'bugfix/fix-breadcrumbs-invoice' into 'master'
Fixed Breadcrumbs for Address->Invoice View

See merge request fronk/thetool!472
2024-07-11 07:14:37 +00:00
Luca Haid
774044fe9b Fixed Breadcrumbs for Address->Invoice View 2024-07-11 06:00:51 +00:00
Frank Schubert
5b0141cf68 Contract Cancelling done 2024-07-10 21:13:21 +02:00
Frank Schubert
58b254555c Merge branch 'fronkdev' into 'master'
optical changes

See merge request fronk/thetool!471
2024-07-10 18:58:57 +00:00
Frank Schubert
171b32fb56 optical changes 2024-07-10 20:58:23 +02:00
Frank Schubert
8d3ab95708 Merge branch 'fronkdev' into 'master'
Changed text in Address/invoice

See merge request fronk/thetool!470
2024-07-10 17:26:32 +00:00
Frank Schubert
30eb172eb6 Changed text in Address/invoice 2024-07-10 19:26:07 +02:00
Frank Schubert
8ef471ce3c Merge branch 'fronkdev' into 'master'
Added permission for Invoice

See merge request fronk/thetool!469
2024-07-10 17:17:30 +00:00
Frank Schubert
c9a8a4fef3 Added permission for Invoice 2024-07-10 19:17:06 +02:00
Frank Schubert
465625fa83 Merge branch 'fronkdev' into 'master'
Added Address Invoice view

See merge request fronk/thetool!468
2024-07-10 17:11:29 +00:00
Frank Schubert
2094fd66a2 Added Address Invoice view 2024-07-10 19:10:51 +02:00
Frank Schubert
0640961983 Merge branch 'fronkdev' into 'master'
Added generating/downloading Print Invoices

See merge request fronk/thetool!467
2024-07-10 15:48:03 +00:00
Frank Schubert
bf4b294ca6 deleting tmp files from pdfunite 2024-07-10 17:47:18 +02:00
Frank Schubert
96155c6c95 Added generating/downloading Print Invoices 2024-07-10 17:44:40 +02:00
Frank Schubert
31166b5a50 Merge branch 'fronkdev' into 'master'
Fixes for Invoice Email

See merge request fronk/thetool!466
2024-07-10 14:21:37 +00:00
Frank Schubert
369bfa09b1 Fixes for Invoice Email 2024-07-10 16:19:57 +02:00
Frank Schubert
7e5a816c87 Merge branch 'fronkdev' into 'master'
Finished Invoice Email Delivery

See merge request fronk/thetool!465
2024-07-10 13:42:07 +00:00
Frank Schubert
178e71b280 Finished Invoice Email Delivery 2024-07-10 15:41:40 +02:00