Commit Graph
5374 Commits
Author SHA1 Message Date
Luca Haid eb1d610350 fixed km loading 2025-12-22 12:16:41 +01:00
Luca Haid 68cd065a60 Merge branch 'Address/fix-ticket-view' into 'master'
fixed addresstickets view

See merge request fronk/thetool!1975
2025-12-22 09:51:24 +00:00
Luca Haid 27df509505 fixed addresstickets view 2025-12-22 10:51:10 +01:00
Luca Haid f7dc510264 Merge branch 'WarehouseArticle/fix-create' into 'master'
fixed creating WarehouseArticles

See merge request fronk/thetool!1974
2025-12-22 08:36:39 +00:00
Luca Haid cdb19c323d fixed creating WarehouseArticles 2025-12-22 09:36:22 +01:00
Frank Schubert 27a9996aef Merge branch 'fronkdev' into 'master'
Added product_name filter in Order/Index

See merge request fronk/thetool!1973
2025-12-18 14:10:28 +00:00
Frank Schubert 63d19ff87c Added product_name filter in Order/Index 2025-12-18 15:09:54 +01:00
Frank Schubert 77fe99bb09 Merge branch 'fronkdev' into 'master'
adjusted color for ex state in PreorderMap

See merge request fronk/thetool!1972
2025-12-18 12:19:44 +00:00
Frank Schubert b6bd5f21b0 adjusted color for ex state in PreorderMap 2025-12-18 13:19:01 +01:00
Luca Haid e33abdb95a Merge branch 'Warehouse/improve' into 'master'
missing migration

See merge request fronk/thetool!1971
2025-12-17 17:33:33 +00:00
Luca e4c70820aa missing migration 2025-12-17 18:33:22 +01:00
Luca Haid 8e79142225 Merge branch 'Warehouse/improve' into 'master'
fixed stocktake and warehouselocation

See merge request fronk/thetool!1970
2025-12-17 17:30:05 +00:00
Luca 08e4fb7f71 fixed stocktake and warehouselocation 2025-12-17 18:29:49 +01:00
Frank Schubert 510cf384c6 Merge branch 'fronkdev' into 'master'
Made multiple borderpolies possible in PreorderMap

See merge request fronk/thetool!1969
2025-12-17 16:35:32 +00:00
Frank Schubert 80595bcf36 Made multiple borderpolies possible in PreorderMap 2025-12-17 17:34:54 +01:00
Luca Haid 37156d5591 Merge branch 'WarehouseArticle/change-modal' into 'master'
fixed warehouse article

See merge request fronk/thetool!1968
2025-12-17 16:01:57 +00:00
Luca 9680ff004e fixed warehouse article 2025-12-17 17:00:53 +01:00
Frank Schubert 37b0a22b33 Merge branch 'fronkdev' into 'master'
Added ex_state tooltip to all markers in PreorderMap

See merge request fronk/thetool!1967
2025-12-17 15:53:53 +00:00
Frank Schubert ae920c48f2 Added ex_state tooltip to all markers in PreorderMap 2025-12-17 16:53:17 +01:00
Frank Schubert c595750a4e Merge branch 'fronkdev' into 'master'
Added FttxLocation ex state circles to PreorderMap

See merge request fronk/thetool!1966
2025-12-17 15:41:38 +00:00
Frank Schubert f3e9f9c6a5 Added FttxLocation ex state circles to PreorderMap 2025-12-17 16:41:11 +01:00
Luca Haid cc733ea585 Merge branch 'Workorder/fix-multi-tenant-bug' into 'master'
fixed workorder bug

See merge request fronk/thetool!1965
2025-12-17 12:45:09 +00:00
Luca 31cb3c69cf fixed workorder bug 2025-12-17 13:44:23 +01:00
Luca Haid b7ee468e1f Merge branch 'Workorder/fix-multi-tenant-bug' into 'master'
fixed workorder bug

See merge request fronk/thetool!1964
2025-12-17 12:33:04 +00:00
Luca f1073faabe fixed workorder bug 2025-12-17 13:32:46 +01:00
Frank Schubert 717900dd83 Merge branch 'fronkdev' into 'master'
mfValuecache::getMfObject(): make sure object is loaded

