Commit Graph

4272 Commits

Author SHA1 Message Date
Luca Haid
47b8c8c62d Merge branch 'historic-bill-update' into 'master'
added 2 new columns to historicbill

See merge request fronk/thetool!852
2025-01-02 09:49:04 +00:00
Luca Haid
04bc973160 added 2 new columns to historicbill 2025-01-02 10:48:24 +01:00
Daniel Spitzer
931548ecd2 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!851
2024-12-30 07:49:24 +00:00
Daniel Spitzer
8100e9c8d3 Zeiterfassung
Bugfix:
* PHP Date statt Y o genommen damit die Kalenderwoche sich auf das richtige Jahr bezieht (nun auch für Reports)
2024-12-30 08:47:48 +01:00
Daniel Spitzer
a91ab917cb Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!850
2024-12-30 07:44:31 +00:00
Daniel Spitzer
7e17983c9e Zeiterfassung
Bugfix:
* PHP Date statt Y o genommen damit die Kalenderwoche sich auf das richtige Jahr bezieht
2024-12-30 08:43:54 +01:00
Daniel Spitzer
f0092630bb Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!849
2024-12-29 19:33:53 +00:00
Daniel Spitzer
085d8facdc Zeiterfassung
Neue Features:
* BP Stunden Aufbuchen/Mindern
* Spezialbuchungen ohne Verechnungstechnische relevanz
2024-12-29 20:24:36 +01:00
Daniel Spitzer
5e471693a6 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!848
2024-12-29 18:53:40 +00:00
Daniel Spitzer
42703dd303 Zeiterfassung
Neue Migration für
* BP Stunden Aufbuchen/Mindern
* Spezialbuchungen ohne Verechnungstechnische relevanz
2024-12-29 19:52:47 +01:00
Frank Schubert
bbca013064 Merge branch 'fronkdev' into 'master'
Removed fields from andom User/Form

See merge request fronk/thetool!847
2024-12-29 14:13:48 +00:00
Frank Schubert
1d62469964 Removed fields from andom User/Form 2024-12-29 15:13:11 +01:00
Frank Schubert
d9277ec8f1 Merge branch 'fronkdev' into 'master'
Topbar change for andom-tec

See merge request fronk/thetool!846
2024-12-29 11:49:47 +00:00
Frank Schubert
305116a679 Topbar change for andom-tec 2024-12-29 12:49:12 +01:00
Frank Schubert
4ab8ac1d76 Merge branch 'fronkdev' into 'master'
Fixed pop network migration

See merge request fronk/thetool!845
2024-12-29 11:45:51 +00:00
Frank Schubert
12f0d8c036 Fixed pop network migration 2024-12-29 12:42:33 +01:00
Frank Schubert
7257f0f611 Merge branch 'fronkdev' into 'master'
andom changes

See merge request fronk/thetool!844
2024-12-29 11:21:40 +00:00
Frank Schubert
65c5c9f94a andom changes 2024-12-29 12:20:50 +01:00
Frank Schubert
99e721eb5c Merge branch 'fronkdev' into 'master'
andom-tec changes

See merge request fronk/thetool!843
2024-12-24 11:39:50 +00:00
Frank Schubert
ee0037835c andom-tec changes 2024-12-24 12:38:29 +01:00
Luca Haid
e6e6b8b3c6 Merge branch 'reorder-preorder-filter' into 'master'
added new orderrequest module

See merge request fronk/thetool!842
2024-12-23 08:34:23 +00:00
Luca Haid
2a3ddf9a92 added new orderrequest module 2024-12-23 09:33:42 +01:00
Frank Schubert
a6fe9c983b Merge branch 'fronkdev' into 'master'
Fixed db migrations

See merge request fronk/thetool!841
2024-12-22 15:01:25 +00:00
Frank Schubert
aff469924e Fixed db migrations 2024-12-22 15:58:19 +01:00
Frank Schubert
a90cfde6c4 Merge branch 'fronkdev' into 'master'
Added missing logging instance in mfUpload_TmpFile.php

