Commit Graph

3330 Commits

Author SHA1 Message Date
Frank Schubert
40f92c3b7c Preorder Billing Marketshare Price + RML layout tweaks 2025-03-24 18:37:33 +01:00
Frank Schubert
97c7a1dde5 added CSV file generation for RML Billing 2025-03-22 18:23:28 +01:00
Frank Schubert
5ff67da367 RML Invoice Layout Tweaks 2025-03-22 17:31:37 +01:00
Frank Schubert
5c04e35d90 RML Invoice Layout tweaks 2025-03-22 16:47:57 +01:00
Frank Schubert
217b19026e WIP PreorderBilling 2025-03-22 2025-03-22 14:50:08 +01:00
Luca Haid
aebb463b74 Merge branch 'WarehouseShippingNote/add-viewer-mode' into 'master'
Added viewer mode

See merge request fronk/thetool!1131
2025-03-21 11:12:31 +00:00
Luca Haid
5b8441dde1 Added viewer mode 2025-03-21 12:08:03 +01:00
Luca Haid
b8649a77e2 Fixed Ingena Permission 2025-03-21 10:14:11 +00:00
Luca Haid
2dc3509ff7 Fixed position-manager 2025-03-21 09:30:26 +00:00
Luca Haid
ff01974efa Merge branch 'WarehouseShippingNote/remove-console-log' into 'master'
Removed Console Logs

See merge request fronk/thetool!1130
2025-03-21 08:11:44 +00:00
Luca Haid
e319f2bf10 Removed Console Logs 2025-03-21 09:11:10 +01:00
Luca Haid
36a1519ff6 Merge branch 'WarehouseShippingNote/fix-hour-entry' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1129
2025-03-21 08:02:25 +00:00
Luca Haid
027338f93d Updated Shipping Note 2025-03-21 09:01:47 +01:00
Frank Schubert
c3794beceb Merge branch 'fronkdev' into 'master'
ADB addresses can be deleted now

See merge request fronk/thetool!1128
2025-03-20 19:00:00 +00:00
Frank Schubert
0a1c1de44b ADB addresses can be deleted now 2025-03-20 19:59:18 +01:00
Frank Schubert
2d19758313 Merge branch 'fronkdev' into 'master'
PreorderBilling WIP & Api changed

See merge request fronk/thetool!1127
2025-03-20 15:03:17 +00:00
Frank Schubert
9353591421 PreorderBilling WIP & Api changed 2025-03-20 16:02:05 +01:00
Luca Haid
88ddd21098 Merge branch 'WarehouseShippingNote/add-customer-search' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1126
2025-03-20 13:49:14 +00:00
Luca Haid
d9a2ba1ef4 Updated Shipping Note 2025-03-20 14:48:54 +01:00
Luca Haid
3f8be39626 Merge branch 'WarehouseShippingNote/add-loader' into 'master'
Updated Shipping Note

See merge request fronk/thetool!1125
2025-03-20 13:18:57 +00:00
Luca Haid
b293167527 Updated Shipping Note 2025-03-20 14:09:23 +01:00
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
Frank Schubert
2a7e7f1724 WIP 2025-03-17 RML Billing 2025-03-18 02:10:53 +01:00
Frank Schubert
361fc5ee9a WIP 2025-03-14 Preorder Billing 2025-03-17 12:22:03 +01: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