Commit Graph

4364 Commits

Author SHA1 Message Date
Frank Schubert
87dcd35502 Merge branch 'fronkdev' into 'master'
Fixed Vodia Identity switching when impersonated

See merge request fronk/thetool!1621
2025-08-07 11:31:28 +00:00
Frank Schubert
2402fd983a Fixed Vodia Identity switching when impersonated 2025-08-07 13:30:53 +02:00
Frank Schubert
7066127713 Merge branch 'master' into fronkdev 2025-08-07 13:30:09 +02:00
Frank Schubert
4a64ebbf12 Citycom API WIP 2025-08-07 13:29:40 +02:00
Luca Haid
13d1ce4b85 updated vodia identity 2025-08-07 11:29:13 +00:00
448ed9cf15 updated vodia identity 2025-08-07 13:28:29 +02:00
Daniel Spitzer
bdf68cdae0 Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1619
2025-08-06 19:35:15 +00:00
Daniel Spitzer
edf1d879d3 Kalender Update
* Script für automatische Gruppenzuweisung
2025-08-06 21:34:05 +02:00
Frank Schubert
2182ae7172 Merge branch 'fronkdev' into 'master'
Fixed Preorder order_date saving and getting setup price

See merge request fronk/thetool!1618
2025-08-06 12:40:38 +00:00
Frank Schubert
25fe5c2ffe Fixed Preorder order_date saving and getting setup price 2025-08-06 14:40:13 +02:00
Daniel Spitzer
b9bdc95d43 Merge branch 'spidev' into 'master'
Device Detail OLT Anpassungen

See merge request fronk/thetool!1617
2025-08-06 12:24:56 +00:00
Daniel Spitzer
46f7195a37 Login Passwort reset
* Passwort Reset Funktion implementiert
2025-08-06 14:22:48 +02:00
Frank Schubert
a305306231 Merge branch 'fronkdev' into 'master'
Fixed Preorder order_date saving and getting setup price

See merge request fronk/thetool!1616
2025-08-06 12:10:56 +00:00
Frank Schubert
2adf180c09 Fixed Preorder order_date saving and getting setup price 2025-08-06 14:10:18 +02:00
Luca Haid
1d987d9243 Merge branch 'WarehouseOrder/fix' into 'master'
improved warehouse module

See merge request fronk/thetool!1615
2025-08-06 07:38:20 +00:00
Luca Haid
ab6b14efd1 improved warehouse module 2025-08-06 09:38:05 +02:00
Daniel Spitzer
d155445442 Merge branch 'spidev' into 'master'
Login Passwort reset

See merge request fronk/thetool!1614
2025-08-05 17:37:24 +00:00
Daniel Spitzer
7823a6d8cd Login Passwort reset
* Passwort Reset Funktion implementiert
2025-08-05 19:37:04 +02:00
Frank Schubert
258078ad78 Merge branch 'fronkdev' into 'master'
Added Fibu payment due and skonto to Billing

See merge request fronk/thetool!1613
2025-08-05 17:33:26 +00:00
Frank Schubert
b4cdbd0b6b Added Fibu payment due and skonto to Billing 2025-08-05 19:32:50 +02:00
Daniel Spitzer
e010116bae Merge branch 'spidev' into 'master'
Login Passwort reset

See merge request fronk/thetool!1612
2025-08-05 17:17:13 +00:00
Daniel Spitzer
f002f7b0f7 Login Passwort reset
* Passwort Reset Funktion implementiert
2025-08-05 19:14:51 +02:00
Luca Haid
7e7b0680dd Merge branch 'ADBRimoFCP/update-for-rml' into 'master'
updated importing fcps for rml compatibility

See merge request fronk/thetool!1611
2025-08-05 16:50:52 +00:00
64bc633a6f updated importing fcps for rml compatibility 2025-08-05 18:49:04 +02:00
Frank Schubert
c20058276c Merge branch 'fronkdev' into 'master'
added no_aftersave param to Wohneinheit/Hausnummer/Preorder afterSave()

