Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid a8f289f495 Added Anschriftenzusatz to WarehouseEShop 2025-01-22 09:17:40 +01:00
Luca Haid 62bd95c707 Merge branch 'shipping-note-fix-km' into 'master'
Updated vice versa updating of status flags / attributes

See merge request fronk/thetool!936
2025-01-21 15:33:45 +00:00
Luca Haid e52daf887b Updated vice versa updating of status flags / attributes 2025-01-21 16:33:27 +01:00
Luca Haid ceea674143 Merge branch 'shipping-note-fix-km' into 'master'
Showing Kilometercount for the Employees

See merge request fronk/thetool!935
2025-01-21 15:23:17 +00:00
Luca Haid 4f6f968d7a Showing Kilometercount for the Employees 2025-01-21 16:22:29 +01:00
Luca Haid 42fbbfde95 Merge branch 'shipping-note-fix-km' into 'master'
Showing Kilometercount for the Employees

See merge request fronk/thetool!934
2025-01-21 15:15:41 +00:00
Luca Haid b17d0ded9c Showing Kilometercount for the Employees 2025-01-21 16:15:25 +01:00
Luca Haid bcc89f6486 Merge branch 'preorder-fix-attribute-statusflag' into 'master'
Preorder fix attribute statusflag

See merge request fronk/thetool!933
2025-01-21 13:18:50 +00:00
Luca Haid ee7c1469f5 Preorder fix attribute statusflag 2025-01-21 13:18:50 +00:00
Luca Haid eaa885e97d Merge branch 'historic-bill-fix-decimal' into 'master'
Historic bill fix decimal

See merge request fronk/thetool!931
2025-01-21 10:57:23 +00:00
Luca Haid 29416611bc Historic bill fix decimal 2025-01-21 10:57:23 +00:00
Luca Haid 42a10a5c17 Merge branch 'historic-bill-fix-decimal' into 'master'
Historic bill fix decimal

See merge request fronk/thetool!930
2025-01-21 08:47:47 +00:00
Luca Haid ec39072a39 Historic bill fix decimal 2025-01-21 08:47:46 +00:00
Luca Haid 977c4eb399 Merge branch 'invoice-add-fibu-filter' into 'master'
Added Fibu Filter

See merge request fronk/thetool!929
2025-01-21 08:38:01 +00:00
Luca Haid ed29480cce Added Fibu Filter 2025-01-21 09:37:40 +01:00
Luca Haid c2d284ee78 Merge branch 'add-order-frontend' into 'master'
Updated Shipping Note

See merge request fronk/thetool!928
2025-01-21 08:23:46 +00:00
Luca Haid f5e167d477 Updated Shipping Note 2025-01-21 09:23:10 +01:00
Luca Haid ddfebfd8d7 Merge branch 'add-order-frontend' into 'master'
Updated WarehouseOrderRequest

See merge request fronk/thetool!927
2025-01-20 14:46:01 +00:00
Luca Haid 38d5cd1861 Updated WarehouseOrderRequest 2025-01-20 15:45:42 +01:00
Luca Haid eb5b733f61 Merge branch 'add-order-frontend' into 'master'
Updated WarehouseOrderRequest

See merge request fronk/thetool!926
2025-01-20 14:42:42 +00:00
Luca Haid 8e2b959af4 Updated WarehouseOrderRequest 2025-01-20 15:42:27 +01:00
Luca Haid 2c0522f1e5 Merge branch 'add-order-frontend' into 'master'
Updated WarehouseOrderRequest

See merge request fronk/thetool!925
2025-01-20 14:40:49 +00:00
Luca Haid 6e87b77387 Updated WarehouseOrderRequest 2025-01-20 15:40:13 +01:00
Luca Haid 1cfadaf5e2 Merge branch 'invoice-add-fibu-number' into 'master'
added showing fibu-acc-nr in invoice

See merge request fronk/thetool!922
2025-01-17 16:36:11 +00:00
Luca Haid f0c6c23a52 added showing fibu-acc-nr in invoice 2025-01-17 17:35:51 +01:00
Luca Haid 263e8f72e3 Merge branch 'fix-new-dashboard' into 'master'
Fix new dashboard

See merge request fronk/thetool!921
2025-01-17 07:58:54 +00:00
Luca Haid 3b17cd0153 Fix new dashboard 2025-01-17 07:58:53 +00:00
Luca Haid 0e883aca0c Merge branch 'fix-new-dashboard' into 'master'
Fix new dashboard

See merge request fronk/thetool!919
2025-01-16 15:13:40 +00:00
Luca Haid 2fb22b11f4 Fix new dashboard 2025-01-16 15:13:39 +00:00
Luca Haid 72a6fe7588 Merge branch 'fix-new-dashboard' into 'master'
updated rml dashboard

