Commit Graph

711 Commits

Author SHA1 Message Date
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
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
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
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
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
Luca Haid
d001c81736 Add bookstack integration 2025-05-06 11:27:44 +00: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
Daniel Spitzer
3c09b66605 Merge branch 'spidev' into 'master'
Kalender Update Feature Erweiterung

See merge request fronk/thetool!1286
2025-04-30 11:01:30 +00:00
Daniel Spitzer
4ec4e15e05 Kalender Update Feature Erweiterung
* Absage von Kundenterminen

Behobene Bugfixes:
* Beschreibungsfeld kann nun immer Leer gesetzt werden.
* SPIN wird nun nur 1mal ins Beschreibungsfeld eingesetzt.
2025-04-30 12:58:36 +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
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
Frank Schubert
c8e4155ad2 Merge branch 'fronkdev' into 'master'
Added is_discount property to api docs

See merge request fronk/thetool!1274
2025-04-28 14:00:05 +00:00
Frank Schubert
2fb60aab2d Added is_discount property to api docs 2025-04-28 15:59:20 +02:00
Luca Haid
948fe74254 added pdf creation 2025-04-28 14:41:55 +02:00
Luca Haid
fee73ab5f2 added new way to select areas for shipping note 2025-04-28 13:37:58 +02:00