Commit Graph
2714 Commits
Author SHA1 Message Date
Frank Schubert 95b0f5d80e Merge branch 'fronkdev' into 'master'
Now showing all Workorders in Preorder detail

See merge request fronk/thetool!661
2024-10-10 14:43:14 +00:00
Frank Schubert a0b5c9cc6e Now showing all Workorders in Preorder detail 2024-10-10 16:42:22 +02:00
Luca Haid eadaf797f2 Merge branch 'bugfix/e-shop' into 'master'
fixed error while creating shipping note for e-shop order

See merge request fronk/thetool!660
2024-10-10 12:35:04 +00:00
Luca e4c21960aa fixed error while creating shipping note for e-shop order 2024-10-10 14:31:36 +02:00
Frank Schubert 396e26c0a1 WIP Preorder readonly user (meridiam) 2024-10-10 14:17:11 +02:00
Frank Schubert 729ae61812 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-10-10 14:16:56 +02:00
Frank Schubert c95311d528 added skel of RimoWorkorder Contact update in Preorder.php 2024-10-10 14:16:31 +02:00
Luca Haid 4876fc3fd0 Merge branch 'bugfix/e-shop' into 'master'
added shipping notes for warehouse e shop

See merge request fronk/thetool!659
2024-10-10 09:20:37 +00:00
Luca 6b2e0eb14e added shipping notes for warehouse e shop 2024-10-10 11:19:35 +02:00
Luca Haid 7f4239a768 Merge branch 'bugfix/e-shop' into 'master'
fixed error because it is now object instead of array

See merge request fronk/thetool!658
2024-10-10 08:58:52 +00:00
Luca fd70379db6 fixed error because it is now object instead of array 2024-10-10 10:58:37 +02:00
Luca Haid 726d77f9dc Merge branch 'feature/address-show-internal-note' into 'master'
show internal note in the view of an address

See merge request fronk/thetool!657
2024-10-10 08:13:44 +00:00
Luca 883912a46f show internal note in the view of an address 2024-10-10 10:13:24 +02:00
Luca Haid 7d4d8d9b58 Merge branch 'bugfix/create-locations-action' into 'master'
fixed createLocations Action not working

See merge request fronk/thetool!656
2024-10-10 07:34:43 +00:00
Luca 8fdab0a1bf fixed createLocations Action not working 2024-10-10 09:34:24 +02:00
Luca Haid 5814988016 Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!655
2024-10-10 06:54:14 +00:00
Luca ea5a25ea03 update for warehouse 2024-10-10 08:53:49 +02:00
Luca Haid 6eda9de0dd Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!654
2024-10-10 06:52:01 +00:00
Luca c57eef6e8d update for warehouse 2024-10-10 08:49:50 +02:00
Frank Schubert b5f06932a2 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!653
2024-10-09 15:46:27 +00:00
Frank Schubert cb71af915f same for thetool OAIDs 2024-10-09 17:46:04 +02:00
Frank Schubert 50bfe05443 Preorder save() now handles OAID of changeing Wohneinheit 2024-10-09 17:20:08 +02:00
Frank Schubert 8ae8c4e3ac Merge branch 'fronkdev' into 'master'
Added script to delete OAIDs incl. all linked data from Preorders

See merge request fronk/thetool!652
2024-10-09 14:55:00 +00:00
Frank Schubert a64dc497e0 Added script to delete OAIDs incl. all linked data from Preorders 2024-10-09 16:54:11 +02:00
Frank Schubert 51bb97660a Merge branch 'fronkdev' into 'master'
Added new Rimoapi library class

See merge request fronk/thetool!651
2024-10-09 12:38:07 +00:00
Frank Schubert 03c400ed79 Added new Rimoapi library class 2024-10-09 14:35:57 +02:00
Daniel Spitzer dd22122645 Merge branch 'spidev' into 'master'
Zeiterfassung (Monatsansicht auf 3 Monate in die Zukunft erweitert.)

See merge request fronk/thetool!650
2024-10-07 13:33:42 +00:00
Daniel Spitzer 827b3d89ee Monatsansicht auf 3 Monate in die Zukunft erweitert. 2024-10-07 15:32:13 +02:00
Frank Schubert 3c528ff657 Merge branch 'fronkdev' into 'master'
Added Sprachtarif to Contractqueue

See merge request fronk/thetool!649
2024-10-03 16:21:25 +00:00
Frank Schubert 6b7bf26df3 Added Sprachtarif to Contractqueue 2024-10-03 18:20:46 +02:00
Frank Schubert 5b4f84d128 Merge branch 'fronkdev' into 'master'
Contract: Fixed finish- and cancel date by handling

See merge request fronk/thetool!648
2024-10-03 15:16:29 +00:00
Frank Schubert 280e3e06de Contract: Fixed finish- and cancel date by handling 2024-10-03 17:15:35 +02:00
Frank Schubert a56983824f Invoice/Index layout tweak 2024-10-02 12:54:29 +02:00
Frank Schubert e50aa2c509 Merge branch 'fronkdev' into 'master'
snopp opsdata api connected/active status for estmk networks

See merge request fronk/thetool!647
2024-09-30 14:03:00 +00:00
Frank Schubert fa404eec3c snopp can also update active state for estmk networks now 2024-09-30 16:01:23 +02:00
Frank Schubert f52aa5825c added estmk networks for conneced state update in opsdata api 2024-09-30 15:43:18 +02:00
Luca Haid 050f820525 Merge branch 'feature/update-warehouse' into 'master'
fixed creating csv

See merge request fronk/thetool!646
2024-09-27 10:29:02 +00:00
Luca 8a2b8c0b20 fixed creating csv 2024-09-27 12:27:54 +02:00
Frank Schubert 8165f03a74 Merge branch 'fronkdev' into 'master'
added importing service active state (preorder 500) in rimo import

See merge request fronk/thetool!645
2024-09-26 19:33:33 +00:00
Frank Schubert a193958c33 added importing service active state (preorder 500) in rimo import 2024-09-26 21:32:38 +02:00
Frank Schubert 87dde4a132 Merge branch 'fronkdev' into 'master'
only importing active campaigns in Opsdata Api

See merge request fronk/thetool!644
2024-09-26 16:18:41 +00:00
Frank Schubert 084cdb13f1 only importing active campaigns in Opsdata Api 2024-09-26 18:18:11 +02:00
Frank Schubert 8f96676d76 Merge branch 'fronkdev' into 'master'
Fixed statusflags only set on Adddresses with Preorder and added snopp

See merge request fronk/thetool!643
2024-09-26 15:32:11 +00:00
Frank Schubert 383543721b Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-09-26 17:31:36 +02:00
Frank Schubert e325e19b05 Fixed statusflags only set on Adddresses with Preorder and added snopp
connected api
2024-09-26 17:31:07 +02:00
Frank Schubert f27ce3bb75 Fixed statusflags only set on Adddresses with Preorder 2024-09-26 17:30:00 +02:00
Frank Schubert 646c932592 Merge branch 'fronkdev' into 'master'
fixed wrong comment

See merge request fronk/thetool!642
2024-09-25 12:46:53 +00:00
Frank Schubert 145e07b688 fixed wrong comment 2024-09-25 14:46:29 +02:00
Frank Schubert b9a31dfeac Merge branch 'fronkdev' into 'master'
removed status update in AddressDB/Index

See merge request fronk/thetool!641
2024-09-25 12:45:38 +00:00
Frank Schubert d4eca0fa36 removed status update in AddressDB/Index 2024-09-25 14:44:57 +02:00