Commit Graph
100 Commits
Author SHA1 Message Date
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
Luca Haid 3a71f3abef removed error handling 2025-09-16 15:19:24 +00: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
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
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 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 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 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 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 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 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 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 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 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 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 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 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 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 Haid 37a28c7fd9 fixed distorted logo in settings in workorder pwa 2025-09-09 09:10:39 +00:00
Luca Haid ef7dc06ff0 Merge branch 'Workorder/improve-spacing' into 'master'
improved spacing with buttons

See merge request fronk/thetool!1734
2025-09-09 07:46:30 +00:00
Luca Haid 0cac120e3f fixed ADB NE in Preorder\export.csv.php 2025-09-09 06:39:22 +00:00
Luca Haid d2f395dc37 improved ui of Workorder PWA 2025-09-08 20:13:38 +00:00
Luca Haid 6189a3d527 Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1733
2025-09-08 18:12:32 +00:00
Luca Haid 3e39f73ac8 fixed bugs 2025-09-08 20:12:03 +02:00
Luca Haid 3f1cee3276 Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1732
2025-09-08 17:57:54 +00:00
Luca Haid 331174c5ad fixed bugs 2025-09-08 19:57:46 +02:00
Luca Haid 30da6512b2 Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1731
2025-09-08 16:29:36 +00:00
Luca Haid ee68b45607 fixed bugs 2025-09-08 18:29:30 +02:00
Luca Haid aa2bad5e21 Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1730
2025-09-08 16:26:04 +00:00
Luca Haid c3de5da6a1 fixed bugs 2025-09-08 18:25:58 +02:00
Luca Haid 78afb7d00f Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1729
2025-09-08 14:43:34 +00:00
Luca Haid 22d89df8ef fixed bugs 2025-09-08 16:43:24 +02:00
Luca Haid 7a31d263b1 Merge branch 'Workorder/improve-pwa' into 'master'
fixed bugs

See merge request fronk/thetool!1728
2025-09-08 14:15:41 +00:00
Luca Haid 524be94afc fixed bugs 2025-09-08 16:15:34 +02:00
Luca Haid ea950cad73 Merge branch 'Workorder/fix-get-tenant-and-status' into 'master'
fixed bugs

See merge request fronk/thetool!1727
2025-09-08 12:43:56 +00:00
Luca Haid 4bea970a6b fixed bugs 2025-09-08 14:43:43 +02:00
Luca Haid 090ed349ce Merge branch 'Preorder/add-fcp-to-export' into 'master'
added fcp to preorder export

See merge request fronk/thetool!1726
2025-09-08 12:26:07 +00:00
Luca Haid 27e53815b3 added fcp to preorder export 2025-09-08 14:26:00 +02:00
Luca Haid 1dd6182cea Merge branch 'Preorder/add-fcp-to-export' into 'master'
added fcp to preorder export

See merge request fronk/thetool!1725
2025-09-08 11:39:32 +00:00
Luca Haid 254827b3f9 added fcp to preorder export 2025-09-08 13:39:24 +02:00
Luca Haid 0d6295159d Merge branch 'WarehouseOffer/show-zweck' into 'master'
added showing purpose in warehouseoffer

See merge request fronk/thetool!1724
2025-09-08 11:25:37 +00:00
Luca Haid 4de820f538 added showing purpose in warehouseoffer 2025-09-08 13:25:27 +02:00
Luca Haid e30b88c06d Update WorkorderCompanyPWA.php 2025-09-08 09:04:24 +00:00
Luca Haid 12453cfa3a Update WorkorderCompanyPWA.php 2025-09-08 08:55:02 +00:00
Luca Haid ac5c8e5c24 Update WorkorderCompanyPWA.php 2025-09-08 08:47:09 +00:00
Luca Haid 1f8d3c36f9 Update WorkorderCompanyPWA.php 2025-09-08 08:44:54 +00:00
Luca Haid 5dcb9ab855 Merge branch 'RMLWorkorder/add-oaid-fcp-filter' into 'master'
Rml workorder/add oaid fcp filter

See merge request fronk/thetool!1723
2025-09-08 08:37:36 +00:00
Luca Haid d0e563297f Rml workorder/add oaid fcp filter 2025-09-08 08:37:36 +00:00
Luca Haid 53f04b1f6e Merge branch 'RMLWorkorder/add-oaid-fcp-filter' into 'master'
added oaid/fcp filter

See merge request fronk/thetool!1721
2025-09-08 08:24:45 +00:00
Luca Haid 22031ffb23 added oaid/fcp filter 2025-09-08 08:24:44 +00:00
Luca Haid 91aa852e26 Merge branch 'Preorder/add-new-20-filter' into 'master'
feat: Handle status 20 as cancelled

See merge request fronk/thetool!1720
2025-09-08 07:47:45 +00: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
Luca Haid b3741f2b66 Merge branch 'Workorder/improve-pwa' into 'master'
added improved version of pwa app

See merge request fronk/thetool!1716
2025-09-04 12:46:05 +00:00
Luca Haid 5feca3859c Merge branch 'ConstructionConsent/add-new-features' into 'master'
added new cc features

