Commit Graph

4272 Commits

Author SHA1 Message Date
Luca Haid
cea9f6458a Merge branch 'Preorder/add-new-billed-field' into 'master'
fixed billed

See merge request fronk/thetool!1514
2025-07-03 10:35:34 +00:00
Luca Haid
aff32b1477 fixed billed 2025-07-03 12:35:22 +02:00
Luca Haid
7130f24000 Merge branch 'Preorder/add-new-billed-field' into 'master'
added filter for sended emails

See merge request fronk/thetool!1513
2025-07-03 10:30:28 +00:00
Luca Haid
f3414f56a7 added filter for sended emails 2025-07-03 12:30:06 +02:00
Luca Haid
e1a8fb9eb6 Merge branch 'Preorder/add-new-billed-field' into 'master'
added filter for sended emails

See merge request fronk/thetool!1512
2025-07-03 10:02:39 +00:00
Luca Haid
72858d3eb3 added filter for sended emails 2025-07-03 12:00:36 +02:00
Luca Haid
4bec93b14e Update Index.php 2025-07-01 10:44:58 +00:00
Luca Haid
5fe32c003d Merge branch 'CpeProvisioning/fix-snopp-button' into 'master'
fixed snopp button

See merge request fronk/thetool!1511
2025-07-01 10:25:31 +00:00
Luca Haid
8b348fc0be fixed snopp button 2025-07-01 12:25:20 +02:00
Luca Haid
0b42c1b830 Merge branch 'AssetManagement/add-search' into 'master'
added new search

See merge request fronk/thetool!1510
2025-07-01 09:11:47 +00:00
Luca Haid
be6f477bbe added new search 2025-07-01 11:11:37 +02:00
Luca Haid
85943a55f5 Merge branch 'ConstructionConsent/add-name-to-signature-line' into 'master'
added name above signature description

See merge request fronk/thetool!1509
2025-06-30 12:02:22 +00:00
Luca Haid
3e5b2d4c41 added name above signature description 2025-06-30 14:02:12 +02:00
Luca Haid
895bc9c25a Merge branch 'ConstructionConsent/add-name-to-signature-line' into 'master'
added name above signature description

See merge request fronk/thetool!1508
2025-06-30 10:46:42 +00:00
Luca Haid
e34a10f11e added name above signature description 2025-06-30 12:46:17 +02:00
Luca Haid
c676e4cb80 Merge branch 'WarehouseShippingNote/fix-kilometer-calculation' into 'master'
fixed kilometer calculation

See merge request fronk/thetool!1507
2025-06-30 09:37:33 +00:00
Luca Haid
a3eac7b212 fixed kilometer calculation 2025-06-30 11:37:18 +02:00
Luca Haid
249b646025 Merge branch 'AssetManagement/fix-last-bugs' into 'master'
fixed last features missing

See merge request fronk/thetool!1506
2025-06-30 09:24:16 +00:00
Luca Haid
adcedc4a75 fixed last features missing 2025-06-30 11:24:08 +02:00
Luca Haid
ce3fa62ec6 Merge branch 'Device/improve-monitoring' into 'master'
added new features for monitoring

See merge request fronk/thetool!1505
2025-06-30 08:27:26 +00:00
Luca Haid
378b64748c added new features for monitoring 2025-06-30 10:26:36 +02:00
Luca Haid
833bbff2d2 Merge branch 'TTCrud/fix-session-blocking' into 'master'
fixed issue when doing multiple request add a time (only fixed for ttcrud modules)

See merge request fronk/thetool!1504
2025-06-29 18:50:40 +00:00
Luca Haid
6b571dee86 fixed issue when doing multiple request add a time (only fixed for ttcrud modules) 2025-06-29 20:50:30 +02:00
Luca Haid
6e621ba22f Merge branch 'Device/add-monitoring' into 'master'
added zabbix integration for statistics

