Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,753 Commits 7 Branches 0 Tags
ae975a5540299c577fe61fa319a607fc9ec8b0bf
Commit Graph

908 Commits

Author SHA1 Message Date
Frank Schubert
e72b2bff46 Merge branch 'fronkdev' into 'master' 
Added fields to preorder exports

See merge request fronk/thetool!405
 2024-06-20 13:52:16 +00:00
Frank Schubert
877e1e0ebe Added fields to preorder exports 2024-06-20 15:51:44 +02:00
Frank Schubert
c5ca6ee94f Merge branch 'fronkdev' into 'master' 
AdressDB visibility filter & not importing canceled buildings

See merge request fronk/thetool!404
 2024-06-20 11:35:25 +00:00
Frank Schubert
49880ede42 AdressDB visibility filter & not importing canceled buildings 2024-06-18 14:29:39 +02:00
Frank Schubert
b6915fc3ed Merge branch 'fronkdev' into 'master' 
Preorder admin Update OAID From Unit now always updates oaid object

See merge request fronk/thetool!402
 2024-06-12 12:43:57 +00:00
Luca Haid
cc5b1f936c Merge branch 'bugfix/linework-view-overflow-2' into 'master' 
Fixed Overflow Issue

See merge request fronk/thetool!401
 2024-06-12 08:12:17 +00:00
Luca Haid
50622fa6e9 Fixed Overflow Issue 2024-06-12 10:11:46 +02:00
Luca Haid
e06a5e841c Merge branch 'bugfix/linework-view-overflow' into 'master' 
Fixed Overflow Issue

See merge request fronk/thetool!400
 2024-06-12 08:09:08 +00:00
Luca Haid
acd6ff1841 Fixed Overflow Issue 2024-06-12 10:08:32 +02:00
Frank Schubert
8968f6beb1 WIP Contract 2024-06-11 2024-06-11 18:14:41 +02:00
Frank Schubert
620288768c Merge branch 'fronkdev' into 'master' 
Preorderfrontdesk can use all filters

See merge request fronk/thetool!399
 2024-06-11 12:11:35 +00:00
Frank Schubert
85acab876e Preorderfrontdesk can use all filters 2024-06-11 14:09:06 +02:00
Luca Haid
9adb4dc44b Fixed Issue when creating a Pop from /Network with network_id that the network is not selected 2024-06-11 12:14:27 +02:00
Frank Schubert
d08ae078c6 Merge branch 'fronkdev' into 'master' 
Preorder Workorder Filters not visible for everyone

See merge request fronk/thetool!394
 2024-06-06 13:42:31 +00:00
Frank Schubert
aca45c1064 Preorder Workorder Filters not visible for everyone 2024-06-06 15:41:16 +02:00
Frank Schubert
ef5c8e3ee1 Merge branch 'fronkdev' into 'master' 
Checking permissions in status- & discount import

See merge request fronk/thetool!393
 2024-06-04 16:42:44 +00:00
Frank Schubert
2855a45208 Checking permissions in status- & discount import 2024-06-04 18:41:42 +02:00
Frank Schubert
004d173c50 Merge branch 'fronkdev' into 'master' 
Added Preorder discount code import and statusupdate import

See merge request fronk/thetool!392
 2024-06-04 16:10:20 +00:00
Frank Schubert
ce3e8f07e6 Added Preorder discount code import and statusupdate import 2024-06-04 18:09:01 +02:00
Daniel Spitzer
a4fbcad6fc Zeiterfassung Update 
* Fixed Header fix in Verrechnung
 2024-06-03 11:04:51 +02:00
Luca Haid
a66d6bf776 Reworked Pop Table View 2024-05-28 10:58:20 +02:00
Luca Haid
e1cf5d5d9e Reworked Device Module and Vue Components 2024-05-28 09:12:13 +02:00
Luca Haid
fa3c1b8766 Reworked Device Table and added table features 2024-05-27 18:07:30 +02:00
Spi
54ad11207f Zeiterfassung Update 
* Fixed Header bei Auswertung und Verrechnung
 2024-05-21 15:54:14 +02:00
