Commit Graph
4664 Commits
Author SHA1 Message Date
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
Luca 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
Luca 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
Luca 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
Luca 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
Luca 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
Luca Haid 940fc9d56a Merge branch 'Preorder/add-fcp-stats' into 'master'
added new fcp statistics

See merge request fronk/thetool!1745
2025-09-12 07:18:25 +00:00
Luca 8e6ab15fef added new fcp statistics 2025-09-12 09:18:15 +02:00
Luca Haid 900b9232b4 Merge branch 'AddressDB/add-fcp-filter' into 'master'
added new fcp filter

See merge request fronk/thetool!1744
2025-09-11 12:32:49 +00:00
Luca e1bfb5e96d added new fcp filter 2025-09-11 14:32:39 +02:00
Luca Haid 8a53e31fa3 Merge branch 'AssetManagement/fix-reservation-lookup' into 'master'
fixed showing closest reservation

See merge request fronk/thetool!1743
2025-09-11 11:06:16 +00:00
Luca 59a99f4638 fixed showing closest reservation 2025-09-11 13:06:06 +02:00
Luca Haid 92429914ad fixed config import in session-watcher.php 2025-09-11 10:48:28 +00:00
Luca Haid d0da6cfb74 added new session-watcher to bin folder 2025-09-11 10:46:46 +00:00
Luca Haid 865992c6a0 improved caching to handle multi-tabs and save some requests 2025-09-11 10:33:50 +00:00
Luca Haid e989cbfc28 Merge branch 'User/new-edit-page' into 'master'
added new user edit view

See merge request fronk/thetool!1742
2025-09-11 08:03:15 +00:00
Luca 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
Luca Haid b7ee60cb6c Merge branch 'Workorder/fix-company-filter' into 'master'
fixed workorder company view for status filter

See merge request fronk/thetool!1740
2025-09-11 06:02:18 +00:00
Luca 0a23692519 fixed workorder company view for status filter 2025-09-11 08:02:01 +02:00
Luca 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 01b79a8e27 Merge branch 'UserEdit/fix-template-handling' into 'master'
fixed template handling in new useredit view

See merge request fronk/thetool!1738
2025-09-09 12:32:36 +00:00
Luca 2aa26568f1 fixed template handling in new useredit view 2025-09-09 14:32:25 +02:00
Luca Haid 5d6285c116 fixed showing partner (e.g. 7000) number in the v2 cpeprov 2025-09-09 12:10:56 +00:00
Luca Haid e121bd074d updated font sizes for cpeprov labels 2025-09-09 12:09:33 +00:00
Luca Haid a46a25af10 Merge branch 'Workorder/fix-login-handling' into 'master'
fixed login handling in the workorder app

See merge request fronk/thetool!1737
2025-09-09 12:03:32 +00:00
Luca 607637ab6b fixed login handling in the workorder app 2025-09-09 14:03:22 +02:00
Luca Haid 262e208c4f Merge branch 'Workorder/fix-login-handling' into 'master'
fixed login handling in the workorder app

See merge request fronk/thetool!1736
2025-09-09 12:02:04 +00:00
Luca 94feab5c0c fixed login handling in the workorder app 2025-09-09 14:01:53 +02:00
Luca Haid fe53e4b4ae Merge branch 'Workorder/improve-spacing' into 'master'
added new useredit page

See merge request fronk/thetool!1735
2025-09-09 10:40:57 +00:00
Luca 8abf7444f3 added new useredit page 2025-09-09 12:40:34 +02:00