Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid 15a2d11f2d added new pop columns 2025-05-13 18:27:38 +02:00
Luca Haid e976246ed7 added new pop columns 2025-05-13 15:42:24 +02:00
Luca Haid 6d4d4ea386 Merge branch 'WarehouseArticle/remove-testing-misc' into 'master'
fixed testing misc

See merge request fronk/thetool!1323
2025-05-13 09:59:15 +00:00
Luca Haid c85682eaa9 fixed testing misc 2025-05-13 11:58:27 +02:00
Luca Haid 575dce2264 Merge branch 'tt-table/fix-multiple' into 'master'
added new adb dashboard

See merge request fronk/thetool!1322
2025-05-13 09:57:19 +00:00
Luca Haid 5b675393b6 added new adb dashboard 2025-05-13 11:56:48 +02:00
Luca Haid ec5b03243f Merge branch 'DashboardNew/add-adb-dashboard' into 'master'
added new adb dashboard

See merge request fronk/thetool!1321
2025-05-13 09:42:04 +00:00
Luca Haid 11ebed70a7 added new adb dashboard 2025-05-13 11:41:39 +02:00
Luca Haid 52227c0682 Merge branch 'Warehouse/improve' into 'master'
fixed getting wrong order results

See merge request fronk/thetool!1320
2025-05-13 07:19:08 +00:00
Luca Haid a6d577023f fixed getting wrong order results 2025-05-13 09:18:34 +02:00
Luca Haid 128ce79e1d Merge branch 'ConstructionConsent/skip-existing' into 'master'
skip existing

See merge request fronk/thetool!1319
2025-05-12 16:01:39 +00:00
Luca Haid d65e67571d skip existing 2025-05-12 18:01:06 +02:00
Luca Haid 6ed22c61cd Merge branch 'WarehouseEShop/add-new-fields' into 'master'
fixed getting wrong order results

See merge request fronk/thetool!1318
2025-05-12 11:09:22 +00:00
Luca Haid b6c4149e4e fixed getting wrong order results 2025-05-12 13:08:51 +02:00
Luca Haid eda67f696d Merge branch 'WarehouseEShop/add-new-fields' into 'master'
added new neccesary fields

See merge request fronk/thetool!1317
2025-05-12 10:54:30 +00:00
Luca Haid 5c0acfe43b added new neccesary fields 2025-05-12 12:53:03 +02:00
Luca Haid cd13e93a25 Merge branch 'WarehouseShippingNote/edit-label' into 'master'
changed label from E-STMK to "beigestelltes Material"

See merge request fronk/thetool!1316
2025-05-12 10:51:04 +00:00
Luca Haid b89ce85dff changed label from E-STMK to "beigestelltes Material" 2025-05-12 12:47:31 +02:00
Luca Haid 7de6b08b80 Merge branch 'ConstructionConsent/add-new-import-cols' into 'master'
add new import columns

See merge request fronk/thetool!1315
2025-05-12 10:43:46 +00:00
Luca Haid a4a493ed92 add new import columns 2025-05-12 12:42:53 +02:00
Luca Haid 07db6d3a79 Merge branch 'ConstructionConsent/add-new-import-cols' into 'master'
add new import columns

See merge request fronk/thetool!1314
2025-05-12 07:42:40 +00:00
Luca Haid 003ed5d66a add new import columns 2025-05-12 09:41:45 +02:00
Luca Haid 53fae3ef16 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master'
added new field trio article number

See merge request fronk/thetool!1310
2025-05-07 15:44:34 +00:00
Luca Haid fe86d140ac added new field trio article number 2025-05-07 17:44:25 +02:00
Luca Haid c873bb4c2e Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master'
added new field trio article number

See merge request fronk/thetool!1309
2025-05-07 14:50:36 +00:00
Luca Haid 89a02a38c7 added new field trio article number 2025-05-07 16:50:24 +02:00
Luca Haid becf39cc24 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master'
added new field trio article number

See merge request fronk/thetool!1308
2025-05-07 14:46:59 +00:00
Luca Haid 5a0a6ced95 added new field trio article number 2025-05-07 16:46:49 +02:00
Luca Haid c363cb4c52 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master'
added new field trio article number

See merge request fronk/thetool!1307
2025-05-07 14:39:26 +00:00
Luca Haid 86e1983dc2 added new field trio article number 2025-05-07 16:39:15 +02:00
Luca Haid faf7a5da79 Merge branch 'WarehouseEShop/fix-article-packet-matching' into 'master'
-

See merge request fronk/thetool!1306
2025-05-07 14:32:12 +00:00
Luca Haid b67cc642a3 - 2025-05-07 16:31:30 +02:00
Luca Haid 274b892c2f Merge branch 'ConstructionConsent/add-export' into 'master'
added export feature constr consent