See merge request fronk/thetool!1610
2025-08-05 15:58:00 +00:00
Frank Schubert
8f2b627706 added no_aftersave param to Wohneinheit/Hausnummer/Preorder afterSave() 2025-08-05 17:57:22 +02:00
Daniel Spitzer
2687dd7f77 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1609
2025-08-05 13:57:53 +00:00
Daniel Spitzer
d4b405627c Zeiterfassung
* Personaladmistration um Feld SV-Nummer erweitert
2025-08-05 15:56:48 +02:00
Luca Haid
72b7d62b9c Merge branch 'WarehouseShippingNote/fix-tablet-app' into 'master'
fixed refreshing of tablet app

See merge request fronk/thetool!1608
2025-08-05 13:37:31 +00:00
3ac0e03424 fixed refreshing of tablet app 2025-08-05 15:37:17 +02:00
Frank Schubert
c486bf0afe Merge branch 'fronkdev' into 'master'
Address/View: showing default payment_due if empty

See merge request fronk/thetool!1607
2025-08-05 13:23:07 +00:00
Frank Schubert
9d7b0f1ec5 Address/View: showing default payment_due if empty 2025-08-05 15:22:37 +02:00
Luca Haid
b51d708cbe Merge branch 'RMLWorkorder/fix-migration' into 'master'
fixed migration

See merge request fronk/thetool!1606
2025-08-05 13:11:00 +00:00
41a25258e5 fixed migration 2025-08-05 15:10:50 +02:00
Frank Schubert
7878f39a87 Merge branch 'fronkdev' into 'master'
Invoice: Changed sending credit invoice to xinon

See merge request fronk/thetool!1605
2025-08-05 13:10:10 +00:00
Frank Schubert
a8bdbae21f Invoice: Changed sending credit invoice to xinon 2025-08-05 15:09:24 +02:00
Luca Haid
180b597051 added new ip for xinon office 2025-08-05 13:06:52 +00:00
Frank Schubert
a8dbdb046c Merge branch 'fronkdev' into 'master'
Add PreorderCtag Migration

See merge request fronk/thetool!1604
2025-08-05 13:01:55 +00:00
Frank Schubert
ef1db750da Add PreorderCtag Migration 2025-08-05 15:01:29 +02:00
Frank Schubert
6d6c3b5797 Merge branch 'fronkdev' into 'master'
citycom import now saves service_number and status to PreorderCtag

See merge request fronk/thetool!1603
2025-08-05 12:52:59 +00:00
Frank Schubert
9aecd18da5 citycom import now saves service_number and status to PreorderCtag 2025-08-05 14:52:29 +02:00
Luca Haid
4dfdbda102 fixed some styling for tablet app 2025-08-05 12:15:16 +00:00
Luca Haid
4b9f1f530a changed height of container for tablet-app 2025-08-05 12:13:45 +00:00
Luca Haid
ff84d142e9 Changed orientation of shipping note App 2025-08-05 12:06:10 +00:00
Luca Haid
ff5aedd4b4 Added TPR IP to be able to test 2025-08-05 12:02:19 +00:00
Luca Haid
07a947c1a8 Merge branch 'WarehouseShippingNote/add-tablet-mode' into 'master'
added new tablet mode for creating shipping notes

See merge request fronk/thetool!1602
2025-08-05 12:01:15 +00:00
dff3a4f5b8 added new tablet mode for creating shipping notes 2025-08-05 13:32:50 +02:00
Frank Schubert
3353795a42 Merge branch 'fronkdev' into 'master'
Citycom Service Ordering WIP 2025-08-05

See merge request fronk/thetool!1601
2025-08-05 11:00:54 +00:00
Frank Schubert
fd9f47315f Citycom import: set order to 300 when ONT available 2025-08-05 13:00:03 +02:00
Frank Schubert
a2555a9e50 Citycom Service Ordering WIP 2025-08-05 2025-08-05 09:54:36 +02:00