Commit Graph

3740 Commits

Author SHA1 Message Date
Luca Haid
287f4dea9a added new duplicate homeid view 2025-05-14 09:47:14 +02:00
Luca Haid
f08178ada2 updated new dashboard 2025-05-13 18:41:03 +02:00
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
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
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
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
Frank Schubert
52c3d00b93 Merge branch 'fronkdev' into 'master'
Rounding prices in AddressdbAPI getAddressPricing

See merge request fronk/thetool!1304
2025-05-07 12:13:09 +00:00
Frank Schubert
c7ce28acf8 Rounding prices in AddressdbAPI getAddressPricing 2025-05-07 14:11:45 +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
Frank Schubert
4db4577c28 Merge branch 'fronkdev' into 'master'
saving editor in afterUpdate in Building

See merge request fronk/thetool!1302
2025-05-07 11:35:35 +00:00
Frank Schubert
a796e5d58b saving editor in afterUpdate in Building 2025-05-07 13:17:41 +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