See merge request fronk/thetool!1715
2025-09-04 12:20:33 +00:00
Luca Haid 2226944053 Merge branch 'Preorder/fix-rimo-filter' into 'master'
fixed rimo filter preorder

See merge request fronk/thetool!1714
2025-09-04 12:07:00 +00:00
Luca Haid 94b89942b5 Merge branch 'Preorder/fix-rimo-filter' into 'master'
fixed rimo filter preorder

See merge request fronk/thetool!1713
2025-09-04 12:06:30 +00:00
Luca Haid 24637af661 Merge branch 'Preorder/fix-rimo-filter' into 'master'
fixed rimo filter preorder

See merge request fronk/thetool!1712
2025-09-04 11:24:39 +00:00
Luca Haid 50ad709c1f Merge branch 'Preorder/fix-rimo-filter' into 'master'
fixed rimo filter preorder

See merge request fronk/thetool!1711
2025-09-04 10:47:17 +00:00
Luca Haid 1e175dcace Merge branch 'Workorder/add-mobile' into 'master'
added new workorder mobile app

See merge request fronk/thetool!1710
2025-09-04 09:39:40 +00:00
Luca Haid 7046a4383f Update WorkorderAdminController.php 2025-09-04 08:07:43 +00:00
Luca Haid 30a44a1f24 Merge branch 'WarehouseShippingNote/fix-from-calendar' into 'master'
fixed from calendar create

See merge request fronk/thetool!1708
2025-09-02 15:57:47 +00:00
Luca Haid 6e74b572ac Merge branch 'RMLWorkorder/fix-journal' into 'master'
fixed menu and journal

See merge request fronk/thetool!1706
2025-09-02 13:24:03 +00:00
Luca Haid 5080832ac7 Merge branch 'RMLWorkorder/fix-menu-and-journal' into 'master'
fixed menu and journal

See merge request fronk/thetool!1705
2025-09-02 13:18:21 +00:00
Luca Haid 9eeea3fee6 Merge branch 'RMLWorkorder/add-management' into 'master'
added tenant configuration

See merge request fronk/thetool!1704
2025-09-02 13:01:25 +00:00
Luca Haid 179d711bbd Merge branch 'RMLWorkorder/fix-get-companies' into 'master'
fixed get companies

See merge request fronk/thetool!1703
2025-09-02 11:36:53 +00:00
Luca Haid 5ecfc12b74 Update WorkorderTenantConfigModel.php 2025-09-02 11:31:52 +00:00
Luca Haid 356a1103bc Merge branch 'RMLWorkorder/v6' into 'master'
Rml workorder/v6

See merge request fronk/thetool!1702
2025-09-02 11:28:37 +00:00
Luca Haid 95e34168fa Rml workorder/v6 2025-09-02 11:28:37 +00:00
Luca Haid a8e9ec9145 Update WorkorderBase.js 2025-09-02 11:27:54 +00:00
Luca Haid 461c4bf3fc Update WorkorderAdmin.js 2025-09-02 11:27:38 +00:00
Luca Haid 2b03e0f3a3 Add new file 2025-09-02 11:27:03 +00:00
Luca Haid 229f4b8638 Update 20250901410000_workorder_rename.php 2025-09-02 11:26:46 +00:00
Luca Haid 83832ab3b7 Update WorkorderTenantConfigModel.php 2025-09-02 11:25:56 +00:00
Luca Haid 042c84cecc Update WorkorderCompanyController.php 2025-09-02 11:25:37 +00:00
Luca Haid 38f8eb55e7 Update WorkorderTenantConfigModel.php 2025-09-02 08:41:00 +00:00
Luca Haid 06760e40f6 Update 20250901410000_workorder_rename.php 2025-09-02 08:39:24 +00:00
Luca Haid 3dd75d3c7f Merge branch 'v5' into 'master'
rmlworkorder major upgrade

See merge request fronk/thetool!1699
2025-09-02 08:36:33 +00:00
Luca Haid b173a6edc1 rmlworkorder major upgrade 2025-09-02 08:36:33 +00:00
Luca Haid b34b773f66 Merge branch 'ConstructionConsent/fix-no-pdf' into 'master'
fixed showing pdfs to download and not allowing in future

See merge request fronk/thetool!1696
2025-09-01 12:08:08 +00:00
Luca Haid 80470bf9bd fixed showing pdfs to download and not allowing in future 2025-09-01 14:07:59 +02:00
Luca Haid 771ad058ab Merge branch 'DeviceMonitoring/v2' into 'master'
Device monitoring/v2

See merge request fronk/thetool!1695
2025-09-01 11:24:33 +00:00
Luca Haid 73fca90fd9 Device monitoring/v2 2025-09-01 11:24:32 +00:00
Luca Haid 9d340a49c2 Merge branch 'DeviceMonitoring/v2' into 'master'
Device monitoring/v2

See merge request fronk/thetool!1693
2025-09-01 10:26:01 +00:00