Commit Graph
2119 Commits
Author SHA1 Message Date
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 495112e0e7 Merge branch 'fronkdev' into 'master'
Added amount in Contractqueue/Index

See merge request fronk/thetool!572
2024-08-06 19:34:16 +00:00
Frank Schubert a7b30a9e4b Added amount in Contractqueue/Index 2024-08-06 21:33:44 +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 d31fab74d4 Merge branch 'fronkdev' into 'master'
Fixed js in Order/Form

See merge request fronk/thetool!568
2024-08-06 17:28:50 +00:00
Frank Schubert b70518b3fd Fixed js in Order/Form 2024-08-06 19:28:21 +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 487cc70e33 Merge branch 'fronkdev' into 'master'
added fibu_account to owner in compare script

See merge request fronk/thetool!564
2024-08-05 19:04:20 +00:00
Frank Schubert 75f75b6327 added fibu_account to owner in comppare script 2024-08-05 21:03:02 +02:00
Frank Schubert 00d3db1c97 Merge branch 'fronkdev' into 'master'
Added address use to billingaddress compare script

See merge request fronk/thetool!563
2024-08-05 18:53:34 +00:00
Frank Schubert d19ee98092 Added address use to billingaddress compare script 2024-08-05 20:52:59 +02:00
Frank Schubert 080dd7f7d0 Merge branch 'fronkdev' into 'master'
Added billingaddress compare script

See merge request fronk/thetool!562
2024-08-05 18:43:53 +00:00
Frank Schubert 5006b2fa88 Added billingaddress compare script 2024-08-05 20:43:33 +02:00
Frank Schubert 052bad3089 Merge branch 'fronkdev' into 'master'
Added billingaddress compare script

See merge request fronk/thetool!561
2024-08-05 18:42:51 +00:00
Frank Schubert 440ffbd8b9 Added billingaddress compare script 2024-08-05 20:42:21 +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
Frank Schubert 1dcbabf659 Merge branch 'fronkdev' into 'master'
fixed selecting vatgroup in Contract/Form

See merge request fronk/thetool!558
2024-08-05 13:57:31 +00:00
Frank Schubert dcc86ad335 fixed selecting vatgroup in Contract/Form 2024-08-05 15:57:04 +02:00
Frank Schubert ca18d03b85 Merge branch 'fronkdev' into 'master'
Fixed ignoring first 300 buildings in rimo import

See merge request fronk/thetool!557
2024-08-02 10:27:49 +00:00
Frank Schubert 349a73bd3a Fixed ignoring first 300 buildings in rimo import 2024-08-02 12:27:03 +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 dba2d56dd8 Merge branch 'fronkdev' into 'master'
fixed contract form

See merge request fronk/thetool!551
2024-08-01 18:56:52 +00:00
Frank Schubert ab5d5a2ced fixed contract form 2024-08-01 20:56:32 +02:00
Frank Schubert 5f488c9884 Merge branch 'fronkdev' into 'master'
Added Contractqueue to menu

See merge request fronk/thetool!550
2024-08-01 18:51:49 +00:00
Frank Schubert 1d935a0e01 Added Contractqueue to menu 2024-08-01 20:51:21 +02:00