Commit Graph

2067 Commits

Author SHA1 Message Date
Frank Schubert
a9063ff1d1 Merge branch 'fronkdev' into 'master'
changed filter in Contractqueue Import

See merge request fronk/thetool!548
2024-08-01 17:22:52 +00:00
Frank Schubert
489d081d35 changed filter in Contractqueue Import 2024-08-01 19:22:27 +02:00
Frank Schubert
35fee3924d Merge branch 'fronkdev' into 'master'
Contractqueue changes

See merge request fronk/thetool!547
2024-08-01 17:16:07 +00:00
Frank Schubert
7f3075dae6 Contractqueue changes 2024-08-01 19:15:44 +02:00
Frank Schubert
f21068918b Merge branch 'fronkdev' into 'master'
always showing finish_date in Order/Form

See merge request fronk/thetool!546
2024-08-01 16:15:00 +00:00
Frank Schubert
ffa5497759 always showing finish_date in Order/Form 2024-08-01 18:13:05 +02:00
Frank Schubert
e64d048796 Merge branch 'fronkdev' into 'master'
Fixed buttons submitting form in Contractqueue/Index

See merge request fronk/thetool!545
2024-08-01 13:18:46 +00:00
Frank Schubert
a4a1bf2b83 Fixed buttons submitting form in Contractqueue/Index 2024-08-01 15:14:05 +02:00
Frank Schubert
cbf96700b4 Merge branch 'fronkdev' into 'master'
Fixed last item in Contractqueue

See merge request fronk/thetool!544
2024-08-01 13:08:21 +00:00
Frank Schubert
fc8515ab6d Fixed last item in Contractqueue 2024-08-01 15:07:30 +02:00
Frank Schubert
72d386fd46 Merge branch 'fronkdev' into 'master'
fixed email logic in Order/Save

See merge request fronk/thetool!543
2024-08-01 12:37:03 +00:00
Frank Schubert
059d0968f3 fixed email logic in Order/Save 2024-08-01 14:34:33 +02:00
Frank Schubert
b5cad11456 Merge branch 'fronkdev' into 'master'
upgrade exception now for ewerk goesting too

See merge request fronk/thetool!542
2024-08-01 11:55:45 +00:00
Frank Schubert
dd6f8c0dc2 upgrade exception now for ewerk goesting too 2024-08-01 13:54:44 +02:00
Frank Schubert
b776505bef Merge branch 'fronkdev' into 'master'
Fixed saving zero price for onetime billing products in Order/Form

See merge request fronk/thetool!541
2024-08-01 11:49:30 +00:00
Frank Schubert
7085b1b7b3 Fixed saving zero price for onetime billing products in Order/Form 2024-08-01 13:47:22 +02:00
Frank Schubert
1bf211abb2 reformatted application/Preorder/Preorder.php 2024-08-01 13:08:28 +02:00
Daniel Spitzer
c9a104dade Merge branch 'spidev' into 'master'
Zeiterfassung Fix

See merge request fronk/thetool!540
2024-07-31 12:10:59 +00:00
Daniel Spitzer
d043c863bd Zeiterfassung Feature
* Urlaubsübergabe ins BMD wird nun beim Monatsabschluss richtig berücksichtigt
2024-07-31 14:09:35 +02:00
Luca Haid
e40ee16fce Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
fixed searching for article packets

See merge request fronk/thetool!539
2024-07-31 10:32:04 +00:00
e31c240f76 fixed searching for article packets 2024-07-31 13:31:47 +02:00
Luca Haid
27de993a57 Merge branch 'feature/add-warehouse-e-shop-order-items' into 'master'
Feature/add warehouse e shop order items

See merge request fronk/thetool!537
2024-07-31 10:26:10 +00:00
Luca Haid
e2288ba6cd Feature/add warehouse e shop order items 2024-07-31 10:26:10 +00:00
Frank Schubert
e42ce449e3 Merge branch 'fronkdev' into 'master'
fixed not updating addresses in rimo import

