Commit Graph

5338 Commits

Author SHA1 Message Date
Luca Haid
60e3c7b765 added tiefbau flag 2026-01-27 11:20:25 +01:00
Luca Haid
4507b392bc fixed typo 2026-01-27 09:58:19 +00:00
Luca Haid
da101a9196 fixed typo 2026-01-27 09:57:37 +00:00
Luca Haid
52c884a717 Merge branch 'Preorderlogistics/add-date-filter' into 'master'
added date filter

See merge request fronk/thetool!2050
2026-01-27 09:55:54 +00:00
Luca Haid
9b6ed35ddc added date filter 2026-01-27 10:55:10 +01:00
Luca Haid
d883d72b4a Merge branch 'XinonMobile/add-offline-mode' into 'master'
added offline mode for xinon app

See merge request fronk/thetool!2049
2026-01-27 09:36:00 +00:00
Luca Haid
d9386892ab added offline mode for xinon app 2026-01-27 10:35:15 +01:00
Luca Haid
e3b9720425 Merge branch 'ManualInvoice/fix-vat' into 'master'
fxied vat calculation

See merge request fronk/thetool!2048
2026-01-26 14:44:52 +00:00
Luca Haid
e8002d184f fxied vat calculation 2026-01-26 15:44:35 +01:00
Frank Schubert
3e38f18aa7 Merge branch 'fronkdev' into 'master'
creating Snopp Order from Order (OrderProduct with oaid or preroder_id)

See merge request fronk/thetool!2047
2026-01-26 12:58:46 +00:00
Frank Schubert
038e6e1734 creating Snopp Order from Order (OrderProduct with oaid or preroder_id) 2026-01-26 13:57:38 +01:00
Luca Haid
6f01440bc9 Merge branch 'Radius/improve-device-matching' into 'master'
device matching via mac instead of ip address

See merge request fronk/thetool!2046
2026-01-26 11:21:08 +00:00
Luca Haid
5ca7fa29c6 device matching via mac instead of ip address 2026-01-26 12:20:52 +01:00
Frank Schubert
976844d623 WIP Snopp Order 2026-01-22 17:07:51 +01:00
Daniel Spitzer
4b206f0696 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!2045
2026-01-22 12:11:24 +00:00
Daniel Spitzer
47a09c9597 Zeiterfassung Update
* Anzeigezeitraum der Jahre erhöht
2026-01-22 13:11:04 +01:00
Daniel Spitzer
b16f40355a Zeiterfassung Update
* Anzeigezeitraum der Jahre erhöht
2026-01-22 13:10:40 +01:00
Daniel Spitzer
102e271e97 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!2044
2026-01-22 12:04:27 +00:00
Daniel Spitzer
1133171c79 Zeiterfassung Update
* Anzeigezeitraum der Jahre erhöht
2026-01-22 13:03:52 +01:00
Luca Haid
4d77858b43 Merge branch 'Preorder/add-filter-template' into 'master'
added possibility to remove appointment

See merge request fronk/thetool!2043
2026-01-22 06:24:47 +00:00
Luca Haid
b569faf946 added possibility to remove appointment 2026-01-22 07:24:33 +01:00
Luca Haid
e0f122e70b Merge branch 'Preorder/add-filter-template' into 'master'
added new filter template

See merge request fronk/thetool!2042
2026-01-22 06:20:21 +00:00
Luca Haid
91c5019503 added new filter template 2026-01-22 07:20:10 +01:00
Daniel Spitzer
be99627e5f Merge branch 'spidev' into 'master'
Bugfix PHP8 Zeiterfassung

See merge request fronk/thetool!2041
2026-01-21 19:44:00 +00:00
Daniel Spitzer
1add43f24f Bugfix PHP8 Zeiterfassung 2026-01-21 20:43:23 +01:00
Frank Schubert
437fb919ce Merge branch 'fronkdev' into 'master'
added nuance to product search in createOrderFromPreorderAction()