See merge request fronk/thetool!914
2025-01-16 06:11:53 +00:00
Luca Haid 92f068503c updated rml dashboard 2025-01-16 07:11:23 +01:00
Luca Haid 9a26f8cca8 Merge branch 'fix-new-dashboard' into 'master'
fixed no filter showing all results

See merge request fronk/thetool!910
2025-01-15 08:02:51 +00:00
Luca Haid 75ca540602 fixed no filter showing all results 2025-01-15 09:01:45 +01:00
Luca Haid c5227b6002 Merge branch 'change-preorder-filter' into 'master'
changed rimo-workorder-status filter

See merge request fronk/thetool!897
2025-01-14 13:06:07 +00:00
Luca Haid 6605910804 changed rimo-workorder-status filter 2025-01-14 14:05:46 +01:00
Luca Haid dbbf49a9a9 Merge branch 'fix-addr-model' into 'master'
fixed address model

See merge request fronk/thetool!895
2025-01-14 12:39:19 +00:00
Luca Haid 963aa08a2c fixed address model 2025-01-14 13:38:14 +01:00
Luca Haid 1250bf17d3 Merge branch 'added-enter-searching' into 'master'
added enter to search

See merge request fronk/thetool!894
2025-01-14 12:31:04 +00:00
Luca Haid 8d0067adc1 added enter to search 2025-01-14 13:30:45 +01:00
Luca Haid d07cdfce12 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch input

See merge request fronk/thetool!893
2025-01-14 11:57:09 +00:00
Luca Haid 6233454b66 fixed touch input 2025-01-14 12:56:12 +01:00
Luca Haid a5d56d9350 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch issue

See merge request fronk/thetool!892
2025-01-14 11:34:10 +00:00
Luca Haid 1ec1afd859 fixed touch issue 2025-01-14 12:33:55 +01:00
Luca Haid 18ad06395e Merge branch 'add-radius-connection' into 'master'
added link to edit user

See merge request fronk/thetool!891
2025-01-14 11:08:11 +00:00
Luca Haid e86db7d2e1 added link to edit user 2025-01-14 12:07:44 +01:00
Luca Haid 0f42830ffb Update Radius.js 2025-01-14 08:36:36 +00:00
Luca Haid 0465c6c57d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!890
2025-01-14 08:10:58 +00:00
Luca Haid 08b4c27c5d added new radius module 2025-01-14 09:10:24 +01:00
Luca Haid 896692d25d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!889
2025-01-14 07:53:21 +00:00
Luca Haid 35e5040155 added new radius module 2025-01-14 08:52:50 +01:00
Luca Haid d1ec42b017 Merge branch 'dashboard-chart-edit' into 'master'
made points inside chart bigger

See merge request fronk/thetool!886
2025-01-13 10:32:01 +00:00
Luca Haid bb4eee7caa made points inside chart bigger 2025-01-13 11:31:42 +01:00
Luca Haid 7ee2a1e8b2 Merge branch 'shipping-note-add-inv-addr' into 'master'
added invoice addr to shipping note pdf

See merge request fronk/thetool!885
2025-01-13 10:31:07 +00:00
Luca Haid 65755afd2d added invoice addr to shipping note pdf 2025-01-13 11:30:49 +01:00
Luca Haid 0641753ee5 Merge branch 'rework-dashboard' into 'master'
fixed cache disabling

See merge request fronk/thetool!884
2025-01-13 09:48:01 +00:00
Luca Haid 101cd50261 fixed cache disabling 2025-01-13 10:47:18 +01:00
Luca Haid 9dcddbd1ec Merge branch 'rework-dashboard' into 'master'
Updated Dashboard and made it live

See merge request fronk/thetool!883
2025-01-13 09:45:44 +00:00
Luca Haid a6df4c6496 Updated Dashboard and made it live 2025-01-13 10:44:32 +01:00
Luca Haid 9f7338c77f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!881
2025-01-10 12:31:06 +00:00
Luca Haid 534febd8e7 Rework dashboard 2025-01-10 12:31:05 +00:00
Luca Haid 3eabc30c58 Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!880
2025-01-10 11:12:33 +00:00
Luca Haid 50fb2ca7d8 Rework dashboard 2025-01-10 11:12:33 +00:00
Luca Haid 1147cb259f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!878
2025-01-10 10:01:36 +00:00
Luca Haid c5813d9839 Rework dashboard 2025-01-10 10:01:36 +00:00
Luca Haid a504e02733 Merge branch 'rework-dashboard' into 'master'
Fixed User-Select for new Dashboard

See merge request fronk/thetool!877
2025-01-10 10:00:40 +00:00
Luca Haid c562d2e5fb Fixed User-Select for new Dashboard 2025-01-10 10:00:39 +00:00
Luca Haid fe4506bc9e Merge branch 'rework-dashboard' into 'master'
Added Graph for Orders in NewDashboard

