Commit Graph

5378 Commits

Author SHA1 Message Date
Daniel Spitzer
86bc518663 Zeiterfassung Feature Updates
* Reports wurde um Soll/Ist Detail Auswertung erweitert Bugfix Arbeitszeitverschiebung
2026-02-13 09:39:18 +01:00
Daniel Spitzer
0241d5842b Zeiterfassung Feature Updates
* Reports wurde um Soll/Ist Detail Auswertung erweitert
* Nachtzulage wird nun auch in der Verrechnungsübersicht angezeigt
* M25,Ü50,Ü100 werden nun in Stichtagsauswertung mit berechnet
* Bei der offenen Arbeitstage Auswertung wird nun die Arbeitszeitverschiebung rausgerechnet
2026-02-13 09:32:28 +01:00
Daniel Spitzer
b81ea45823 Zeiterfassung Feature Updates
* Reports wurde um Soll/Ist Detail Auswertung erweitert
* Nachtzulage wird nun auch in der Verrechnungsübersicht angezeigt
* M25,Ü50,Ü100 werden nun in Stichtagsauswertung mit berechnet
* Bei der offenen Arbeitstage Auswertung wird nun die Arbeitszeitverschiebung rausgerechnet
2026-02-13 08:39:15 +01:00
Daniel Spitzer
ae73d9be4d Merge remote-tracking branch 'origin/spidev' into spidev 2026-01-29 21:20:02 +01:00
Daniel Spitzer
2417280ae6 Bugfix OLT Device SNMP Walk BUG 2026-01-29 21:19:18 +01:00
Daniel Spitzer
b07c623449 Merge branch 'master' into 'spidev'
# Conflicts:
#   Layout/default/Device/Detail.php
2026-01-29 20:17:14 +00:00
Daniel Spitzer
3e67b5b773 Bugfix OLT Device SNMP Walk BUG 2026-01-29 21:15:46 +01:00
Luca Haid
b07535b844 Merge branch 'openreplay.xinon.at/init' into 'master'
addded openreplay to thetool

See merge request fronk/thetool!2067
2026-01-29 13:36:02 +00:00
Luca Haid
9eb7e1c83c addded openreplay to thetool 2026-01-29 14:34:23 +01:00
Luca Haid
8395ba570b Merge branch 'ConstructionConsent/add-wundschuh-import' into 'master'
added new wundschuh import

See merge request fronk/thetool!2066
2026-01-29 09:44:27 +00:00
Luca Haid
47828f51f2 added new wundschuh import 2026-01-29 10:44:03 +01:00
Luca Haid
a013100f82 Merge branch 'Preorder/change-filter-template' into 'master'
added new cancelled status ids

See merge request fronk/thetool!2065
2026-01-29 09:19:22 +00:00
Luca Haid
fb4624b09a added new cancelled status ids 2026-01-29 10:19:07 +01:00
Luca Haid
f955991482 Merge branch 'Radius/avm-scanner-initial' into 'master'
added avm scanner module to radius

See merge request fronk/thetool!2064
2026-01-29 09:09:46 +00:00
Luca Haid
55dc9c1cee added avm scanner module to radius 2026-01-29 10:09:16 +01:00
Luca Haid
0dc2776cfb Merge branch 'Investigator/initial' into 'master'
initial commit api Investigator

See merge request fronk/thetool!2063
2026-01-28 21:50:28 +00:00
Luca Haid
a5c82bbf24 initial commit api Investigator 2026-01-28 22:50:16 +01:00
Luca Haid
5cce3cf8ae Merge branch 'Workorder/improve-and-add-dashboard' into 'master'
changed dashboard

See merge request fronk/thetool!2062
2026-01-28 10:42:08 +00:00
Luca Haid
a3bd470fcc changed dashboard 2026-01-28 11:41:56 +01:00
Luca Haid
fd62342f0f Merge branch 'Workorder/improve-and-add-dashboard' into 'master'
fixed permissions

See merge request fronk/thetool!2061
2026-01-28 09:31:18 +00:00
Luca Haid
5a6bf351b2 fixed permissions 2026-01-28 10:31:07 +01:00
Luca Haid
088d61af72 Merge branch 'Workorder/improve-and-add-dashboard' into 'master'
fixed permissions

See merge request fronk/thetool!2060
2026-01-28 09:24:29 +00:00
Luca Haid
e4561dbd7f fixed permissions 2026-01-28 10:24:14 +01:00
Luca Haid
3f13ee3f21 Merge branch 'Workorder/improve-and-add-dashboard' into 'master'
improve and add dashboard

See merge request fronk/thetool!2059
2026-01-28 09:12:37 +00:00
Luca Haid
6a85d4a980 improve and add dashboard 2026-01-28 10:12:16 +01:00
Luca Haid
0bc042f987 Merge branch 'ManualInvoice/create-test-script' into 'master'
created test creation invoice script for mock data

See merge request fronk/thetool!2058
2026-01-27 15:43:51 +00:00
Luca Haid
7273c83000 created test creation invoice script for mock data 2026-01-27 16:43:38 +01:00
Luca Haid
35bfa445cd Merge branch 'Workorder/fix-civil-engin' into 'master'
fixed workorder civil engineering

See merge request fronk/thetool!2057
2026-01-27 15:09:23 +00:00
Luca Haid
4bfd0eddce fixed workorder civil engineering 2026-01-27 16:09:10 +01:00
Frank Schubert
649443eccb Merge branch 'fronkdev' into 'master'
Added FileType if available in Rimoapi:getWorkorderAhaReport

See merge request fronk/thetool!2056
2026-01-27 15:09:06 +00:00
Frank Schubert
e021a51ef0 Added FileType if available in Rimoapi:getWorkorderAhaReport 2026-01-27 16:08:31 +01:00
Frank Schubert
dc388b07ab Merge branch 'fronkdev' into 'master'
SnoppCitycom API: not checking home status anymore

See merge request fronk/thetool!2055
2026-01-27 12:28:09 +00:00
Frank Schubert
45f8be2f3a SnoppCitycom API: not checking home status anymore 2026-01-27 13:27:35 +01:00
Luca Haid
5e31f468fd Merge branch 'Workorder/fix-aha-parsing' into 'master'
fixed aha parsing

See merge request fronk/thetool!2054
2026-01-27 11:11:34 +00:00
Luca Haid
71c94fd7be fixed aha parsing 2026-01-27 12:11:24 +01:00
Luca Haid
08fdf3f540 Merge branch 'XinonMobile/fix-offline-mode' into 'master'
fixed offline mode

See merge request fronk/thetool!2053
2026-01-27 10:42:11 +00:00
Luca Haid
8bfc639a44 fixed offline mode 2026-01-27 11:40:34 +01:00
Luca Haid
53d3f535f2 Merge branch 'WorkorderMph/fix-xinon-networks' into 'master'
fixed xinon networks

See merge request fronk/thetool!2052
2026-01-27 10:26:35 +00:00
Luca Haid
df79284c35 fixed xinon networks 2026-01-27 11:26:23 +01:00
Luca Haid
500babf1cd Merge branch 'Workorder/add-tiefbau-flag' into 'master'
added tiefbau flag

See merge request fronk/thetool!2051
2026-01-27 10:21:06 +00:00
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