Commit Graph

4712 Commits

Author SHA1 Message Date
59e8e4a7a6 enhanced preorder map 2025-09-18 12:57:10 +02:00
f05ff28394 enhanced preorder map 2025-09-18 12:55:26 +02:00
Luca Haid
b69bfc3afe fixed typo 2025-09-18 10:47:23 +00:00
Luca Haid
d449ab198e changed calculation again 2025-09-18 10:35:15 +00:00
Luca Haid
f070da9d4d Merge branch 'WarehouseShippingNote/add-automatic-filling' into 'master'
add automatic filling

See merge request fronk/thetool!1771
2025-09-18 09:27:28 +00:00
af45523d4f add automatic filling 2025-09-18 11:26:29 +02:00
Luca Haid
702501f00f Merge branch 'Preorder/update-map' into 'master'
updated map

See merge request fronk/thetool!1770
2025-09-18 09:18:59 +00:00
792aa958e0 updated map 2025-09-18 11:18:47 +02:00
Luca Haid
986a1b3762 added cors headers for monitoring tvs 2025-09-18 09:10:29 +00:00
Luca Haid
1522e65717 Merge branch 'CpeProvisioning/add-api-for-officecenter' into 'master'
added api for officecenter tvs

See merge request fronk/thetool!1769
2025-09-18 09:03:31 +00:00
7c46bafe4b added api for officecenter tvs 2025-09-18 11:03:05 +02:00
Luca Haid
952dddef7e changed stats calculation 2025-09-18 08:34:48 +00:00
Luca Haid
a4b65759e2 Merge branch 'Preorder/change-rimo-type-map' into 'master'
updated rimo type map

See merge request fronk/thetool!1768
2025-09-17 14:19:35 +00:00
f4143344d5 updated rimo type map 2025-09-17 16:19:25 +02:00
Luca Haid
fb11ce228d changed counting campaign 2025-09-17 14:13:07 +00:00
Luca Haid
d99ba00b5b added red highlight for rimo states 2025-09-17 14:09:12 +00:00
Luca Haid
4be5a35d78 Merge branch 'Preorder/modify-counting' into 'master'
changed counting campaign

See merge request fronk/thetool!1767
2025-09-17 13:58:14 +00:00
69ffedc5b0 changed counting campaign 2025-09-17 15:57:44 +02:00
Luca Haid
3f1b010405 Merge branch 'Preorder/rimo-map' into 'master'
updated rimo type map

See merge request fronk/thetool!1766
2025-09-17 12:44:59 +00:00
f835bfbfdd updated rimo type map 2025-09-17 14:44:48 +02:00
Luca Haid
f570b7949f Merge branch 'Preorder/rimo-map' into 'master'
updated rimo type map

See merge request fronk/thetool!1765
2025-09-17 12:26:00 +00:00
afe533bf4f updated rimo type map 2025-09-17 14:25:45 +02:00
Luca Haid
495130325b Merge branch 'ConstructionConsent/fix-traffic-light' into 'master'
fixed traffic light

See merge request fronk/thetool!1764
2025-09-17 11:34:08 +00:00
ab2eca0ade fixed traffic light 2025-09-17 13:33:56 +02:00
Luca Haid
75fbc9000f renamed ModifyPreordercampaign2 2025-09-17 11:26:11 +00:00
Luca Haid
aba866f9c8 renamed ModifyPreordercampaign2 because of conflicts 2025-09-17 11:25:47 +00:00
Luca Haid
5d179659bd Merge branch 'Preorder/update-rimo-type-map' into 'master'
updated rimotype map

See merge request fronk/thetool!1763
2025-09-17 11:23:25 +00:00
7a71c9fdd8 updated rimotype map 2025-09-17 13:23:03 +02:00
Frank Schubert
8a4f209882 Merge branch 'fronkdev' into 'master'
Added Emaillog to PreorderBillingInvoice

See merge request fronk/thetool!1762
2025-09-17 10:46:07 +00:00
Frank Schubert
5190ce031b Added Emaillog to PreorderBillingInvoice 2025-09-17 12:45:42 +02:00
Frank Schubert
95db2cb209 Merge branch 'fronkdev' into 'master'
Added Preorder cancel request UI changes

See merge request fronk/thetool!1761
2025-09-17 10:18:47 +00:00
Frank Schubert
3506bc51fb manual merge PreorderController 2025-09-17 12:18:15 +02:00
Frank Schubert
daf7f5b9a7 Merge branch 'master' into 'fronkdev'
# Conflicts:
#   application/Preorder/PreorderController.php
2025-09-17 10:17:18 +00:00
Frank Schubert
bad591e80d Added Preorder cancel request UI changes 2025-09-17 12:15:52 +02:00
Frank Schubert
2e8dbb1b56 Merge branch 'fronkdev' into 'master'
fixed status buttons in Preorder/index

See merge request fronk/thetool!1760
2025-09-17 10:14:52 +00:00
Frank Schubert
f6edba49a0 fixed status buttons in Preorder/index 2025-09-17 12:14:28 +02:00
Daniel Spitzer
7614fead8f Merge branch 'spidev' into 'master'
Spidev

See merge request fronk/thetool!1759
2025-09-16 15:20:52 +00:00
Daniel Spitzer
2426c6a282 Kalenderupdate für Sbidi IBNS 2025-09-16 17:20:21 +02:00
Daniel Spitzer
71a01b8570 n 2025-09-16 17:19:37 +02:00
Luca Haid
3a71f3abef removed error handling 2025-09-16 15:19:24 +00:00
Daniel Spitzer
da89dadabc Merge branch 'spidev' into 'master'
n

See merge request fronk/thetool!1758
2025-09-16 15:14:01 +00:00
Daniel Spitzer
4afd7ee65e n 2025-09-16 17:13:39 +02:00
Daniel Spitzer
044cb42bbf Merge branch 'spidev' into 'master'
Kalendererweiterung für sbidi IBNS

See merge request fronk/thetool!1757
2025-09-16 15:09:28 +00:00
Daniel Spitzer
e2f6f39e33 PopRack Erweiterung LC/SC mit 96 Fasern 2025-09-16 17:08:16 +02:00
Luca Haid
0580712653 Merge branch 'ADBWohneinheit/add-contacts' into 'master'
fixed include for ADBWohneinheitContactManager

See merge request fronk/thetool!1756
2025-09-16 14:13:06 +00:00
50b7836f7c fixed include for ADBWohneinheitContactManager 2025-09-16 16:12:59 +02:00
Luca Haid
3b2482029a Merge branch 'ADBWohneinheit/add-contacts' into 'master'
Adb wohneinheit/add contacts

See merge request fronk/thetool!1755
2025-09-16 14:10:03 +00:00
Luca Haid
0496103841 Adb wohneinheit/add contacts 2025-09-16 14:10:03 +00:00
Frank Schubert
fd39ba1db2 Merge branch 'fronkdev' into 'master'
Fixed RTR B10 report - removed provision contracts

See merge request fronk/thetool!1753
2025-09-16 13:57:36 +00:00
Frank Schubert
5d8d236887 Fixed RTR B10 report - removed provision contracts 2025-09-16 15:57:02 +02:00