Daniel Spitzer
3e82ec1749 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!372
 2024-05-16 17:13:07 +00:00
Spi
e983cc563e Zeiterfassung Update 
* Kalender Heute Anzeige verbesserte Sichtbarkeit
 2024-05-16 19:12:41 +02:00
Daniel Spitzer
4f8b17330b Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!371
 2024-05-16 16:58:51 +00:00
Spi
f320882e9d Zeiterfassung Update 
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
 * Kalender Heute Anzeige verbesserte Sichtbarkeit
 2024-05-16 18:57:14 +02:00
Frank Schubert
88349c6988 Merge branch 'fronkdev' into 'master' 
Added preorder export api (for specific user)

See merge request fronk/thetool!370
 2024-05-16 14:45:31 +00:00
Frank Schubert
630e618733 Added preorder export api (for specific user) 2024-05-16 16:44:49 +02:00
Frank Schubert
84e49f2774 Merge branch 'fronkdev' into 'master' 
ADB: Added stiege as part of Hausnummer

See merge request fronk/thetool!369
 2024-05-16 13:48:26 +00:00
Frank Schubert
29459e9cca ADB: Added stiege as part of Hausnummer 2024-05-16 15:47:41 +02:00
Spi
1b5c481442 Zeiterfassung Update 
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
 * Kalender Heute Anzeige verbesserte Sichtbarkeit
 2024-05-16 15:12:56 +02:00
Daniel Spitzer
eb2a84cf07 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!368
 2024-05-16 12:55:47 +00:00
Spi
4d08114918 Zeiterfassung Update 
* Transfer Überstunden50/100,Mehrstunden20 zurück in Gutstunden/Mehrstunden
 * Textuelle Anzeige von transferierten Stunden
 * Kalender Anzeige verbesserungen
 * Offene Krankenstände werden virtuell 2 Wochen in die Zukunft angezeit im Kalender
 2024-05-16 14:51:45 +02:00
Luca Haid
78c9d3ef37 Feature/rework vue schema 2024-05-10 21:03:01 +00:00
Frank Schubert
ca21dd0d26 Including fa-sharp icons 2024-05-08 15:18:07 +02:00
Frank Schubert
54b27e0b7a Merge branch 'fronkdev' into 'master' 
New Dobl-Zwaring Order Import

See merge request fronk/thetool!359
 2024-05-08 13:06:49 +00:00
Luca Haid
58e124a461 Updated TheTool Frontend Framework & Table 2024-05-08 12:54:26 +00:00
Frank Schubert
4b52599209 WIP Contract 2024-05-06 2024-05-07 16:31:01 +02:00
Daniel Spitzer
b4edd8fa24 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!356
 2024-05-07 14:02:07 +00:00
Spi
1294281b3d Zeiterfassung Update 
* Fix für BPA stunden Rückgängig
 2024-05-07 16:00:21 +02:00
Daniel Spitzer
749d0dac6a Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!355
 2024-05-07 12:12:01 +00:00
Spi
a7bc1ff8a6 Zeiterfassung Update 
* ZA Anzeige beim genehmigen gefixt
 2024-05-07 14:11:34 +02:00
Spi
ba8d96b231 Zeiterfassung Update 
* ZA Anzeige beim genehmigen gefixt
 2024-05-07 14:09:59 +02:00
Daniel Spitzer
ad02a275d3 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!354
 2024-05-07 08:26:26 +00:00
Spi
2f81e1d77e Zeiterfassung Update 
* Berechnungen BP
 * Möglichkeit Mehrstunden in Gutstunden umzuwandeln
 2024-05-07 10:24:30 +02:00
Daniel Spitzer
e182fa09d3 Merge branch 'spidev' into 'master' 
Zeiterfassung Update

See merge request fronk/thetool!352
 2024-05-07 06:54:41 +00:00
Spi
fe1a3e7948 Zeiterfassung Update 
* Berechnungen BP
 * Möglichkeit Mehrstunden in Gutstunden umzuwandeln
 2024-05-07 08:53:19 +02:00
Frank Schubert
6002876343 WIP Ivt Import 2024-05-02 2024-05-06 13:24:25 +02:00