Commit Graph
2238 Commits
Author SHA1 Message Date
Luca Haid 9ced3228bf added new debugging 2025-05-15 15:12:46 +02:00
Luca Haid 5d6c4de795 Merge branch 'ConstructionConsent/add-signature' into 'master'
added new signature action

See merge request fronk/thetool!1340
2025-05-15 12:02:48 +00:00
Luca Haid 1b485aca83 added new signature action 2025-05-15 14:02:29 +02:00
Luca Haid 174a9bf02d Merge branch 'ADBWohneinheit/extend-duplicate-finder' into 'master'
enhanced duplicate finder

See merge request fronk/thetool!1339
2025-05-15 08:48:41 +00:00
Luca Haid 4716c3156a enhanced duplicate finder 2025-05-15 10:47:34 +02:00
Luca Haid 88f1e38a6f Merge branch 'Preorder/fix-date-filter' into 'master'
Fixed Date filter

See merge request fronk/thetool!1338
2025-05-14 14:06:31 +00:00
Luca Haid 8399238c57 Fixed Date filter 2025-05-14 16:05:48 +02:00
Luca Haid eb2029f53f Merge branch 'Preorder/fix-date-filter' into 'master'
Fixed Date filter

See merge request fronk/thetool!1337
2025-05-14 14:03:37 +00:00
Luca Haid f03e147287 Fixed Date filter 2025-05-14 16:02:50 +02:00
Luca Haid f80cd6d81b Merge branch 'Preorder/add-date-filter' into 'master'
Added new Date Filter

See merge request fronk/thetool!1334
2025-05-14 11:22:24 +00:00
Luca Haid ad670d4697 Added new Date Filter 2025-05-14 13:22:04 +02:00
Frank Schubert 341bf9de49 Merge branch 'fronkdev' into 'master'
RimoImport: Service Port DN: Treat SpliceBox like Shelf

See merge request fronk/thetool!1333
2025-05-14 10:47:26 +00:00
Luca Haid c61c41758a Merge branch 'ADBWohneinheit/add-duplicate-view' into 'master'
added new duplicate homeid view

See merge request fronk/thetool!1331
2025-05-14 07:47:43 +00:00
Luca Haid 287f4dea9a added new duplicate homeid view 2025-05-14 09:47:14 +02:00
Daniel Spitzer 5c41d82030 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1330
2025-05-13 18:37:17 +00:00
Daniel Spitzer 4a14cf77ad Kalender Update
* Richtigstellung Calender Filter Events
2025-05-13 20:36:22 +02:00
Daniel Spitzer 14e3ddc464 Kalender Update
* Richtigstellung Calender Filter Events
2025-05-13 20:19:06 +02:00
Daniel Spitzer bceca357aa Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1329
2025-05-13 18:01:11 +00:00
Daniel Spitzer 53c188955e Kalender Update
* Richtigstellung Calender Filter Events
2025-05-13 20:00:11 +02:00
Luca Haid 3e34eb5baf Merge branch 'DashboardNew/adb-update' into 'master'
added new pop columns

See merge request fronk/thetool!1327
2025-05-13 16:28:50 +00:00
Luca Haid 15a2d11f2d added new pop columns 2025-05-13 18:27:38 +02:00
Daniel Spitzer cb5ea23858 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1325
2025-05-13 14:26:36 +00:00
Daniel Spitzer d5c5d4306a Kalender Update
* Abgesagte Termine können nun ausgeblendet werden.
2025-05-13 16:25:08 +02:00
Luca Haid e976246ed7 added new pop columns 2025-05-13 15:42:24 +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
Daniel Spitzer 7739d90e77 Zeiterfassung Bugfix Zeiterfassung
* bei der Zeiterfassung wenn man Fibu Rechte hat, darf man mit ZA ins Minus gehen das hat aber den Bug gehabt, dass wenn man überstunden hat die Überstunden ins Minus geht das Verrechnunstechnisch nicht möglich ist. Alles was über das gesamtzeitguthaben drüber schießt wird nun negativ in die Mehrstunden verbucht.
2025-05-11 20:49:11 +02:00
Daniel Spitzer 09aaede76b Pop Feature Erweiterungen
* Project 8454 (Erweiterung Felder Status, Speicherort, Dokustand Datum)
* Schrank breite um 1ne Col verbreitert
* neue Migration
2025-05-11 19:53:31 +02:00
Frank Schubert 52b8462afc WIP Mass Productchange 2025-05-08 20:08:09 +02:00
Frank Schubert 14bcb7b3c2 Merge branch 'fronkdev' into 'master'
Added Borderpoint status to Preorder

See merge request fronk/thetool!1311
2025-05-07 16:33:42 +00:00
Frank Schubert 678544ced7 Added Borderpoint status to Preorder 2025-05-07 18:33:20 +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