See merge request fronk/thetool!536
2024-07-31 09:31:00 +00:00
Frank Schubert
dc0475b29e Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-07-31 11:29:20 +02:00
Frank Schubert
ed0aa00298 fixed not updating addresses in rimo import 2024-07-31 11:28:14 +02:00
Frank Schubert
7152527c9c Merge branch 'fronkdev' into 'master'
Added estmk prefix to upgrade order email

See merge request fronk/thetool!535
2024-07-30 19:16:23 +00:00
Frank Schubert
6ed0a059a6 Added estmk prefix to upgrade order email 2024-07-30 21:14:51 +02:00
Frank Schubert
d7cdfc57fa Merge branch 'fronkdev' into 'master'
hiding upgrade button from estmk in Order/Index

See merge request fronk/thetool!534
2024-07-30 18:58:45 +00:00
Frank Schubert
d773ecd91d hiding upgrade button from estmk in Order/Index 2024-07-30 20:58:08 +02:00
Frank Schubert
914c6402e8 Merge branch 'fronkdev' into 'master'
Added email when ordering upgrade order

See merge request fronk/thetool!533
2024-07-30 18:56:30 +00:00
Frank Schubert
55916249b6 Added email when ordering upgrade order 2024-07-30 20:55:59 +02:00
Luca Haid
215d23ddc2 Merge branch 'feature/improve-domain' into 'master'
Feature/improve domain

See merge request fronk/thetool!532
2024-07-30 18:34:54 +00:00
Luca Haid
aea3ba9fb4 Feature/improve domain 2024-07-30 18:34:53 +00:00
Frank Schubert
1262a8192d Merge branch 'fronkdev' into 'master'
Added missing Order/Upgrade template

See merge request fronk/thetool!531
2024-07-30 18:04:14 +00:00
Frank Schubert
19b0b4a048 Added missing Order/Upgrade template 2024-07-30 20:02:57 +02:00
Frank Schubert
73e634fb77 Merge branch 'fronkdev' into 'master'
Partner productchange done

See merge request fronk/thetool!530
2024-07-30 18:02:07 +00:00
Frank Schubert
a0cd6847b7 Partner productchange done 2024-07-30 20:01:29 +02:00
Luca Haid
3bd2e7a7bc Merge branch 'feature/improve-domain' into 'master'
Feature/improve domain

See merge request fronk/thetool!529
2024-07-30 17:52:05 +00:00
Luca Haid
d75f9fa26f Feature/improve domain 2024-07-30 17:52:04 +00:00
Luca Haid
6aebba464f Merge branch 'feature/tt-table-fix-excel-export' into 'master'
fixed excel export to only show filtered rows

See merge request fronk/thetool!528
2024-07-30 17:01:05 +00:00
d1a598a144 fixed excel export to only show filtered rows 2024-07-30 19:59:44 +02:00
Frank Schubert
f5e0d4fadb Merge branch 'fronkdev' into 'master'
Added sla_id in Contract/Form

See merge request fronk/thetool!527
2024-07-30 14:37:42 +00:00
Frank Schubert
48f3866bc7 Added sla_id in Contract/Form 2024-07-30 16:36:31 +02:00
Frank Schubert
1a437d50c4 Merge branch 'fronkdev' into 'master'
added onetime payment in Order/Form

See merge request fronk/thetool!526
2024-07-30 13:44:38 +00:00
Frank Schubert
b66c85bd06 added onetime payment in Order/Form 2024-07-30 15:43:52 +02:00
Frank Schubert
be0672d8a2 Merge branch 'fronkdev' into 'master'
Rimo Status also update sets status when input params higher then

See merge request fronk/thetool!525
2024-07-29 15:13:00 +00:00
Frank Schubert
75277d3f82 Rimo Status also update sets status when input params higher then
specified
2024-07-29 17:11:35 +02:00
Frank Schubert
0dce17ac25 Added PreorderStatusflags to PreorderHistory 2024-07-29 16:13:04 +02:00
Frank Schubert
6303eb57fc Merge branch 'fronkdev' into 'master'
Added PreorderStatusflag to Preorder/Index

See merge request fronk/thetool!524
2024-07-29 12:45:04 +00:00