See merge request fronk/thetool!1305
2025-05-07 12:16:26 +00:00
Luca Haid 27727c0c92 added export feature constr consent 2025-05-07 14:16:16 +02:00
Luca Haid a9a45afa64 Merge branch 'ConstructionConsent/add-export' into 'master'
added export feature constr consent

See merge request fronk/thetool!1303
2025-05-07 12:07:22 +00:00
Luca Haid 5061255a01 added export feature constr consent 2025-05-07 14:07:08 +02:00
Luca Haid 072d0c82c1 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master'
fixed saveaction

See merge request fronk/thetool!1301
2025-05-07 08:02:52 +00:00
Luca Haid 22ec1e3434 fixed saveaction 2025-05-07 10:02:36 +02:00
Luca Haid 04984f6e87 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master'
fixed saveaction

See merge request fronk/thetool!1300
2025-05-07 07:59:33 +00:00
Luca Haid 0156d25a6c fixed saveaction 2025-05-07 09:59:15 +02:00
Luca Haid d1b0ae426b Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master'
-

See merge request fronk/thetool!1299
2025-05-06 14:04:09 +00:00
Luca Haid a835cc75b4 - 2025-05-06 16:03:50 +02:00
Luca Haid ee29285a25 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master'
-

See merge request fronk/thetool!1298
2025-05-06 13:58:47 +00:00
Luca Haid 6993c530dc - 2025-05-06 15:58:38 +02:00
Luca Haid b368c4e328 Merge branch 'ConstructionConsent/add-netzgebiet-id' into 'master'
-

See merge request fronk/thetool!1297
2025-05-06 13:57:52 +00:00
Luca Haid dd5feecde1 - 2025-05-06 15:57:33 +02:00
Luca Haid daddee1b8f Merge branch 'add-bookstack-integration' into 'master'
Add bookstack integration

See merge request fronk/thetool!1294
2025-05-06 11:27:44 +00:00
Luca Haid d001c81736 Add bookstack integration 2025-05-06 11:27:44 +00:00
Luca Haid 230f324ebf Merge branch 'ConstructionConsent/fix-back-button' into 'master'
-

See merge request fronk/thetool!1292
2025-05-06 10:30:10 +00:00
Luca Haid 84553ad413 - 2025-05-06 12:29:51 +02:00
Luca Haid 08a53ea5b1 Merge branch 'ConstructionConsent/add-new' into 'master'
-

See merge request fronk/thetool!1291
2025-05-06 09:29:15 +00:00
Luca Haid 265f07ed53 - 2025-05-06 11:28:55 +02:00
Luca Haid 8a8e4ad064 Merge branch 'WarehouseShippingNote/fix-km-count' into 'master'
-

See merge request fronk/thetool!1289
2025-05-05 10:20:56 +00:00
Luca Haid 4c4dc1b00c - 2025-05-05 12:16:24 +02:00
Luca Haid 45d0279490 Merge branch 'WarehouseShippingNote/fix-km-count' into 'master'
-

See merge request fronk/thetool!1288
2025-05-05 10:09:12 +00:00
Luca Haid a33a4e861b - 2025-05-05 12:08:57 +02:00
Luca Haid b2d0407298 Merge branch 'ConstructionConsent/ordering' into 'master'
fixed ordering

See merge request fronk/thetool!1287
2025-04-30 14:01:39 +00:00
Luca Haid 1221c35650 fixed ordering 2025-04-30 16:01:19 +02:00
Luca Haid b49fcc14ce Merge branch 'ConstructionConsent/ordering' into 'master'
fixed ordering

See merge request fronk/thetool!1285
2025-04-30 10:45:34 +00:00
Luca Haid f17cf770db fixed ordering 2025-04-30 12:45:22 +02:00
Luca Haid 185509fe81 Merge branch 'select2/add' into 'master'
fixed device

See merge request fronk/thetool!1284
2025-04-30 10:30:51 +00:00
Luca Haid 0c6380fe5d fixed device 2025-04-30 12:30:35 +02:00
Luca Haid 1e87b2d66d Merge branch 'Warehouse/improve3' into 'master'
fixed device

See merge request fronk/thetool!1283
2025-04-29 13:22:17 +00:00
Luca Haid 8ef3c6ec65 fixed device 2025-04-29 15:22:07 +02:00
Luca Haid 182beb2967 Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1282
2025-04-29 12:17:00 +00:00
Luca Haid 7343571af7 improved new features 2025-04-29 14:16:51 +02:00
Luca Haid fc230fdb35 Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1281
2025-04-29 12:14:45 +00:00
Luca Haid f2dc7eae53 improved new features 2025-04-29 14:14:30 +02:00
Luca Haid 10169bd45b Merge branch 'Warehouse/improve3' into 'master'
improved new features

