Commit Graph

5442 Commits

Author SHA1 Message Date
Luca Haid
259b542ae1 Merge branch 'docker-improvements' into 'master'
chore: update docker environment to debian bookworm and php 8.2

See merge request fronk/thetool!2101
2026-02-27 09:55:43 +00:00
Luca Haid
e844c1537e Merge branch 'fix/workorder-creation-exact-match' into 'master'
fix: ensure exact match for preorderId when creating workorders

See merge request fronk/thetool!2100
2026-02-27 09:55:23 +00:00
8d00464458 fix: ensure exact match for preorderId when creating workorders 2026-02-27 10:49:26 +01:00
5682f5786c chore: update docker environment to debian bookworm and php 8.2 2026-02-27 10:39:43 +01:00
Daniel Spitzer
9dc01d434e Merge branch 'spidev' into 'master'
Pop Erweiterung auf Adressen

See merge request fronk/thetool!2099
2026-02-20 10:37:02 +00:00
Daniel Spitzer
d8046f3b89 Pop Erweiterung auf Adressen 2026-02-20 11:36:25 +01:00
Daniel Spitzer
4d518981fa Pop Erweiterung auf Adressen 2026-02-20 11:22:21 +01:00
Daniel Spitzer
88f6373274 Merge branch 'spidev' into 'master'
Zeiterfassung Feature Updates

See merge request fronk/thetool!2098
2026-02-13 08:39:42 +00:00
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
0d475eae0c Merge branch 'spidev' into 'master'
Zeiterfassung Feature Updates

See merge request fronk/thetool!2097
2026-02-13 08:32:56 +00: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
bc0b53b06a Merge branch 'spidev' into 'master'
Zeiterfassung Feature Updates

See merge request fronk/thetool!2096
2026-02-13 07:40:49 +00: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
Frank Schubert
571438572f Merge branch 'fronkdev' into 'master'
citycom oan: Always trying to update cc service when snopp sends order

See merge request fronk/thetool!2095
2026-02-12 14:04:00 +00:00
Frank Schubert
3fd98e753c citycom oan cleanup 2026-02-12 15:03:37 +01:00
Frank Schubert
d34a1e1b15 citycom oan: Always trying to update cc service when snopp sends order 2026-02-12 14:56:53 +01:00
Frank Schubert
8d0add0f33 Merge branch 'fronkdev' into 'master'
citycom oan: Fixed setting billing_date on CC service create and update

See merge request fronk/thetool!2094
2026-02-12 13:46:08 +00:00
Frank Schubert
ec30f47816 citycom oan: Fixed setting billing_date on CC service create and update 2026-02-12 14:45:27 +01:00
Frank Schubert
7d454ce682 Merge branch 'fronkdev' into 'master'
Citycom: updateing CC service with billing_date when finishing orders

See merge request fronk/thetool!2093
2026-02-11 14:33:46 +00:00
Frank Schubert
3f67d28a53 Citycom: updateing CC service with billing_date when finishing orders 2026-02-11 15:33:15 +01:00
Frank Schubert
0aa6a099d6 Merge branch 'fronkdev' into 'master'
Added Preorderinfrastructre Api (external patchport assignment)

See merge request fronk/thetool!2092
2026-02-11 14:29:35 +00:00
Frank Schubert
e28c104a4e Added Preorderinfrastructre Api (external patchport assignment) 2026-02-11 15:28:57 +01:00
Frank Schubert
3d877145cf Merge branch 'fronkdev' into 'master'
change Citycom OAN Api Helper updateService() to get only single service before update

See merge request fronk/thetool!2091
2026-02-11 13:23:55 +00:00
Frank Schubert
aa03f29d8f change Citycom OAN Api Helper updateService() to get only single service before update 2026-02-11 14:23:01 +01:00
Frank Schubert
96b4b9beb4 Merge branch 'fronkdev' into 'master'
Added contact data to citycom service order

See merge request fronk/thetool!2090
2026-02-11 13:05:53 +00:00
Frank Schubert
4b72e3a678 Added contact data to citycom service order 2026-02-11 14:05:18 +01:00
Frank Schubert
d309b76d49 Merge branch 'fronkdev' into 'master'
Manual Invoice BMD Export: not splitting if only 1 gkonto

