Commit Graph

1409 Commits

Author SHA1 Message Date
Daniel Spitzer
bb6b9b464c Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1037
2025-02-18 17:51:17 +00:00
Daniel Spitzer
4b2613653f Kalender Update
* Tinymce für Beschreibungsfeld eingebaut
2025-02-18 18:50:43 +01:00
Daniel Spitzer
e0252a060e Merge branch 'spidev' into 'master'
Kalender Update

See merge request fronk/thetool!1036
2025-02-18 17:47:38 +00:00
Daniel Spitzer
e08fd59e83 Kalender Update
* Tinymce für Beschreibungsfeld eingebaut
2025-02-18 18:44:55 +01:00
Luca Haid
bf5bc71e24 Added Stats inside ConstructionConsent 2025-02-17 12:55:59 +01:00
Frank Schubert
ee5b11773e can delete Consent plan file / added empty page in Consentform.pdf 2025-02-14 18:02:16 +01:00
Frank Schubert
7575ef05fb added ConstructionConsentController::deleteAction() 2025-02-14 16:19:05 +01:00
Frank Schubert
61b192e1c9 Merge branch 'master' into 'fronkdev'
# Conflicts:
#   Layout/default/ConstructionConsent/Form.php
2025-02-14 14:46:24 +00:00
Frank Schubert
7c0ab4e45d Made file pastable in ConstructionConsent/Form 2025-02-14 15:45:04 +01:00
Luca Haid
f89a2c7ea3 Added ConstructionConsentProject to preorderfront if address is correct 2025-02-14 11:51:45 +00:00
Daniel Spitzer
96f629a2b1 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!1027
2025-02-14 11:32:38 +00:00
Daniel Spitzer
d0404f515d Zeiterfassung Update
* Gesammtsumme bei Admin Only Mitarbeitern einfeführt
2025-02-14 12:30:21 +01:00
Frank Schubert
6d50b1fcbb Merge branch 'fronkdev' into 'master'
ConstructionConsent: added birthdate

See merge request fronk/thetool!1025
2025-02-13 15:36:58 +00:00
Frank Schubert
1bc7b47b4f ConstructionConsent: added birthdate 2025-02-13 16:36:25 +01:00
Frank Schubert
be5aff4178 Merge branch 'fronkdev' into 'master'
Added toppage to ConstructionConsent PDF

See merge request fronk/thetool!1024
2025-02-13 15:13:20 +00:00
Frank Schubert
2acebb99af Added toppage to ConstructionConsent PDF 2025-02-13 16:12:49 +01:00
Frank Schubert
2945870dda Merge branch 'fronkdev' into 'master'
ConstructionConsent/View: setting owner status returned when result accepted or

See merge request fronk/thetool!1023
2025-02-13 14:24:48 +00:00
Frank Schubert
3e26ea5dff ConstructionConsent/View: setting owner status returned when result accepted or
denied
2025-02-13 15:23:45 +01:00
Frank Schubert
3ed34a8aab Merge branch 'fronkdev' into 'master'
ConstructionConsent Changes

See merge request fronk/thetool!1022
2025-02-13 13:36:53 +00:00
Frank Schubert
ea9e91e6ab ConstructionConsent Changes 2025-02-13 14:35:57 +01:00
Luca Haid
7c5045812f Merge branch 'construction-consent-add-popover' into 'master'
Added Popover to Inform Users

See merge request fronk/thetool!1021
2025-02-13 11:48:32 +00:00
Luca Haid
9e513dfb35 Added Popover to Inform Users 2025-02-13 12:47:54 +01:00
Luca Haid
c3e1af6649 Merge branch 'improve-warehouse' into 'master'
Allowed ingena for cons consent

See merge request fronk/thetool!1018
2025-02-13 11:10:04 +00:00
Luca Haid
8f20ce39d6 Allowed ingena for cons consent 2025-02-13 12:09:35 +01:00
Luca Haid
1661469d06 Merge branch 'improve-warehouse' into 'master'
Updated Warehouse

