Commit Graph

2738 Commits

Author SHA1 Message Date
Frank Schubert
e729d2c28c Merge branch 'fronkdev' into 'master'
Restored old Contract View

See merge request fronk/thetool!859
2025-01-07 18:57:55 +00:00
Frank Schubert
0e0a321ca7 Restored old Contract View 2025-01-07 19:57:31 +01:00
Frank Schubert
cce7e129d6 Merge branch 'fronkdev' into 'master'
Added more debugging to SQL errors/warnings

See merge request fronk/thetool!858
2025-01-07 18:55:33 +00:00
Frank Schubert
9368397785 Added more debugging to SQL errors/warnings 2025-01-07 19:55:03 +01:00
Luca Haid
88267b72bd Merge branch 'improve-order-request' into 'master'
implemented new features for warehouseorderrequest

See merge request fronk/thetool!857
2025-01-07 15:49:50 +00:00
Luca Haid
f622204aa0 implemented new features for warehouseorderrequest 2025-01-07 16:49:20 +01:00
Frank Schubert
1ae6bde857 Merge branch 'fronkdev' into 'master'
Added number to voicecallhistory ignore list

See merge request fronk/thetool!856
2025-01-07 15:08:38 +00:00
Frank Schubert
26127238c1 Added number to voicecallhistory ignore list 2025-01-07 16:07:57 +01:00
Frank Schubert
212a6f6753 Merge branch 'fronkdev' into 'master'
Fixed Address::afterSave() setting custnum & fibu account num

See merge request fronk/thetool!855
2025-01-07 14:30:19 +00:00
Frank Schubert
12eb232213 Fixed Address::afterSave() setting custnum & fibu account num 2025-01-07 15:29:30 +01:00
Frank Schubert
172bb9a13d Merge branch 'fronkdev' into 'master'
Added fullcustomer (Xinonkunde) as addresstype, will create fibu account

See merge request fronk/thetool!854
2025-01-07 14:14:07 +00:00
Frank Schubert
0a48808cfe Added fullcustomer (Xinonkunde) as addresstype, will create fibu account 2025-01-07 15:07:43 +01:00
Daniel Spitzer
e20af3eca5 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!853
2025-01-02 22:20:59 +00:00
Daniel Spitzer
4eaed59707 Zeiterfassung
Bugfix:
* Abschluss Abbrechen Button hat nicht immer geladen -> fix
2025-01-02 23:20:07 +01:00
Luca Haid
dcc18a5446 Update HistoricBillModel.php 2025-01-02 10:02:17 +00:00
Luca Haid
c01308d633 Update HistoricBillModel.php 2025-01-02 09:55:48 +00:00
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