See merge request fronk/thetool!1503
2025-06-29 18:34:02 +00:00
Luca Haid
4c25455ee7 added zabbix integration for statistics 2025-06-29 20:33:54 +02:00
Luca Haid
c7a759b4cc Merge branch 'RMLWorkorder/create' into 'master'
added new module rml-workorder

See merge request fronk/thetool!1502
2025-06-29 18:32:42 +00:00
Luca Haid
c629c9d38b added new module rml-workorder 2025-06-29 20:32:28 +02:00
Luca Haid
8d4e12e441 Merge branch 'AssetManagement/fix-last-bugs' into 'master'
Asset management/fix last bugs

See merge request fronk/thetool!1501
2025-06-29 10:43:06 +00:00
Luca Haid
dffd2698bd Asset management/fix last bugs 2025-06-29 10:43:06 +00:00
Luca Haid
4e18891afc Merge branch 'AssetManagement/add-new-features2' into 'master'
added new stuff for asset management

See merge request fronk/thetool!1500
2025-06-27 08:49:33 +00:00
Luca Haid
fe73aa22ab added new stuff for asset management 2025-06-27 10:48:32 +02:00
Daniel Spitzer
62956e1539 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1499
2025-06-27 07:22:42 +00:00
Daniel Spitzer
6ae084f291 Zeiterfassung
* Anpassungen Urlaubsanzeige bei Arbeitszeitänderungen
2025-06-27 09:22:06 +02:00
Luca Haid
44f6fe97f5 Merge branch 'AssetManagement/add-new-features' into 'master'
added new features for asset mgmt

See merge request fronk/thetool!1498
2025-06-26 13:24:12 +00:00
Luca Haid
b0d7d4aeeb added new features for asset mgmt 2025-06-26 15:23:57 +02:00
Luca Haid
97f8a625e4 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
temp fix for showcase

See merge request fronk/thetool!1497
2025-06-26 12:50:26 +00:00
Luca Haid
6bf27c7fe9 temp fix for showcase 2025-06-26 14:50:15 +02:00
Luca Haid
4b74bd2814 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
added new asset management poc

See merge request fronk/thetool!1496
2025-06-26 11:46:59 +00:00
Luca Haid
700f4030ec added new asset management poc 2025-06-26 13:46:46 +02:00
Luca Haid
7f5a9695d9 Merge branch 'PreorderIFrame/fix-numbers' into 'master'
fixed numbers

See merge request fronk/thetool!1495
2025-06-26 11:12:55 +00:00
Luca Haid
32f3a2afe3 fixed numbers 2025-06-26 13:12:45 +02:00
Luca Haid
f21994c4b3 Merge branch 'Cpeprovisioning/add-snopp-button' into 'master'
added new snopp button

See merge request fronk/thetool!1494
2025-06-26 08:45:28 +00:00
Luca Haid
7bfa01de3c added new snopp button 2025-06-26 10:41:28 +02:00
Daniel Spitzer
45929a587d Merge branch 'spidev' into 'master'
Linework Import Script

See merge request fronk/thetool!1493
2025-06-25 18:34:53 +00:00
Daniel Spitzer
7552fe0ab1 Linework Import Script 2025-06-25 20:34:28 +02:00
Daniel Spitzer
46bb19c2ed Merge branch 'spidev' into 'master'
Linework Import Script

See merge request fronk/thetool!1492
2025-06-25 18:14:59 +00:00
Daniel Spitzer
a4993a6ffc Linework Import Script 2025-06-25 20:14:42 +02:00
Frank Schubert
fd0d887268 Merge branch 'fronkdev' into 'master'
Added activation_billing (Nachverrechnen) in PreorderBilling

See merge request fronk/thetool!1491
2025-06-25 14:54:43 +00:00
Frank Schubert
aa9ffb090e Added activation_billing (Nachverrechnen) in PreorderBilling 2025-06-25 16:53:47 +02:00
Luca Haid
dc80552ec7 Merge branch 'Preorder/iframe-revision-2' into 'master'
updated new iframe

See merge request fronk/thetool!1490
2025-06-24 15:20:11 +00:00