Commit Graph

1107 Commits

Author SHA1 Message Date
Frank Schubert
c5693a6f07 Merge branch 'fronkdev' into 'master'
fixed saving edit_by in Contract/save

See merge request fronk/thetool!560
2024-08-05 14:15:36 +00:00
Frank Schubert
b74dfced74 fixed saving edit_by in Contract/save 2024-08-05 16:15:08 +02:00
Frank Schubert
541cb3f160 Merge branch 'fronkdev' into 'master'
partner Credit Contracts get Provision Vatgroup

See merge request fronk/thetool!559
2024-08-05 14:03:26 +00:00
Frank Schubert
29b6ebc8e8 partner Credit Contracts get Provision Vatgroup 2024-08-05 16:02:46 +02:00
Luca Haid
28a476eeda Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
switched csv export to excel export

See merge request fronk/thetool!556
2024-08-02 07:40:21 +00:00
27e4f6cd82 switched csv export to excel export 2024-08-02 10:40:15 +02:00
2c0ee7e83e added csv export for triotronik for e shop orders 2024-08-02 10:28:19 +02:00
Luca Haid
689dba697d Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
added csv export for triotronik for e shop orders

See merge request fronk/thetool!555
2024-08-02 07:28:34 +00:00
Frank Schubert
6ea7fad4e1 Merge branch 'fronkdev' into 'master'
Not creating customer number if at least 1 product is external

See merge request fronk/thetool!554
2024-08-01 19:51:55 +00:00
Frank Schubert
35a1164da7 Not creating customer number if at least 1 product is external 2024-08-01 21:51:21 +02:00
Frank Schubert
990a10aa98 Merge branch 'fronkdev' into 'master'
Added cancel_date filter in Contract/Index

See merge request fronk/thetool!553
2024-08-01 19:26:28 +00:00
Frank Schubert
ef3af99ae4 Added cancel_date filter in Contract/Index 2024-08-01 21:26:03 +02:00
Frank Schubert
8d0605987d Merge branch 'fronkdev' into 'master'
Fixed not showing linked credits in Contract/Cancelform

See merge request fronk/thetool!552
2024-08-01 19:15:29 +00:00
Frank Schubert
3bec7832f5 Fixed not showing linked credits in Contract/Cancelform 2024-08-01 21:15:03 +02:00
Frank Schubert
c466b7585c Merge branch 'fronkdev' into 'master'
Changed to contractqueue and contract

See merge request fronk/thetool!549
2024-08-01 18:46:12 +00:00
Frank Schubert
840c5b6f2a Changed to contractqueue and contract 2024-08-01 20:45:44 +02:00
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
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
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
e31c240f76 fixed searching for article packets 2024-07-31 13:31:47 +02:00
Luca Haid
e2288ba6cd Feature/add warehouse e shop order items 2024-07-31 10:26:10 +00: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
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
d75f9fa26f Feature/improve domain 2024-07-30 17:52:04 +00:00
Frank Schubert
48f3866bc7 Added sla_id in Contract/Form 2024-07-30 16:36:31 +02: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
4abaa50f56 Added PreorderStatusflag to Preorder/Index 2024-07-29 14:44:08 +02:00
Frank Schubert
44483cdaca removing rimo_id if found on another address in vis update 2024-07-26 13:40:55 +02:00
Frank Schubert
40fc9da9af Addedd CSV update for AddressDB Visibility and rimo id 2024-07-26 13:29:33 +02:00
Frank Schubert
a72010234a Fixed creating new Contracts 2024-07-25 22:19:32 +02:00
Frank Schubert
18f5f78a8f Added productchange notification ticket email 2024-07-25 21:35:53 +02:00
Frank Schubert
3a6c03414b WIP Productchange 2024-07-25 20:31:48 +02:00
Frank Schubert
fe1677d7c6 WIP partner productchange 2024-07-25 17:22:10 +02:00
Frank Schubert
d18ecb8880 Merge branch 'master' into fronkdev 2024-07-25 13:50:02 +02:00
Luca Haid
34e5f0a220 Merge branch 'feature/ipnetwork-update' into 'master'
added delete and update functions to ipnetwork

See merge request fronk/thetool!512
2024-07-25 09:42:25 +00:00
3c82c1e1b0 added delete and update functions to ipnetwork 2024-07-25 12:42:09 +02:00
500486ba38 fixed mysql query for history 2024-07-25 09:21:54 +02:00