See merge request fronk/thetool!1280
2025-04-29 12:11:33 +00:00
Luca Haid a859bef97e improved new features 2025-04-29 14:09:36 +02:00
Luca Haid 5163fa6142 Merge branch 'tt-table/fix-multi-icon-select' into 'master'
fixed multi icon select

See merge request fronk/thetool!1279
2025-04-29 11:12:14 +00:00
Luca Haid 21f65aa905 fixed multi icon select 2025-04-29 13:12:04 +02:00
Luca Haid 86f0655235 Merge branch 'tt-table/fix-multi-icon-select' into 'master'
fixed multi icon select

See merge request fronk/thetool!1278
2025-04-29 11:10:36 +00:00
Luca Haid a212ec1a3f fixed multi icon select 2025-04-29 13:10:26 +02:00
Luca Haid e99cdcf3b6 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1277
2025-04-29 11:03:03 +00:00
Luca Haid a115910032 fixed new model classes without model 2025-04-29 13:02:51 +02:00
Luca Haid 1288155a87 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1276
2025-04-29 10:55:09 +00:00
Luca Haid fc9d52ba18 fixed new model classes without model 2025-04-29 12:54:52 +02:00
Luca Haid a12c05dae4 Merge branch 'WarehouseHistory/fix-history-controller' into 'master'
fixed new model classes without model

See merge request fronk/thetool!1275
2025-04-29 10:53:36 +00:00
Luca Haid db50fd8a72 fixed new model classes without model 2025-04-29 12:53:21 +02:00
Luca Haid 8ecb6edbaf Merge branch 'WarehouseOffer/new-features' into 'master'
added pdf creation

See merge request fronk/thetool!1272
2025-04-28 12:42:10 +00:00
Luca Haid 948fe74254 added pdf creation 2025-04-28 14:41:55 +02:00
Luca Haid c0c236b7a9 Merge branch 'Address/add-shipping-note-view' into 'master'
added new way to select areas for shipping note

See merge request fronk/thetool!1271
2025-04-28 11:42:20 +00:00
Luca Haid 3390deb336 added new way to select areas for shipping note 2025-04-28 13:42:10 +02:00
Luca Haid 16f7ba232b Merge branch 'Address/add-shipping-note-view' into 'master'
added new way to select areas for shipping note

See merge request fronk/thetool!1270
2025-04-28 11:39:23 +00:00
Luca Haid fee73ab5f2 added new way to select areas for shipping note 2025-04-28 13:37:58 +02:00
Luca Haid f67fa96257 Merge branch 'Address/add-shipping-note-view' into 'master'
added lieferscheine to ticket view in thetool

See merge request fronk/thetool!1269
2025-04-25 11:16:39 +00:00
Luca Haid a076cf6b9c added lieferscheine to ticket view in thetool 2025-04-25 13:16:24 +02:00
Luca Haid 98e5ee479b Merge branch 'WarehouseCategory/implement-delete-safe-check' into 'master'
implement delete safe check

See merge request fronk/thetool!1268
2025-04-25 11:11:54 +00:00
Luca Haid b45ffdc8cd implement delete safe check 2025-04-25 13:11:44 +02:00
Luca Haid a0457d9af2 Merge branch 'Vue/tt-icon-select-add-multiple2' into 'master'
added tt-icon select multiple

See merge request fronk/thetool!1263
2025-04-25 08:01:14 +00:00
Luca Haid 5ed64db702 added tt-icon select multiple 2025-04-25 10:01:03 +02:00
Luca Haid c5c4c2df7e Merge branch 'Vue/tt-icon-select-add-multiple2' into 'master'
added tt-icon select multiple

See merge request fronk/thetool!1262
2025-04-25 07:59:55 +00:00
Luca Haid a45a99bcc2 added tt-icon select multiple 2025-04-25 09:59:39 +02:00
Luca Haid e18513ffce Merge branch 'Vue/tt-icon-select-add-multiple' into 'master'
Vue/tt icon select add multiple

See merge request fronk/thetool!1260
2025-04-25 07:57:34 +00:00
Luca Haid 3e728f1806 Vue/tt icon select add multiple 2025-04-25 07:57:33 +00:00
Luca Haid b92f423761 Merge branch 'Warehouse/improve2' into 'master'
Warehouse/improve2

See merge request fronk/thetool!1259
2025-04-24 15:16:47 +00:00
Luca Haid c24651fabd Warehouse/improve2 2025-04-24 15:16:46 +00:00
Luca Haid 24acc66738 Merge branch 'Warehouse/improve2' into 'master'
Warehouse/improve2

See merge request fronk/thetool!1258
2025-04-24 15:11:57 +00:00
Luca Haid 29a1520387 Warehouse/improve2 2025-04-24 15:11:57 +00:00