Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid 5825383aaf Updated Menu Mobile_hide 2025-04-03 09:56:41 +00:00
Luca Haid c9d9d64c41 Merge branch 'RimoFCP/integrate' into 'master'
added fcps to preorder map

See merge request fronk/thetool!1161
2025-04-02 07:38:03 +00:00
Luca Haid 53b5f7289e added fcps to preorder map 2025-04-02 09:37:24 +02:00
Luca Haid 21fe2565a1 Merge branch 'RimoFCP/integrate' into 'master'
fixed using correct credentials

See merge request fronk/thetool!1158
2025-04-01 13:26:38 +00:00
Luca Haid 68f6666ca6 fixed using correct credentials 2025-04-01 15:26:18 +02:00
Luca Haid 29c31f18f4 Merge branch 'RimoFCP/integrate' into 'master'
Added FCPs to TheTool

See merge request fronk/thetool!1157
2025-04-01 13:19:59 +00:00
Luca Haid 97529ba95f Added FCPs to TheToolAdded WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-04-01 15:19:18 +02:00
Luca Haid 5e01b64c25 Update Index.php 2025-04-01 09:54:48 +00:00
Luca Haid a802ff8e05 Merge branch 'Warehouse/fix-and-improve' into 'master'
Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point

See merge request fronk/thetool!1156
2025-03-31 13:14:15 +00:00
Luca Haid e842d37f98 Added WarehouseOffer and WarehouseOfferTemplate, also fixed menu for Lager Point 2025-03-31 15:13:34 +02:00
Luca Haid 757db66025 Merge branch 'Warehouse/fix-and-improve' into 'master'
Fixed Article Packets and Shipping Note Text Entry

See merge request fronk/thetool!1155
2025-03-31 12:23:09 +00:00
Luca Haid d33d93867f Fixed Article Packets and Shipping Note Text Entry 2025-03-31 14:22:44 +02:00
Luca Haid 02ce43279f Merge branch 'Preorderlogistics/only-show-status-140' into 'master'
only show status 140

See merge request fronk/thetool!1147
2025-03-26 11:04:39 +00:00
Luca Haid af1c716998 only show status 140 2025-03-26 12:03:47 +01:00
Luca Haid 21f3677429 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1146
2025-03-25 16:15:21 +00:00
Luca Haid 39c54a86f9 made preorderlogistics working again 2025-03-25 17:14:49 +01:00
Luca Haid 2c59a5c6c4 Merge branch 'Preorderlogistics/make-working' into 'master'
made preorderlogistics working again

See merge request fronk/thetool!1145
2025-03-25 16:13:27 +00:00
Luca Haid 33b36c6296 made preorderlogistics working again 2025-03-25 17:13:08 +01:00
Luca Haid 7b7bf8028d Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1144
2025-03-25 14:25:34 +00:00
Luca Haid 83c5b11987 added new features 2025-03-25 15:25:07 +01:00
Luca Haid e9a61eac78 Merge branch 'ConstructionConsent/added-new-features' into 'master'
added new features

See merge request fronk/thetool!1143
2025-03-25 12:49:50 +00:00
Luca Haid af6a4e02f5 added new features 2025-03-25 13:49:16 +01:00
Luca Haid 0448daaf59 Merge branch 'ConstructionConsent/add-permission' into 'master'
fixed menu

See merge request fronk/thetool!1141
2025-03-25 09:44:18 +00:00
Luca Haid c94d7de181 fixed menu 2025-03-25 10:43:59 +01:00
Luca Haid 2dfa4e34b2 Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1140
2025-03-25 09:41:34 +00:00
Luca Haid b429862948 added contact edit button 2025-03-25 10:41:19 +01:00
Luca Haid 120d3cab4a Merge branch 'ConstructionConsent/add-permission' into 'master'
added contact edit button

See merge request fronk/thetool!1139
2025-03-25 09:38:52 +00:00
Luca Haid 321726718f added contact edit button 2025-03-25 10:38:20 +01:00
Luca Haid aa7f0c9108 Merge branch 'ConstructionConsent/add-edit-button' into 'master'
added contact edit button

See merge request fronk/thetool!1138
2025-03-25 07:33:01 +00:00
Luca Haid 7be3446383 added contact edit button 2025-03-25 08:32:25 +01:00
Luca Haid 2d5c4e8690 Update WarehouseShippingNoteController.php 2025-03-24 13:53:06 +00:00
Luca Haid cccdede1de Merge branch 'WarehouseShippingNote/improve' into 'master'
Fixed Issue with PDF and Typing

