Commit Graph
1125 Commits
Author SHA1 Message Date
Frank Schubert 10cfc5b9bf Merge branch 'fronkdev' into 'master'
Added numbers to VoiceCallHistory::addContractIds blacklist

See merge request fronk/thetool!574
2024-08-06 20:49:37 +00:00
Frank Schubert 4bc7ef960e Added numbers to VoiceCallHistory::addContractIds blacklist 2024-08-06 22:48:42 +02:00
Frank Schubert 5b7bd2d0c9 Merge branch 'fronkdev' into 'master'
Not importing Upgrade Orders in Contractqueue anymore

See merge request fronk/thetool!573
2024-08-06 19:59:30 +00:00
Frank Schubert 0d99a62e2d Not importing Upgrade Orders in Contractqueue anymore 2024-08-06 21:58:58 +02:00
Frank Schubert 5fa6b79470 Merge branch 'fronkdev' into 'master'
Fixed creating Credit from Contractqueue

See merge request fronk/thetool!571
2024-08-06 19:16:52 +00:00
Frank Schubert fa77187f1d Fixed creating Credit from Contractqueue 2024-08-06 21:16:24 +02:00
Frank Schubert 93ffde6b5c Merge branch 'fronkdev' into 'master'
Added Voicenumber to Contractqueue

See merge request fronk/thetool!570
2024-08-06 19:04:30 +00:00
Frank Schubert baf2ff2c5b Added Voicenumber to Contractqueue 2024-08-06 21:03:58 +02:00
Frank Schubert ce05337aa8 Merge branch 'fronkdev' into 'master'
Fixed voicenumbers in orders without voicenumbers

See merge request fronk/thetool!569
2024-08-06 18:30:00 +00:00
Frank Schubert a2443cb025 Fixed voicenumbers in orders without voicenumbers 2024-08-06 20:29:25 +02:00
Frank Schubert 158e4bb4bf Merge branch 'fronkdev' into 'master'
Order (multiple voicenumbers) and Contract changes

See merge request fronk/thetool!567
2024-08-06 17:23:03 +00:00
Frank Schubert b654f1ba18 Order (multiple voicenumbers) and Contract changes 2024-08-06 19:22:18 +02:00
Frank Schubert 1d21f0f04f Merge branch 'fronkdev' into 'master'
Added invoice number filter to Invoice/Index

See merge request fronk/thetool!566
2024-08-06 14:08:51 +00:00
Frank Schubert cdf8050a5f Added invoice number filter to Invoice/Index 2024-08-06 16:08:03 +02:00
Frank Schubert fe49be342d Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-08-06 12:19:19 +02:00
Frank Schubert 0caa0bfac2 Saving edit_by in ContractController 2024-08-06 12:19:07 +02:00
Frank Schubert 7d07076fc4 Merge branch 'fronkdev' into 'master'
Billing changes

See merge request fronk/thetool!565
2024-08-05 19:09:45 +00:00
Frank Schubert a6389f014f Billing changes 2024-08-05 21:09:13 +02:00
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
Luca 27e4f6cd82 switched csv export to excel export 2024-08-02 10:40:15 +02:00
Luca 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
Luca 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