See merge request fronk/thetool!876
2025-01-10 08:07:36 +00:00
Luca Haid 93525a5b98 Added Graph for Orders in NewDashboard 2025-01-10 09:07:18 +01:00
Luca Haid 00d000599a Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!875
2025-01-10 07:34:39 +00:00
Luca Haid 068c332710 Updated small things in new Dashboard 2025-01-10 08:33:45 +01:00
Luca Haid 447633058c Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!874
2025-01-10 07:32:27 +00:00
Luca Haid b196f4c6af Updated small things in new Dashboard 2025-01-10 08:32:10 +01:00
Luca Haid ff28bc897f Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!873
2025-01-10 07:30:24 +00:00
Luca Haid 5c893f4d3e Updated small things in new Dashboard 2025-01-10 08:28:59 +01:00
Luca Haid 4fdbebdb19 Merge branch 'rework-dashboard' into 'master'
fixed gemeinde filter for new dashboard

See merge request fronk/thetool!872
2025-01-10 07:17:47 +00:00
Luca Haid 8956ec58c6 fixed gemeinde filter for new dashboard 2025-01-10 08:17:24 +01:00
Luca Haid 39da6f2e2e Merge branch 'rework-dashboard' into 'master'
updated new dashboard

See merge request fronk/thetool!871
2025-01-09 16:16:29 +00:00
Luca Haid 32c541095a updated new dashboard 2025-01-09 17:15:40 +01:00
Luca Haid 6504908cc2 Merge branch 'rework-dashboard' into 'master'
Added new Dashboard

See merge request fronk/thetool!870
2025-01-09 15:38:59 +00:00
Luca Haid e659d54265 Added new Dashboard 2025-01-09 16:38:46 +01:00
Luca Haid 5026ec5bdd Merge branch 'rework-dashboard' into 'master'
Added new Dashboard

See merge request fronk/thetool!869
2025-01-09 15:38:06 +00:00
Luca Haid 6aa797a006 Added new Dashboard 2025-01-09 16:37:36 +01:00
Luca Haid 5b60d76bbd Merge branch 'revert-preorder' into 'master'
Reverted Filter

See merge request fronk/thetool!864
2025-01-08 10:58:15 +00:00
Luca Haid bb3b27b9b8 Reverted Filter 2025-01-08 11:57:54 +01:00
Luca Haid 91b9c994d0 Update Preorder\Index.php 2025-01-08 10:30:48 +00:00
Luca Haid aa1b54312c Revert Previous changes 2025-01-08 10:30:17 +00:00
Luca Haid 657e707abd Fixed Preorder Filter Bug 2025-01-08 10:21:04 +00:00
Luca Haid 125316234d Merge branch 'add-preorder-filter' into 'master'
Fixed Filter

See merge request fronk/thetool!863
2025-01-08 08:03:49 +00:00
Luca Haid 9e95111fad Fixed Filter 2025-01-08 09:03:33 +01:00
Luca Haid 7c97689ac3 Merge branch 'add-preorder-filter' into 'master'
Added new "Netzbesitzer" Filter inside Preorder

See merge request fronk/thetool!862
2025-01-08 07:47:01 +00:00
Luca Haid ff0ec543b3 Added new "Netzbesitzer" Filter inside Preorder 2025-01-08 08:46:12 +01:00
Luca Haid 88267b72bd Merge branch 'improve-order-request' into 'master'
implemented new features for warehouseorderrequest

See merge request fronk/thetool!857
2025-01-07 15:49:50 +00:00
Luca Haid f622204aa0 implemented new features for warehouseorderrequest 2025-01-07 16:49:20 +01:00
Luca Haid dcc18a5446 Update HistoricBillModel.php 2025-01-02 10:02:17 +00:00
Luca Haid c01308d633 Update HistoricBillModel.php 2025-01-02 09:55:48 +00:00
Luca Haid 47b8c8c62d Merge branch 'historic-bill-update' into 'master'
added 2 new columns to historicbill

See merge request fronk/thetool!852
2025-01-02 09:49:04 +00:00
Luca Haid 04bc973160 added 2 new columns to historicbill 2025-01-02 10:48:24 +01:00
Luca Haid e6e6b8b3c6 Merge branch 'reorder-preorder-filter' into 'master'
added new orderrequest module

See merge request fronk/thetool!842
2024-12-23 08:34:23 +00:00
Luca Haid 2a3ddf9a92 added new orderrequest module 2024-12-23 09:33:42 +01:00
Luca Haid 0086a705f8 Merge branch 'reorder-preorder-filter' into 'master'
reordered preorder filters

See merge request fronk/thetool!839
2024-12-20 07:38:44 +00:00