Commit Graph

1963 Commits

Author SHA1 Message Date
Frank Schubert
ce671f2edd Merge branch 'master' into fronkdev 2024-07-23 15:52:06 +02:00
Frank Schubert
56be9eea81 Started Order productchange 2024-07-23 15:51:39 +02:00
Luca Haid
44848b06c7 Merge branch 'feature/add-disable-filtering' into 'master'
added disable-filtering option

See merge request fronk/thetool!500
2024-07-23 13:50:46 +00:00
4456c3e8fb added disable-filtering option 2024-07-23 16:50:25 +02:00
Frank Schubert
d8b3002cfa WIP 2024-07-22 2024-07-23 13:03:45 +02:00
Frank Schubert
10f1fed645 Merge branch 'preorderstatus-neu' into 'master'
Added birthday to Address

See merge request fronk/thetool!499
2024-07-18 13:05:55 +00:00
Frank Schubert
724e2eccee Added birthday to Address 2024-07-18 15:05:24 +02:00
Frank Schubert
07f56e431d Merge branch 'preorderstatus-neu' into 'master'
Fixed displaying status history in Preorder

See merge request fronk/thetool!498
2024-07-18 12:47:08 +00:00
Frank Schubert
d54673289f Fixed displaying status history in Preorder 2024-07-18 14:46:40 +02:00
Frank Schubert
7f3aa20c11 Merge branch 'preorderstatus-neu' into 'master'
Added general history in Preorder

See merge request fronk/thetool!497
2024-07-18 12:42:04 +00:00
Frank Schubert
f08111c9a4 Added general history in Preorder 2024-07-18 14:28:41 +02:00
Frank Schubert
578e813727 Merge branch 'master' into preorderstatus-neu 2024-07-18 13:06:29 +02:00
Frank Schubert
398b908729 Merge branch 'fronkdev' into 'master'
Added commercial contact for addresses

See merge request fronk/thetool!496
2024-07-18 10:40:09 +00:00
Frank Schubert
678709e529 Added commercial contact for addresses 2024-07-18 12:39:28 +02:00
Frank Schubert
af3a97032b Added PreorderStatusflag tables and classes 2024-07-17 18:10:15 +02:00
Frank Schubert
13918abb53 Merge branch 'master' into fronkdev 2024-07-17 17:41:13 +02:00
Frank Schubert
f34e43badb Merge branch 'fronkdev' into 'master'
Updated wohneinheit count script

See merge request fronk/thetool!495
2024-07-17 15:39:50 +00:00
Frank Schubert
ae9d6bcd22 Updated wohneinheit count script 2024-07-17 17:38:55 +02:00
Frank Schubert
3e47c9a8d6 Fixed saving PreorderHistory only once 2024-07-17 16:26:46 +02:00
Frank Schubert
1042a48620 Merge branch 'feature/preorder-add-history' into 'master'
Feature/preorder add history

See merge request fronk/thetool!397
2024-07-17 13:34:23 +00:00
Luca Haid
04153eb8d3 Feature/preorder add history 2024-07-17 13:34:22 +00:00
Frank Schubert
1a62524b40 Merge branch 'master' into fronkdev 2024-07-17 14:23:19 +02:00
Frank Schubert
605cc389d1 Changes to test.php 2024-07-17 14:22:33 +02:00
Frank Schubert
6d5aaae117 WIP Productchange 2024-07-16 2024-07-16 22:50:49 +02:00
Luca Haid
076b513039 Merge branch 'bugfix/voicecallhistory' into 'master'
fixed voice call history not opening

See merge request fronk/thetool!494
2024-07-16 15:03:24 +00:00
4943cb0d4c fixed voice call history not opening 2024-07-16 18:03:04 +02:00
1d3acd70e3 fixed table column disappearing 2024-07-16 17:59:59 +02:00
Luca Haid
59e6066451 Merge branch 'bugfix/table-columns' into 'master'
fixed table column disappearing

See merge request fronk/thetool!493
2024-07-16 15:01:26 +00:00
Frank Schubert
43a0c11de3 Merge branch 'fronkdev' into 'master'
Added Columns to Invoice CSV Export and added csv to Address/Invoice

See merge request fronk/thetool!491
2024-07-16 11:49:06 +00:00
Frank Schubert
021ac2cd5a Added Columns to Invoice CSV Export and added csv to Address/Invoice 2024-07-16 13:48:35 +02:00
Luca Haid
7c0df8bb15 Merge branch 'feature/warehouse' into 'master'
Feature/warehouse

See merge request fronk/thetool!490
2024-07-16 06:55:47 +00:00
Luca Haid
e75f13f8d8 Feature/warehouse 2024-07-16 06:55:46 +00:00
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