See merge request fronk/thetool!1136
2025-03-24 12:11:08 +00:00
Luca Haid 6c946cd137 Fixed Issue with PDF and Typing 2025-03-24 13:10:42 +01:00
Luca Haid 5e2824b50c Update WarehouseShippingNote.js 2025-03-24 08:53:26 +00:00
Luca Haid 390165bc5e Update WarehouseShippingNote.js 2025-03-24 08:51:10 +00:00
Luca Haid a56e212085 Update WarehouseShippingNote.js 2025-03-24 08:48:24 +00:00
Luca Haid aebb463b74 Merge branch 'WarehouseShippingNote/add-viewer-mode' into 'master'
Added viewer mode

See merge request fronk/thetool!1131
2025-03-21 11:12:31 +00:00
Luca Haid 5b8441dde1 Added viewer mode 2025-03-21 12:08:03 +01:00
Luca Haid b8649a77e2 Fixed Ingena Permission 2025-03-21 10:14:11 +00:00
Luca Haid 2dc3509ff7 Fixed position-manager 2025-03-21 09:30:26 +00:00
Luca Haid ff01974efa Merge branch 'WarehouseShippingNote/remove-console-log' into 'master'
Removed Console Logs

See merge request fronk/thetool!1130
2025-03-21 08:11:44 +00:00
Luca Haid e319f2bf10 Removed Console Logs 2025-03-21 09:11:10 +01:00
Luca Haid 36a1519ff6 Merge branch 'WarehouseShippingNote/fix-hour-entry' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1129
2025-03-21 08:02:25 +00:00
Luca Haid 027338f93d Updated Shipping Note 2025-03-21 09:01:47 +01:00
Luca Haid 88ddd21098 Merge branch 'WarehouseShippingNote/add-customer-search' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1126
2025-03-20 13:49:14 +00:00
Luca Haid d9a2ba1ef4 Updated Shipping Note 2025-03-20 14:48:54 +01:00
Luca Haid 3f8be39626 Merge branch 'WarehouseShippingNote/add-loader' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1125
2025-03-20 13:18:57 +00:00
Luca Haid b293167527 Updated Shipping Note 2025-03-20 14:09:23 +01:00
Luca Haid 438cd85d5f Merge branch 'ShippingNote/rework' into 'master'
Shipping note/rework

See merge request fronk/thetool!1124
2025-03-20 12:14:35 +00:00
Luca Haid d6d84088fb Shipping note/rework 2025-03-20 12:14:34 +00:00
Luca Haid 96ed8caaeb Update PreorderModel.php 2025-03-20 08:41:29 +00:00
Luca Haid 5fb3a3d789 Update PreorderModel.php 2025-03-20 08:39:08 +00:00
Luca Haid 20e1740ad5 Update PreorderModel.php 2025-03-20 08:37:39 +00:00
Luca Haid e56750c534 Update ConstructionConsentOwnerController.php 2025-03-18 11:41:17 +00:00
Luca Haid b24647539a Update User.js 2025-03-17 09:17:44 +00:00
Luca Haid 3a549046f3 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1120
2025-03-17 08:58:57 +00:00
Luca Haid 945cb9cc06 User/rework 2025-03-17 08:58:56 +00:00
Luca Haid 14854260d0 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1118
2025-03-17 08:56:55 +00:00
Luca Haid e28dddc2e2 User/rework 2025-03-17 08:56:54 +00:00
Luca Haid 128cbfe770 Update Consentform.pdf.php 2025-03-13 11:42:29 +00:00
Luca Haid 2a5b0dc371 fixed issue with errors in production 2025-03-13 08:11:47 +00:00
Luca Haid c7185d986b Update ConstructionConsent.php 2025-03-12 14:24:04 +00:00
Luca Haid 70531717d6 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1109
2025-03-12 14:07:36 +00:00
Luca Haid e887dd9019 Construction consent/fix event 2025-03-12 14:07:36 +00:00
Luca Haid 212c16fc5b Reverted Changes 2025-03-12 14:03:15 +00:00
Luca Haid c84e327955 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1106
2025-03-12 14:01:56 +00:00
Luca Haid 6dc7fc58fc Construction consent/fix event 2025-03-12 14:01:55 +00:00
Luca Haid fc4d70764d Merge branch 'WarehouseOrder/fix-create' into 'master'
fixed showing spinner in tt-modal

See merge request fronk/thetool!1105
2025-03-12 10:55:20 +00:00
Luca Haid 839b3843f4 fixed showing spinner in tt-modal 2025-03-12 11:52:19 +01:00
Luca Haid fcd4f63cde Merge branch 'WarehouseOrder/fix-create' into 'master'
fixed pagination issue

See merge request fronk/thetool!1104
2025-03-11 17:01:08 +00:00
Luca Haid af8573c929 fixed pagination issue 2025-03-11 18:00:30 +01:00
Luca Haid e6fa0d049b Merge branch 'WarehouseOrder/fix-create' into 'master'
Fixed things for WarehouseOrder