See merge request fronk/thetool!840
2024-12-22 13:33:16 +00:00
Frank Schubert
4ea99c3690 Merge branch 'master' into fronkdev 2024-12-22 14:31:17 +01:00
Frank Schubert
4abc2ed783 Added missing logging instance in mfUpload_TmpFile.php 2024-12-22 14:27:25 +01:00
Luca Haid
0086a705f8 Merge branch 'reorder-preorder-filter' into 'master'
reordered preorder filters

See merge request fronk/thetool!839
2024-12-20 07:38:44 +00:00
Luca Haid
203a9a7bf6 reordered preorder filters 2024-12-20 08:37:21 +01:00
Luca Haid
f9ee2ba39f Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed new borderpoint filter

See merge request fronk/thetool!838
2024-12-19 13:23:19 +00:00
Luca Haid
b14a34c82b fixed new borderpoint filter 2024-12-19 14:22:50 +01:00
Luca Haid
cd40975e9c Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed new borderpoint filter

See merge request fronk/thetool!837
2024-12-19 13:20:53 +00:00
Luca Haid
5bda708fd3 fixed new borderpoint filter 2024-12-19 14:20:32 +01:00
Frank Schubert
42a102f8c4 Merge branch 'fronkdev' into 'master'
Fixed wohneinheit query in AddressDB

See merge request fronk/thetool!836
2024-12-19 13:15:27 +00:00
Luca Haid
2496758111 Merge branch 'shipping-note-fix-float-hours' into 'master'
added new borderpoint filter for preorder

See merge request fronk/thetool!835
2024-12-19 13:14:46 +00:00
Frank Schubert
ee50aae1d8 Fixed wohneinheit query in AddressDB 2024-12-19 14:14:28 +01:00
Luca Haid
616f76c37e added new borderpoint filter for preorder 2024-12-19 14:14:00 +01:00
Luca Haid
f3947aa812 Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed shipping note

See merge request fronk/thetool!834
2024-12-19 13:05:09 +00:00
Luca Haid
93ce386615 fixed shipping note 2024-12-19 14:04:29 +01:00
Frank Schubert
0e577e1520 Merge branch 'fronkdev' into 'master'
Added rows to addressdb Views

See merge request fronk/thetool!833
2024-12-19 12:59:55 +00:00
Frank Schubert
03cc826baa Added rows to addressdb Views 2024-12-19 13:59:22 +01:00
Frank Schubert
e1e3b52131 Merge branch 'fronkdev' into 'master'
Fixed csv export in Preorder/Index

See merge request fronk/thetool!832
2024-12-19 11:57:09 +00:00
Frank Schubert
09950f9839 Fixed csv export in Preorder/Index 2024-12-19 12:56:19 +01:00
Luca Haid
dfa64578ea Merge branch 'update-preorder-filter' into 'master'
Added new filters // borderpoint is still missing

See merge request fronk/thetool!831
2024-12-19 09:44:56 +00:00
Luca Haid
991568cc87 Added new filters // borderpoint is still missing 2024-12-19 10:44:28 +01:00
Frank Schubert
12375017c1 Merge branch 'fronkdev' into 'master'
RTR Report tweaks

See merge request fronk/thetool!830
2024-12-18 21:38:36 +00:00
Frank Schubert
f9ce14ffea RTR C10 Report tweaks 2024-12-18 22:38:02 +01:00
Frank Schubert
8786e034ee A10 RTR Report tweak 2024-12-18 22:21:35 +01:00
Frank Schubert
ace57fa1d2 Merge branch 'fronkdev' into 'master'
fixed B10 rtr report

See merge request fronk/thetool!829
2024-12-18 21:08:06 +00:00
Frank Schubert
d465ea6115 fixed B10 rtr report 2024-12-18 22:07:23 +01:00