Commit Graph

4692 Commits

Author SHA1 Message Date
f835bfbfdd updated rimo type map 2025-09-17 14:44:48 +02: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
Luca Haid
5136d087a5 Merge branch 'Preorder/add-new-map' into 'master'
added new adbrimofcp map

See merge request fronk/thetool!1752
2025-09-16 10:32:15 +00:00
219c42a1f6 added new adbrimofcp map 2025-09-16 12:32:06 +02:00
Luca Haid
18b2e22555 Merge branch 'Preorder/add-new-map' into 'master'
added new adbrimofcp map

See merge request fronk/thetool!1751
2025-09-16 10:19:38 +00:00
76a9fd5a02 added new adbrimofcp map 2025-09-16 12:19:31 +02:00
Luca Haid
0d13fd4ae6 Merge branch 'Preorder/add-new-map' into 'master'
added new adbrimofcp map

See merge request fronk/thetool!1750
2025-09-16 09:51:41 +00:00
5db3a64e34 added new adbrimofcp map 2025-09-16 11:51:25 +02:00
Luca Haid
e79b2392c9 Merge branch 'ManualInvoice/init' into 'master'
first version of manualinvoice

See merge request fronk/thetool!1749
2025-09-16 08:08:33 +00:00
c0323946ca first version of manualinvoice 2025-09-16 10:08:25 +02:00
Frank Schubert
795b957502 Merge branch 'fronkdev' into 'master'
Fixed Preorder Status checkboxes

See merge request fronk/thetool!1748
2025-09-15 09:30:58 +00:00
Frank Schubert
cb1fb9bb19 Fixed Preorder Status checkboxes 2025-09-15 11:30:08 +02:00
Luca Haid
774cfad1af Merge branch 'Workorder/add-new-column' into 'master'
fixed company campaign column

See merge request fronk/thetool!1747
2025-09-15 09:05:44 +00:00
Luca Haid
0054535145 fixed company campaign column 2025-09-15 11:05:27 +02:00
Luca Haid
0fa7a8ecd2 fixed sql error for greenfield check 2025-09-12 09:03:45 +00:00
Luca Haid
ca4d9c14da fixed $this->user to $this->me 2025-09-12 08:56:00 +00:00
Luca Haid
4acf8b1eea Merge branch 'ADBWohneinheit/add-new-greenfield-check' into 'master'
ADBWohneinheit/add-new-greenfield-check

See merge request fronk/thetool!1746
2025-09-12 08:54:33 +00:00
23e59246dd ADBWohneinheit/add-new-greenfield-check 2025-09-12 10:54:26 +02:00
Luca Haid
892c12881e reworked labels of fcp popup 2025-09-12 08:37:08 +00:00
Luca Haid
33bf082ad3 added cache to the showAction to reduce network requests 2025-09-12 07:30:09 +00:00
Luca Haid
3b1be1c4b6 deregistering the warehouseshippingnote serviceworker 2025-09-12 07:28:30 +00:00
Luca Haid
6c19367716 enhanced vodia switcher to add more caching and care about the browser visibility 2025-09-12 07:26:10 +00:00