See merge request fronk/thetool!2089
2026-02-10 14:28:24 +00:00
Frank Schubert
f791e02ded Manual Invoice BMD Export: not splitting if only 1 gkonto 2026-02-10 15:27:43 +01:00
Frank Schubert
74ea2c9853 Merge branch 'fronkdev' into 'master'
Manual Invoice BMD Export: changed split to gkonto

See merge request fronk/thetool!2088
2026-02-10 13:37:20 +00:00
Frank Schubert
d5bf073c38 Manual Invoice BMD Export: changed split to gkonto 2026-02-10 14:35:06 +01:00
Frank Schubert
22d3bda000 Merge branch 'fronkdev' into 'master'
exempting Test campaign from PreorderBilling

See merge request fronk/thetool!2087
2026-02-05 14:26:36 +00:00
Frank Schubert
b295e22356 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2026-02-05 15:25:46 +01:00
Frank Schubert
c594592a81 exempting Test campaign from PreorderBilling 2026-02-05 15:25:09 +01:00
Frank Schubert
41f37179e9 Merge branch 'fronkdev' into 'master'
Added canPreorder check in PreorderController::init()

See merge request fronk/thetool!2086
2026-02-04 14:37:55 +00:00
Frank Schubert
592d1b83b2 Added canPreorder check in PreorderController::init() 2026-02-04 15:37:09 +01:00
Luca Haid
9bd3184d74 Merge branch 'RaspberryDisplay/v2-init' into 'master'
fixed sending new url

See merge request fronk/thetool!2085
2026-02-03 15:09:56 +00:00
Luca Haid
3aa7008aa4 fixed sending new url 2026-02-03 16:09:44 +01:00
Luca Haid
05aba91c33 Merge branch 'RaspberryDisplay/v2-init' into 'master'
raspberrydisplay v2 init

See merge request fronk/thetool!2084
2026-02-03 14:53:08 +00:00
Luca Haid
68e86f74f8 raspberrydisplay v2 init 2026-02-03 15:52:55 +01:00
Luca Haid
9556c23bed Merge branch 'RaspberryDisplay/v2-init' into 'master'
raspberrydisplay v2 init

See merge request fronk/thetool!2083
2026-02-03 14:39:11 +00:00
Luca Haid
0cdb2140a9 raspberrydisplay v2 init 2026-02-03 15:38:55 +01:00
Frank Schubert
10ecfab41d Merge branch 'fronkdev' into 'master'
VoiceCallHistoryController::addContractIds() storing ignore nums in db

See merge request fronk/thetool!2082
2026-02-03 13:34:10 +00:00
Frank Schubert
cf88bef333 VoiceCallHistoryController::addContractIds() storing ignore nums in db 2026-02-03 14:33:35 +01:00
Luca Haid
5b394f0db3 Merge branch 'WarehouseShippingNote/fix-e-shop-generating-shipping-note-number' into 'master'
WarehouseShippingNote/fix-e-shop-generating-shipping-note-number

See merge request fronk/thetool!2081
2026-02-03 10:37:50 +00:00
Luca Haid
70d88f0f76 WarehouseShippingNote/fix-e-shop-generating-shipping-note-number 2026-02-03 11:37:34 +01:00
Luca Haid
f583aeeed7 Merge branch 'openreplay.xinon.at/fix-vue2-openreplay-missing' into 'master'
fixed missing vue2 openreplay includes

See merge request fronk/thetool!2080
2026-02-02 18:48:21 +00:00
Luca Haid
8e8a4dce18 fixed missing vue2 openreplay includes 2026-02-02 19:48:12 +01:00
Luca Haid
956a3f9ceb Merge branch 'Calendar/fix-javascript-error' into 'master'
fixed javascript typo error

See merge request fronk/thetool!2078
2026-02-02 18:39:12 +00:00
Luca Haid
9b6f73049e fixed javascript typo error 2026-02-02 19:38:49 +01:00
Luca Haid
b705510a3a Merge branch 'Radius/fix-automatically-selecting-estmk' into 'master'
fixed the automatic selection in the autocomplete

See merge request fronk/thetool!2077
2026-02-02 13:11:08 +00:00