Commit Graph

3762 Commits

Author SHA1 Message Date
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
Frank Schubert
f40d464c3c Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-05-14 12:45:35 +02:00
Frank Schubert
797c8424ae RimoImport: Service Port DN: Treat SpliceBox like Shelf 2025-05-14 12:45:09 +02:00
Luca Haid
1abfb3e0d0 Merge branch 'ADBWohneinheit/add-duplicate-view' into 'master'
added new duplicate homeid view

See merge request fronk/thetool!1332
2025-05-14 07:50:50 +00:00
Luca Haid
5008d54678 added new duplicate homeid view 2025-05-14 09:50:37 +02: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
eed290d016 Merge branch 'DashboardNew/adb-update' into 'master'
updated new dashboard

See merge request fronk/thetool!1328
2025-05-13 16:42:09 +00:00
Luca Haid
f08178ada2 updated new dashboard 2025-05-13 18:41:03 +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
b78425e515 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1326
2025-05-13 15:14:04 +00:00
Daniel Spitzer
d73bec0375 Kalender Update
* Abgesagte Termine können nun ausgeblendet werden.
2025-05-13 17:13:08 +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
a45815ac68 Merge branch 'Pop/add-columns' into 'master'
added new pop columns

See merge request fronk/thetool!1324
2025-05-13 13:42:34 +00: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
Daniel Spitzer
333d358be1 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix Zeiterfassung

See merge request fronk/thetool!1313
2025-05-11 18:50:21 +00: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
4a264946f6 Merge branch 'spidev' into 'master'
Pop Feature Erweiterungen

See merge request fronk/thetool!1312
2025-05-11 17:55:00 +00: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
615b1434a2 added "after" to woker_add_active migration 2025-05-09 13:28:42 +02:00
Frank Schubert
52b8462afc WIP Mass Productchange 2025-05-08 20:08:09 +02:00