See merge request fronk/thetool!1103
2025-03-11 16:47:34 +00:00
Luca Haid a6ab876bf0 Fixed things for WarehouseOrder 2025-03-11 17:47:00 +01:00
Luca Haid 8b989fd135 Merge branch 'ConstructionConsent/add-owner-number' into 'master'
Fixed Page Break for ConstructionConsent

See merge request fronk/thetool!1102
2025-03-11 14:10:44 +00:00
Luca Haid 85edc1692e Fixed Page Break for ConstructionConsent 2025-03-11 15:10:20 +01:00
Luca Haid aa1acf9498 Merge branch 'ConstructionConsent/add-owner-number' into 'master'
Added new ConstructionConsent Features

See merge request fronk/thetool!1101
2025-03-11 13:37:55 +00:00
Luca Haid cf4283e122 Added new ConstructionConsent Features 2025-03-11 14:37:28 +01:00
Luca Haid 2036e9453f Merge branch 'warehouseorderrequest/last-improvements' into 'master'
Fixed Icons for WarehouseOrderRequest

See merge request fronk/thetool!1098
2025-03-11 09:14:34 +00:00
Luca Haid 7da880d155 Fixed Icons for WarehouseOrderRequest 2025-03-11 10:13:28 +01:00
Luca Haid cd3f08515c Merge branch 'constr-consent-add-ez' into 'master'
Fixed Construction Consent Birthdate

See merge request fronk/thetool!1097
2025-03-11 08:39:23 +00:00
Luca Haid d2d1306b43 Fixed Construction Consent Birthdate 2025-03-11 09:37:27 +01:00
Luca Haid 105e1a39a0 Merge branch 'constr-consent-add-ez' into 'master'
Changed

See merge request fronk/thetool!1094
2025-03-10 13:10:55 +00:00
Luca Haid 2b36a8ea57 Changed 2025-03-10 14:10:37 +01:00
Luca Haid 6d7501cce4 Merge branch 'constr-consent-add-ez' into 'master'
Added EZ to ConstructionConsent

See merge request fronk/thetool!1092
2025-03-10 12:26:00 +00:00
Luca Haid d44b8509ea Added EZ to ConstructionConsent 2025-03-10 13:25:43 +01:00
Luca Haid 5368e7bd91 Merge branch 'warehouse-improve' into 'master'
Fixed Issue in TTCrud for PermissionCheck

See merge request fronk/thetool!1091
2025-03-10 12:00:09 +00:00
Luca Haid d10ffc1be8 Fixed Issue in TTCrud for PermissionCheck 2025-03-10 12:59:47 +01:00
Luca Haid ae22776c00 Merge branch 'warehouse-improve' into 'master'
added new warehouseorder features

See merge request fronk/thetool!1090
2025-03-10 09:40:31 +00:00
Luca Haid 8174902d88 added new warehouseorder features 2025-03-10 10:39:39 +01:00
Luca Haid 182587c0ea Merge branch 'order-change-email' into 'master'
added new warehouseorder features

See merge request fronk/thetool!1086
2025-03-07 07:05:16 +00:00
Luca Haid 7e3b1af54a added new warehouseorder features 2025-03-07 08:04:36 +01:00
Luca Haid 8f71b2f43c Merge branch 'order-change-email' into 'master'
changed email from office to einkauf

See merge request fronk/thetool!1085
2025-03-06 14:35:43 +00:00
Luca Haid d24c1cc5dc changed email from office to einkauf 2025-03-06 15:35:21 +01:00
Luca Haid 495dd2c886 Merge branch 'orderrequest-show-id' into 'master'
show id from now on

See merge request fronk/thetool!1084
2025-03-06 14:03:22 +00:00
Luca Haid e510413abc show id from now on 2025-03-06 15:03:07 +01:00
Luca Haid 54dd6257d8 Merge branch 'orderrequest-show-id' into 'master'
show id from now on

See merge request fronk/thetool!1083
2025-03-06 14:02:30 +00:00
Luca Haid b5870a34ab show id from now on 2025-03-06 15:02:14 +01:00
Luca Haid 41c41c7777 Merge branch 'eshop-add-ext-art-nr' into 'master'
added external article number for csv and email

See merge request fronk/thetool!1082
2025-03-06 13:08:32 +00:00
Luca Haid 0613e765fe added external article number for csv and email 2025-03-06 14:07:58 +01:00
Luca Haid 1156cbec83 Merge branch 'preordercampaign-add-caching' into 'master'
fixed issue in preordercampaign that the total unit count * 2

See merge request fronk/thetool!1080
2025-03-06 12:53:29 +00:00