Commit Graph

2346 Commits

Author SHA1 Message Date
Frank Schubert
3f39f033f0 Merge branch 'fronkdev' into 'master'
Preorder: non-netowners now also can fold down Preorders

See merge request fronk/thetool!677
2024-10-28 14:12:36 +00:00
Frank Schubert
ed95e9bb7c Preorder: non-netowners now also can fold down Preorders 2024-10-28 15:07:11 +01:00
Frank Schubert
f8d5558341 Merge branch 'fronkdev' into 'master'
Added ESTMK Font ITC Officina Sans Std to Mailtemplate

See merge request fronk/thetool!676
2024-10-23 12:15:57 +00:00
Frank Schubert
162dccb1dd Added ESTMK Font ITC Officina Sans Std to Mailtemplate 2024-10-23 14:15:24 +02:00
Frank Schubert
ffff25e1b3 Merge branch 'fronkdev' into 'master'
Importing Workorders from salescluster instead of from building now

See merge request fronk/thetool!675
2024-10-23 11:34:58 +00:00
Frank Schubert
f29831e5a4 Importing Workorders from salescluster instead of from building now 2024-10-23 13:33:28 +02:00
Daniel Spitzer
43e9b14e79 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix

See merge request fronk/thetool!674
2024-10-21 18:08:00 +00:00
Daniel Spitzer
1f24baf4e0 Zeiterfassung Bugfix
* Filter löschen bei Reports wurde angepasst.
2024-10-21 20:07:00 +02:00
Daniel Spitzer
839a124f45 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix

See merge request fronk/thetool!673
2024-10-21 17:56:08 +00:00
Daniel Spitzer
014b6fa52c Zeiterfassung Bugfix
* Winterzeitanzeige Bug bei Sollstunden behoben
* Grafische Bugs bei Anzeige in nicht Vollbild behoben
2024-10-21 19:53:49 +02:00
Frank Schubert
54c5608e38 Merge branch 'fronkdev' into 'master'
Fixed crash in Rimo Import when no preorder with unit id

See merge request fronk/thetool!672
2024-10-21 11:01:00 +00:00
Frank Schubert
f94135c44d Fixed crash in Rimo Import when no preorder with unit id 2024-10-21 12:59:59 +02:00
Frank Schubert
4d10d843f6 Merge branch 'fronkdev' into 'master'
Fixed Preorder Index for netowners

See merge request fronk/thetool!671
2024-10-17 10:52:51 +00:00
Frank Schubert
bd0421b175 Fixed Preorder Index for netowners 2024-10-17 12:51:33 +02:00
Frank Schubert
dbf990d3e3 Merge branch 'fronkdev' into 'master'
Fixed non-netowners not seeing Preorders

See merge request fronk/thetool!670
2024-10-17 10:09:30 +00:00
Frank Schubert
6dd11726b3 Fixed non-netowners not seeing Preorders 2024-10-17 12:08:44 +02:00
Frank Schubert
75761332ff Merge branch 'fronkdev' into 'master'
Network operators now only see their own and their providers Preorders

See merge request fronk/thetool!669
2024-10-16 15:27:14 +00:00
Frank Schubert
a4f7a44784 Network operators now only see their own and their providers Preorders 2024-10-16 17:26:06 +02:00
Frank Schubert
c5295f6f0f Merge branch 'fronkdev' into 'master'
Added FB4050 to CPE Provisioning

See merge request fronk/thetool!668
2024-10-14 13:13:45 +00:00
Frank Schubert
3dca9bb216 Added FB4050 to CPE Provisioning 2024-10-14 15:12:10 +02:00
Luca Haid
55f3749e98 Merge branch 'feature/enable-set-ls-invoiced' into 'master'
added possibility to set shipping notes as billed

See merge request fronk/thetool!667
2024-10-14 10:56:54 +00:00
5ca9aedce8 added possibility to set shipping notes as billed 2024-10-14 12:55:59 +02:00
Luca Haid
63626df87a Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!666
2024-10-14 07:30:06 +00:00
6c4264e7d6 fixed emailing error 2024-10-14 09:27:55 +02:00
Luca Haid
8ec8b3248b Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!665
2024-10-14 07:25:53 +00:00
8d10d56d0a fixed emailing error 2024-10-14 09:25:16 +02:00
Luca Haid
16fe715e52 Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!664
2024-10-14 07:07:01 +00:00
486d03231b fixed emailing error 2024-10-14 09:06:13 +02:00
Luca Haid
0ea7a93c52 Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!663
2024-10-14 06:58:06 +00:00
08ac981fde fixed emailing error 2024-10-14 08:57:30 +02:00
Frank Schubert
103a6ba622 Merge branch 'fronkdev' into 'master'
Added Readonly Preorder API user (Meridiam)

See merge request fronk/thetool!662
2024-10-10 18:24:46 +00:00
Frank Schubert
3a20660384 Added Readonly Preorder API user (Meridiam) 2024-10-10 20:24:09 +02:00
Frank Schubert
95b0f5d80e Merge branch 'fronkdev' into 'master'
Now showing all Workorders in Preorder detail

See merge request fronk/thetool!661
2024-10-10 14:43:14 +00:00
Frank Schubert
a0b5c9cc6e Now showing all Workorders in Preorder detail 2024-10-10 16:42:22 +02:00
Luca Haid
eadaf797f2 Merge branch 'bugfix/e-shop' into 'master'
fixed error while creating shipping note for e-shop order

See merge request fronk/thetool!660
2024-10-10 12:35:04 +00:00
e4c21960aa fixed error while creating shipping note for e-shop order 2024-10-10 14:31:36 +02:00
Frank Schubert
396e26c0a1 WIP Preorder readonly user (meridiam) 2024-10-10 14:17:11 +02:00
Frank Schubert
729ae61812 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-10-10 14:16:56 +02:00
Frank Schubert
c95311d528 added skel of RimoWorkorder Contact update in Preorder.php 2024-10-10 14:16:31 +02:00
Luca Haid
4876fc3fd0 Merge branch 'bugfix/e-shop' into 'master'
added shipping notes for warehouse e shop

See merge request fronk/thetool!659
2024-10-10 09:20:37 +00:00
6b2e0eb14e added shipping notes for warehouse e shop 2024-10-10 11:19:35 +02:00
Luca Haid
7f4239a768 Merge branch 'bugfix/e-shop' into 'master'
fixed error because it is now object instead of array

See merge request fronk/thetool!658
2024-10-10 08:58:52 +00:00
fd70379db6 fixed error because it is now object instead of array 2024-10-10 10:58:37 +02:00
Luca Haid
726d77f9dc Merge branch 'feature/address-show-internal-note' into 'master'
show internal note in the view of an address

See merge request fronk/thetool!657
2024-10-10 08:13:44 +00:00
883912a46f show internal note in the view of an address 2024-10-10 10:13:24 +02:00
Luca Haid
7d4d8d9b58 Merge branch 'bugfix/create-locations-action' into 'master'
fixed createLocations Action not working

See merge request fronk/thetool!656
2024-10-10 07:34:43 +00:00
8fdab0a1bf fixed createLocations Action not working 2024-10-10 09:34:24 +02:00
Luca Haid
5814988016 Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!655
2024-10-10 06:54:14 +00:00
ea5a25ea03 update for warehouse 2024-10-10 08:53:49 +02:00
Luca Haid
6eda9de0dd Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!654
2024-10-10 06:52:01 +00:00