See merge request fronk/thetool!2040
2026-01-21 13:43:44 +00:00
Frank Schubert
225e14c74d added nuance to product search in createOrderFromPreorderAction() 2026-01-21 14:42:54 +01:00
Frank Schubert
27acacf854 Merge branch 'fronkdev' into 'master'
Added manual invoice locking cron script

See merge request fronk/thetool!2039
2026-01-20 20:21:56 +00:00
Frank Schubert
cd158dae5f Added manual invoice locking cron script 2026-01-20 21:20:36 +01:00
Frank Schubert
31e218d0ca Merge branch 'fronkdev' into 'master'
WIP ManualInvoice BMD Export

See merge request fronk/thetool!2038
2026-01-20 20:19:42 +00:00
Frank Schubert
7997d19fc1 WIP ManualInvoice BMD Export 2026-01-20 21:18:23 +01:00
Luca Haid
e3f209c04b Merge branch 'ManualInvoice/improvements' into 'master'
Rechnungen

See merge request fronk/thetool!2037
2026-01-20 15:03:31 +00:00
Luca Haid
7974371d3f Rechnungen
- Artikelsuche
- optional weg
- Einheit weg
- Einzelpreis wird nicht geholt
- einzelpreis andere preistypen irgendwie anzeigen
- ust weg
- -1 menge erlauben
- kleiner Speicher bug
- mit Rechnungsadresse LS geht nicht übernehmen
- pdf herunterladen Status ändern
- per Mail verschicken ohne eingetragene Mail geht ned
2026-01-20 15:57:50 +01:00
Luca Haid
7059de3202 Merge branch 'Workorder/add-aha-blatt-parsing' into 'master'
add aha blatt parsing

See merge request fronk/thetool!2036
2026-01-20 12:28:12 +00:00
Luca Haid
d6d213a8d3 add aha blatt parsing 2026-01-20 13:27:35 +01:00
Daniel Spitzer
b79be61ca9 Merge branch 'spidev' into 'master'
Qgis Preorder sync um Felder erweitert und in ADB verlinkt

See merge request fronk/thetool!2035
2026-01-20 12:17:22 +00:00
Daniel Spitzer
6584985e03 Qgis Preorder sync um Felder erweitert und in ADB verlinkt 2026-01-20 13:16:51 +01:00
Daniel Spitzer
cf010eaad5 Merge branch 'spidev' into 'master'
Qgis Preorder sync um Felder erweitert

See merge request fronk/thetool!2034
2026-01-20 10:27:28 +00:00
Daniel Spitzer
4aae3cb3e9 Qgis Preorder sync um Felder erweitert 2026-01-20 11:26:53 +01:00
Frank Schubert
178607c69a Merge branch 'fronkdev' into 'master'
Fixed OrderProduct migration

See merge request fronk/thetool!2033
2026-01-19 15:31:36 +00:00
Frank Schubert
6817563c59 Fixed OrderProduct migration 2026-01-19 16:31:17 +01:00
Frank Schubert
1bf09326db Merge branch 'fronkdev' into 'master'
Button to create Order from Preorder

See merge request fronk/thetool!2032
2026-01-19 15:30:10 +00:00
Frank Schubert
4e4c5a9c18 Button to create Order from Preorder 2026-01-19 16:29:22 +01:00
Luca Haid
8252f81281 Update WarehouseCategory.php 2026-01-19 14:16:57 +00:00
Luca Haid
d8bc85a3a4 Merge branch 'AssetManagement/add-categories' into 'master'
added categories to assetmanagement

See merge request fronk/thetool!2031
2026-01-19 05:52:17 +00:00
Luca Haid
bd0a332aa1 added categories to assetmanagement 2026-01-19 06:51:56 +01:00
Luca Haid
15afb237e1 fixed submodule routing 2026-01-18 20:02:40 +00:00
Luca Haid
dc779cd270 fixed submodule routing 2026-01-18 21:02:01 +01:00
Luca Haid
38248c2eb4 fixed pwa installing issue 2026-01-18 19:36:36 +00:00
Luca Haid
6c63ffbea0 fixed pwa installing issue 2026-01-18 20:36:16 +01:00