Commit Graph
3307 Commits
Author SHA1 Message Date
Luca Haid 438cd85d5f Merge branch 'ShippingNote/rework' into 'master'
Shipping note/rework

See merge request fronk/thetool!1124
2025-03-20 12:14:35 +00:00
Luca Haid d6d84088fb Shipping note/rework 2025-03-20 12:14:34 +00:00
Luca Haid 96ed8caaeb Update PreorderModel.php 2025-03-20 08:41:29 +00:00
Luca Haid 5fb3a3d789 Update PreorderModel.php 2025-03-20 08:39:08 +00:00
Luca Haid 20e1740ad5 Update PreorderModel.php 2025-03-20 08:37:39 +00:00
Daniel Spitzer 9a07c3f7e7 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1123
2025-03-19 14:18:59 +00:00
Daniel Spitzer 226bb7e4db Zeiterfassung Update
* Anpassungen der Journaleintrag Form
2025-03-19 15:16:53 +01:00
Daniel Spitzer 65866d4e11 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1122
2025-03-18 15:45:53 +00:00
Daniel Spitzer 996cb836d5 Zeiterfassung Update
* Anpassungen der Dokumente Darstellung
2025-03-18 16:25:33 +01:00
Daniel Spitzer 76b45d6441 Merge branch 'spidev' into 'master'
Kalender Bugfix

See merge request fronk/thetool!1121
2025-03-18 14:02:30 +00:00
Daniel Spitzer 00bef1098b Kalender Bugfix
* Ticketnummer und Beschreibung werden nun richtig ins Beschreibungsfeld geschrieben.
2025-03-18 15:01:15 +01:00
Luca Haid e56750c534 Update ConstructionConsentOwnerController.php 2025-03-18 11:41:17 +00:00
Luca Haid b24647539a Update User.js 2025-03-17 09:17:44 +00:00
Luca Haid 3a549046f3 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1120
2025-03-17 08:58:57 +00:00
Luca Haid 945cb9cc06 User/rework 2025-03-17 08:58:56 +00:00
Luca Haid 14854260d0 Merge branch 'User/rework' into 'master'
User/rework

See merge request fronk/thetool!1118
2025-03-17 08:56:55 +00:00
Luca Haid e28dddc2e2 User/rework 2025-03-17 08:56:54 +00:00
Daniel Spitzer 720688e346 Merge branch 'spidev' into 'master'
Zeiterfassung Fahrzeugverwaltung neue Features:

See merge request fronk/thetool!1117
2025-03-16 09:06:01 +00:00
Daniel Spitzer 3c1e864580 Zeiterfassung Fahrzeugverwaltung neue Features:
* KM-Stand History
* Journal
* Neue Felder
2025-03-16 10:05:13 +01:00
Daniel Spitzer 62c4aff842 Merge branch 'spidev' into 'master'
Zeiterfassung Fahrzeugverwaltung neue Features:

See merge request fronk/thetool!1116
2025-03-14 09:13:00 +00:00
Daniel Spitzer 7865db049b Zeiterfassung Fahrzeugverwaltung neue Features:
* KM-Stand History
* Journal
* Neue Felder
2025-03-14 10:12:36 +01:00
Daniel Spitzer 1398c8314a Merge branch 'spidev' into 'master'
Zeiterfassung Fahrzeugverwaltung neue Features:

See merge request fronk/thetool!1115
2025-03-14 09:07:43 +00:00
Daniel Spitzer c69d8b84d5 Zeiterfassung Fahrzeugverwaltung neue Features:
* KM-Stand History
* Journal
* Neue Felder
2025-03-14 10:06:47 +01:00
Daniel Spitzer 68bba152a3 Merge branch 'spidev' into 'master'
Zeiterfassung Fahrzeugverwaltung neue Features:

See merge request fronk/thetool!1114
2025-03-13 20:28:59 +00:00
Daniel Spitzer 93987b4341 Zeiterfassung Fahrzeugverwaltung neue Features:
* KM-Stand History
* Journal
* Neue Felder
2025-03-13 21:27:48 +01:00
Frank Schubert c777047ead Merge branch 'fronkdev' into 'master'
counting units again after deleting unit

See merge request fronk/thetool!1113
2025-03-13 16:24:33 +00:00
Frank Schubert 094da4e7cf counting units again after deleting unit 2025-03-13 17:23:42 +01:00
Frank Schubert 3b38ea1627 Merge branch 'fronkdev' into 'master'
preorder-detail: only showing order_date when not empty

See merge request fronk/thetool!1112
2025-03-13 11:44:25 +00:00
Frank Schubert cc0978c513 preorder-detail: only showing order_date when not empty 2025-03-13 12:43:51 +01:00
Luca Haid 128cbfe770 Update Consentform.pdf.php 2025-03-13 11:42:29 +00:00
Luca Haid 2a5b0dc371 fixed issue with errors in production 2025-03-13 08:11:47 +00:00
Frank Schubert fc9cfe0233 Merge branch 'fronkdev' into 'master'
Preorder: order_date can be changed now

See merge request fronk/thetool!1111
2025-03-12 16:11:32 +00:00
Frank Schubert 519a4e3713 Preorder: order_date can be changed now 2025-03-12 17:10:21 +01:00
Luca Haid c7185d986b Update ConstructionConsent.php 2025-03-12 14:24:04 +00:00
Luca Haid 70531717d6 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1109
2025-03-12 14:07:36 +00:00
Luca Haid e887dd9019 Construction consent/fix event 2025-03-12 14:07:36 +00:00
Frank Schubert 00aa931611 Merge branch 'fronkdev' into 'master'
Fronkdev

See merge request fronk/thetool!1107
2025-03-12 14:03:37 +00:00
Luca Haid 212c16fc5b Reverted Changes 2025-03-12 14:03:15 +00:00
Luca Haid c84e327955 Merge branch 'ConstructionConsent/fix-event' into 'master'
Construction consent/fix event

See merge request fronk/thetool!1106
2025-03-12 14:01:56 +00:00
Luca Haid 6dc7fc58fc Construction consent/fix event 2025-03-12 14:01:55 +00:00
Frank Schubert baf610ab28 Rimo Import: Now trimming certain stringified control characters from strings 2025-03-12 15:01:49 +01:00
Frank Schubert 4643661346 Removed Preorderflag debug output 2025-03-12 15:01:29 +01:00
Frank Schubert eb085ec6d4 Added address attribute rml-fibu-account 2025-03-12 13:36:59 +01:00
Frank Schubert 2d172e7336 Added address attribute rml-fibu-account 2025-03-12 13:35:36 +01:00
Luca Haid fc4d70764d Merge branch 'WarehouseOrder/fix-create' into 'master'
fixed showing spinner in tt-modal

See merge request fronk/thetool!1105
2025-03-12 10:55:20 +00:00
Luca Haid 839b3843f4 fixed showing spinner in tt-modal 2025-03-12 11:52:19 +01:00
Luca Haid fcd4f63cde Merge branch 'WarehouseOrder/fix-create' into 'master'
fixed pagination issue

See merge request fronk/thetool!1104
2025-03-11 17:01:08 +00:00
Luca Haid af8573c929 fixed pagination issue 2025-03-11 18:00:30 +01:00
Luca Haid e6fa0d049b Merge branch 'WarehouseOrder/fix-create' into 'master'
Fixed things for WarehouseOrder

See merge request fronk/thetool!1103
2025-03-11 16:47:34 +00:00
Luca Haid a6ab876bf0 Fixed things for WarehouseOrder 2025-03-11 17:47:00 +01:00