Commit Graph

4547 Commits

Author SHA1 Message Date
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
69eef1c3dc added tenant configuration 2025-09-02 15:01:14 +02: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
1a50ae953f fixed get companies 2025-09-02 13:36:45 +02: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
Daniel Spitzer
e7f86919d2 Merge branch 'spidev' into 'master'
PopRack Erweiterung LC/SC mit 96 Fasern

See merge request fronk/thetool!1700
2025-09-02 10:16:35 +00:00
Daniel Spitzer
44afda47bc PopRack Erweiterung LC/SC mit 96 Fasern 2025-09-02 12:16:04 +02: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
Daniel Spitzer
549027a67c Merge branch 'spidev' into 'master'
Spidev

See merge request fronk/thetool!1698
2025-09-02 07:28:27 +00:00
Daniel Spitzer
bdd32b31a8 Gerätetyp erweitert um Temperaturen 2025-09-02 09:27:51 +02:00
Daniel Spitzer
55066d2e6f Gerätetyp erweitert um Temperaturen 2025-09-02 09:22:59 +02:00
Daniel Spitzer
abe4de5541 Merge branch 'spidev' into 'master'
Bugfix Calender Update sync richtung MS

See merge request fronk/thetool!1697
2025-09-01 20:12:30 +00:00
Daniel Spitzer
fc23c5ce5f Bugfix Calender Update sync richtung MS
* Die Positionierung von Originalend war ungünstig. ist nun bereinigt.
2025-09-01 22:12:01 +02: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
Luca Haid
a91f5460ac Device monitoring/v2 2025-09-01 10:26:01 +00:00
Luca Haid
aac0def485 Merge branch 'WarehouseShippingNote/add-meta' into 'master'
added new calendar meta to shipping note

See merge request fronk/thetool!1692
2025-09-01 09:32:42 +00:00
Luca Haid
f2d5517b85 added new calendar meta to shipping note 2025-09-01 11:32:12 +02:00
Luca Haid
a095206e6c Added event_type to calendar response 2025-09-01 09:18:02 +00:00
Luca Haid
da2ae9d460 Added ccategory to calendar response 2025-09-01 09:07:32 +00:00
Luca Haid
b887830988 Added additional Debugging 2025-09-01 08:53:51 +00:00
Daniel Spitzer
514ac616d3 Merge branch 'spidev' into 'master'
Timerecording Bugfix Monatsauswertungsberechnung fürs Input

See merge request fronk/thetool!1691
2025-08-31 14:23:19 +00:00
Daniel Spitzer
4259f07052 Timerecording Bugfix Monatsauswertungsberechnung fürs Input
* Hab das robuster umgeschrieben damit der strtotime Bug nicht wieder geltend wird wenn es der 31te des Monats ist
2025-08-31 16:21:25 +02:00
Daniel Spitzer
0c11e68902 Merge branch 'spidev' into 'master'
Pop Update

See merge request fronk/thetool!1690
2025-08-29 13:50:39 +00:00
Daniel Spitzer
a6fead57e9 Pop Update
* Update Device Verlinkung im Pop
2025-08-29 15:50:10 +02:00
Luca Haid
512d58bb5c Merge branch 'RMLWorkorder/add-new-fields' into 'master'
added new fields

See merge request fronk/thetool!1689
2025-08-29 10:30:23 +00:00
1a5f7bfa2d added new fields 2025-08-29 12:30:14 +02:00
Frank Schubert
ebc6183779 Merge branch 'fronkdev' into 'master'
Added tooltip to campaign count in PreorderProductPrice history list

See merge request fronk/thetool!1688
2025-08-28 15:29:46 +00:00
Frank Schubert
96278553f0 Added tooltip to campaign count in PreorderProductPrice history list 2025-08-28 17:29:09 +02:00
Daniel Spitzer
18a2bd632b Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1687
2025-08-28 08:37:24 +00:00
Daniel Spitzer
8cd33dc97c Kalender Update
* Update Tagestermin sollten nun sauber funktionieren und vorgerendert werden
2025-08-28 10:30:18 +02:00
Daniel Spitzer
7d047c345e Merge branch 'spidev' into 'master'
Pop Update

See merge request fronk/thetool!1686
2025-08-27 10:54:31 +00:00
Daniel Spitzer
75e9ac6dbb Pop Update
* Rückseite der Pop-Racks können nun auch mit HEs bestückt werden
2025-08-27 12:54:09 +02:00
Luca Haid
53d218d9a4 Merge branch 'RMLWorkorder/multi-tenant' into 'master'
improved ipam

See merge request fronk/thetool!1685
2025-08-26 15:25:38 +00:00
4e2bb1c589 improved ipam 2025-08-26 17:25:04 +02:00
Luca Haid
1e684a88df Merge branch 'RMLWorkorder/multi-tenant' into 'master'
improved ipam

See merge request fronk/thetool!1684
2025-08-26 15:19:20 +00:00