See merge request fronk/thetool!1017
2025-02-13 10:57:41 +00:00
Luca Haid
c8d11661d0 Updated Warehouse 2025-02-13 11:56:27 +01:00
Luca Haid
bbe841875e Added gstnr to ConstructionConsent/Index 2025-02-13 08:19:54 +00:00
Luca Haid
2159035675 Added gstnr to ConstructionConsent/Index 2025-02-13 08:18:55 +00:00
Daniel Spitzer
5e8ec1d07d Kalender Bugfix
* Ab und zu passiert es das Kalendereinträge doppelt angezeigt werden. Es gab eine überschneidung mit den Event id -> gefixt
2025-02-12 18:19:20 +01:00
Frank Schubert
0dc103887e Merge branch 'master' into fronkdev 2025-02-11 14:32:51 +01:00
Frank Schubert
b5124f3dab ConstructionConsentProject: Added company permissions 2025-02-11 14:32:02 +01:00
Frank Schubert
def9c94c25 Merge branch 'fronkdev' into 'master'
new OAID type "other" / added adrcd to preorderreporting api

See merge request fronk/thetool!1006
2025-02-10 15:12:17 +00:00
Frank Schubert
5a1c07882b new OAID type "other" / added adrcd to preorderreporting api 2025-02-10 16:11:12 +01:00
Frank Schubert
8ce7bcc6de Merge branch 'fronkdev' into 'master'
Now listing creator and editor in Building/Index

See merge request fronk/thetool!1004
2025-02-07 13:09:16 +00:00
Frank Schubert
fd9367bd8d Now listing creator and editor in Building/Index 2025-02-07 14:08:37 +01:00
Daniel Spitzer
f4408c3458 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!1003
2025-02-07 11:29:39 +00:00
Daniel Spitzer
c38a9919b6 Zeiterfassung
* Feature Implementation Arbeitszeitänderungen mit History für alle möglichen historischen Berechnungen und Auswertung
 * neue Migration
2025-02-07 12:27:19 +01:00
Frank Schubert
276ef38089 Merge branch 'fronkdev' into 'master'
Everyone can create Workorders for Preorders now

See merge request fronk/thetool!1001
2025-02-06 13:44:29 +00:00
Frank Schubert
3715e81419 Everyone can create Workorders for Preorders now 2025-02-06 14:12:37 +01:00
Luca Haid
814e2e88e3 Merge branch 'preorder-improve-map' into 'master'
Added Tickets View for Customers

See merge request fronk/thetool!999
2025-02-06 10:24:32 +00:00
Luca Haid
b1521f8af8 Added Tickets View for Customers 2025-02-06 11:03:49 +01:00
Luca Haid
eb526280b0 Merge branch 'preorder-improve-map' into 'master'
Added Preorder View Url inside the Map

See merge request fronk/thetool!995
2025-02-05 14:35:38 +00:00
Luca Haid
1f317de7a2 Added Preorder View Url inside the Map 2025-02-05 15:35:00 +01:00
Frank Schubert
ab2067ac10 Merge branch 'fronkdev' into 'master'
everyone can create/delete workorders now in Preorder

See merge request fronk/thetool!992
2025-02-05 12:49:41 +00:00
Frank Schubert
30902fc094 everyone can create/delete workorders now in Preorder 2025-02-05 13:48:37 +01:00
Luca Haid
04a31770ed Updated ConstructionConsent Permissions 2025-02-05 09:35:34 +01:00
Luca Haid
c1f63a21c9 Merge branch 'change-device-permissions' into 'master'
Updated Warehouse

See merge request fronk/thetool!988
2025-02-04 18:06:56 +00:00
Luca Haid
7c8af7aed4 Updated Warehouse 2025-02-04 19:06:08 +01:00
Luca Haid
588a872e4b Changed FIBU Filter Header 2025-02-04 18:03:19 +00:00
Daniel Spitzer
b202e3a57f Devices Update
* Berechtigungen devices für Netzgebietzuordnungen
2025-02-04 16:35:19 +01:00