Commit Graph

2421 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
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
5190ce031b Added Emaillog to PreorderBillingInvoice 2025-09-17 12:45:42 +02: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
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
76a9fd5a02 added new adbrimofcp map 2025-09-16 12:19:31 +02:00
5db3a64e34 added new adbrimofcp map 2025-09-16 11:51:25 +02: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
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
23e59246dd ADBWohneinheit/add-new-greenfield-check 2025-09-12 10:54:26 +02: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
8e6ab15fef added new fcp statistics 2025-09-12 09:18:15 +02:00
e1bfb5e96d added new fcp filter 2025-09-11 14:32:39 +02:00
1531dad3a0 added new user edit view 2025-09-11 10:03:03 +02:00
Luca Haid
0fd6ecd85d Merge branch 'WarehouseOffer/show-discount-in-pdf' into 'master'
show discount in pdf from now

See merge request fronk/thetool!1741
2025-09-11 06:02:36 +00:00
0a23692519 fixed workorder company view for status filter 2025-09-11 08:02:01 +02:00
99b10b034c show discount in pdf from now 2025-09-11 08:01:35 +02:00
Frank Schubert
90e40567b1 Merge branch 'fronkdev' into 'master'
PreorderstatusJournal & preorder flags -> ADBHausnummer flags sync

See merge request fronk/thetool!1739
2025-09-10 15:41:55 +00:00
Frank Schubert
aab08b5d65 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2025-09-10 17:39:52 +02:00
Frank Schubert
6dfc4a31c6 PreorderstatusJournal & preorder flags -> ADBHausnummer flags sync 2025-09-10 17:38:53 +02:00
Luca Haid
5d6285c116 fixed showing partner (e.g. 7000) number in the v2 cpeprov 2025-09-09 12:10:56 +00:00
94feab5c0c fixed login handling in the workorder app 2025-09-09 14:01:53 +02:00
8abf7444f3 added new useredit page 2025-09-09 12:40:34 +02:00
Luca Haid
ee68b45607 fixed bugs 2025-09-08 18:29:30 +02:00
Luca Haid
c3de5da6a1 fixed bugs 2025-09-08 18:25:58 +02:00
Luca Haid
4bea970a6b fixed bugs 2025-09-08 14:43:43 +02:00
Luca Haid
27e53815b3 added fcp to preorder export 2025-09-08 14:26:00 +02:00
Luca Haid
254827b3f9 added fcp to preorder export 2025-09-08 13:39:24 +02:00
Luca Haid
77fc124a08 feat: Handle status 20 as cancelled
Treat orders with status 20 as effectively cancelled. This change ensures that these orders are excluded from active workflows and views:

- Prevent workorder creation.
- Hide from the default order view and overview counts.
- Orders remain findable only via filtering.
2025-09-08 09:47:33 +02:00
Daniel Spitzer
2fbbc8a078 Merge branch 'spidev' into 'master'
Calender Update

See merge request fronk/thetool!1719
2025-09-07 19:39:30 +00:00
Daniel Spitzer
a41aaf9088 Calender Update
* Abgesagte Serientermine werden nun auch ausgeblendet wenn der Button gedrückt wurde
2025-09-07 21:39:02 +02:00
Frank Schubert
b87afb9534 Merge branch 'fronkdev' into 'master'
Fixed cifurl creation in PreorderLogistics

See merge request fronk/thetool!1718
2025-09-05 12:05:32 +00:00
Frank Schubert
b622f66903 Fixed cifurl creation in PreorderLogistics 2025-09-05 14:05:13 +02:00
Frank Schubert
aa04f49837 Fixed cifurl creation in PreorderLogistics 2025-09-05 14:04:48 +02:00
Frank Schubert
b29e6fe6af Merge branch 'fronkdev' into 'master'
Fixed cifurl generation in Preorerlogistics

See merge request fronk/thetool!1717
2025-09-05 09:50:20 +00:00
Frank Schubert
758024f490 Fixed cifurl generation in Preorerlogistics 2025-09-05 11:49:33 +02:00
433e8ea4af added new cc features 2025-09-04 14:20:16 +02:00
ad8face417 fixed rimo filter preorder 2025-09-04 14:06:42 +02:00
d3e549ab5a fixed rimo filter preorder 2025-09-04 14:06:17 +02:00