See merge request fronk/thetool!1963
2025-12-16 00:47:38 +00:00
Frank Schubert 78a0431cad mfValuecache::getMfObject(): make sure object is loaded 2025-12-16 01:47:04 +01:00
Frank Schubert bfc59adfc8 Merge branch 'fronkdev' into 'master'
Fixed cluster_id in adb-rimo-import-broker

See merge request fronk/thetool!1962
2025-12-16 00:45:35 +00:00
Frank Schubert f5fc0c382a Fixed cluster_id in adb-rimo-import-broker 2025-12-16 01:45:10 +01:00
Frank Schubert be1e7cae14 Merge branch 'fronkdev' into 'master'
Rimo Import: Checking if FCP Status Matrix exists before using it

See merge request fronk/thetool!1961
2025-12-16 00:40:21 +00:00
Frank Schubert 67024e0be2 Rimo Import: Checking if FCP Status Matrix exists before using it 2025-12-16 01:39:44 +01:00
Luca Haid 4d7b74c07e implemented inventur and changed warehousearticle/category 2025-12-15 22:51:44 +00:00
Luca 3000c9e2e7 implemented inventur and changed warehousearticle/category 2025-12-15 23:47:16 +01:00
Frank Schubert 601a4fcb8b Merge branch 'fronkdev' into 'master'
Fixed potential issue with non-existant Netzgebieten

See merge request fronk/thetool!1959
2025-12-15 15:04:31 +00:00
Frank Schubert 54ade253c2 Fixed potential issue with non-existant Netzgebieten 2025-12-15 16:03:59 +01:00
Frank Schubert 9869df07b2 Merge branch 'fronkdev' into 'master'
Fixed getting netzgebiete in AddressdbApicontroller

See merge request fronk/thetool!1958
2025-12-15 14:48:33 +00:00
Frank Schubert 56ffe97c3b Fixed getting netzgebiete in AddressdbApicontroller 2025-12-15 15:47:56 +01:00
Frank Schubert 8c17486f8b Merge branch 'master' into fronkdev 2025-12-15 15:45:34 +01:00
Luca Haid 204edf343e Merge branch 'ADBNetzgebiet/rework' into 'master'
new network model and mfBaseModelV2

See merge request fronk/thetool!1955
2025-12-15 14:38:51 +00:00
Frank Schubert 91b7703bbf Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-12-15 13:16:09 +01:00
Daniel Spitzer 8cd9a96807 Merge branch 'spidev' into 'master'
Pop Updates

See merge request fronk/thetool!1957
2025-12-15 10:28:59 +00:00
Daniel Spitzer 04cc5d2e9a Pop Updates
* Verlinkungsname in der Übersicht wurde korrigiert
2025-12-15 11:28:08 +01:00
Luca Haid ceb3e43a1f Merge branch 'Pipework/add-filter' into 'master'
added new AP Name filter in Pipework

See merge request fronk/thetool!1956
2025-12-15 07:58:41 +00:00
Luca b43925d37e added new AP Name filter in Pipework 2025-12-15 08:58:22 +01:00
Luca Haid a96510346e Merge branch 'WarehouseArticle/import' into 'master'
fixed distributor loading

See merge request fronk/thetool!1954
2025-12-15 00:18:49 +00:00
Luca a8e4834463 fixed distributor loading 2025-12-15 01:18:38 +01:00
Luca b4961fd423 new network model and mfBaseModelV2 2025-12-14 22:15:00 +01:00
Daniel Spitzer 12a7598447 Merge branch 'spidev' into 'master'
Pop Updates

See merge request fronk/thetool!1953
2025-12-14 19:00:42 +00:00
Daniel Spitzer 81fe058e3e Pop Updates
* Kategorie wurde hinzugefügt
* beim Bearbeiten von der Vue Table kommt man beim Speichern und Abbrechen nun wieder in die Pop Übersicht
2025-12-14 19:59:35 +01:00
Luca Haid ce1cdb0c53 Update 20251210120000_add_workorder_mph_permissions.php 2025-12-13 23:35:56 +00:00