Commit Graph

1803 Commits

Author SHA1 Message Date
Frank Schubert
e49d47ed7d Tweaks to Ivt Import 2024-07-07 21:08:32 +02:00
Frank Schubert
0913f367ec Tweaks to IVT Import 2024-07-07 18:03:33 +02:00
Frank Schubert
3a0ebb3bf4 removed debugging 2024-07-07 16:48:41 +02:00
Frank Schubert
5bb0f1978c small changes to invoice & removed debugging 2024-07-07 16:10:39 +02:00
Frank Schubert
dde832d6a8 Fixed billing-fibu-data migration 2024-07-07 15:02:04 +02:00
Frank Schubert
02d50ab835 Invoice optival change & Voicenumber billing fix 2024-07-07 14:57:41 +02:00
Frank Schubert
564d5c53b5 Billing / generation of Invoices finished 2024-07-07 12:04:51 +02:00
Frank Schubert
f83ef19e8d Merge branch 'feature/invoice-print' 2024-07-06 19:44:11 +02:00
51774a62fb added missing xinon logo 2024-07-06 19:35:27 +02:00
Frank Schubert
c6f6d96d37 Merge branch 'feature/invoice-print' 2024-07-06 19:20:22 +02:00
e627dd847a added missing PDF_HEADER file 2024-07-06 19:18:24 +02:00
Frank Schubert
47ce22bbfa Merge branch 'fronkdev' into 'master'
WIP Contract/Billing/Voicenumberbilling

See merge request fronk/thetool!424
2024-07-06 16:40:44 +00:00
Frank Schubert
f6a04247f5 Merge branch 'master' into fronkdev 2024-07-06 18:38:54 +02:00
Frank Schubert
200af4802a WIP Voicenumber Billing 2024-07-05 2024-07-06 18:37:40 +02:00
91938a0987 implemented first version of invoice printing 2024-07-05 13:10:56 +02:00
Daniel Spitzer
bd62f65078 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!422
2024-07-05 09:50:52 +00:00
Daniel Spitzer
7e65c7929c Zeiterfassung
* Fix Aktiv/Inaktiv Anzeige bei der Personaladministration
2024-07-05 11:50:27 +02:00
Daniel Spitzer
7101c557f4 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!421
2024-07-05 09:46:20 +00:00
Daniel Spitzer
ed99a4a0ca Zeiterfassung
* Umbau auf fixed Header aller Sites
 * $git_merge_ts eingebaut
2024-07-05 11:40:36 +02:00
Daniel Spitzer
ba7cfeaab7 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!420
2024-07-05 08:55:03 +00:00
Daniel Spitzer
2b7744bd20 Zeiterfassung
* Fix 0 Tage Urlaubsanzeige Verrechnung abgeschlossen/Verrechnungs Monatsübersicht
 * Umbau Personaladministration für Conny
 * $git_merge_ts eingebaut
2024-07-05 10:53:35 +02:00
Frank Schubert
92edb9c812 WIP Contract/Billing 2024-07-04 2024-07-05 10:45:22 +02:00
Daniel Spitzer
a4326ae390 Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!419
2024-07-05 07:06:55 +00:00
Daniel Spitzer
3d10967292 Zeiterfassung
* Fix für Workaround Urlaubsminderung
2024-07-05 09:03:00 +02:00
Luca Haid
73ee527fd1 Merge branch 'bugfix/voice-call-active-not-displaying-entries' into 'master'
fixed VoiceCallActive not displaying entries that get sent by the API

See merge request fronk/thetool!418
2024-07-05 05:21:04 +00:00
79e8cda5e5 fixed VoiceCallActive not displaying entries that get sent by the API 2024-07-05 07:13:45 +02:00
Frank Schubert
c2923128a9 Merge branch 'fronkdev' into 'master'
Removed sql debug logging in Preorder API

See merge request fronk/thetool!417
2024-07-04 19:16:25 +00:00
Frank Schubert
0640babfa3 Removed sql debug logging in Preorder API 2024-07-04 21:15:49 +02:00
Frank Schubert
02ac6ff134 Merge branch 'fronkdev' into 'master'
Added contract_id to Voicecallhistory

See merge request fronk/thetool!416
2024-07-04 19:06:37 +00:00
Frank Schubert
bb49f6e588 Added contract_id to Voicecallhistory 2024-07-04 21:05:57 +02:00
Daniel Spitzer
916e57d46e Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!415
2024-07-03 09:27:55 +00:00
Daniel Spitzer
3e3e850e7c Zeiterfassung
* Workaround Urlaubsminderung (nur Temporär)
2024-07-03 11:27:09 +02:00
Frank Schubert
6da0d4e502 Merge branch 'fronkdev' into 'master'
WIP Billing/Invoice 02.06.2024

See merge request fronk/thetool!414
2024-07-02 14:53:46 +00:00
Frank Schubert
76cffdc374 WIP Billing/Invoice 02.06.2024 2024-07-02 16:52:37 +02:00
Frank Schubert
c004891718 Merge branch 'fronkdev' into 'master'
Importing and showing Rimo Building and Home Status

See merge request fronk/thetool!413
2024-07-01 10:25:08 +00:00
Frank Schubert
350815f41a Importing and showing Rimo Building and Home Status 2024-07-01 12:23:29 +02:00
Frank Schubert
ae298a0665 WIP Contract/Billing/Invoice 2024-06-28 2024-07-01 11:44:19 +02:00
Daniel Spitzer
d44c6fd7a8 Merge branch 'spidev' into 'master'
Faserplanung

See merge request fronk/thetool!412
2024-06-30 12:28:31 +00:00
Daniel Spitzer
edae9b9061 Faserplanung
* Kabelverzeichnis Updates
2024-06-30 14:26:57 +02:00
Daniel Spitzer
0f5711ede0 Merge branch 'spidev' into 'master'
Faserplanung

See merge request fronk/thetool!411
2024-06-30 10:10:47 +00:00
Daniel Spitzer
f3a17c8e65 Faserplanung
* Menüpunkt Kabelverzeichnis Anpassung
2024-06-30 12:09:44 +02:00
Daniel Spitzer
932df7f1c7 Merge branch 'spidev' into 'master'
Faserplanung (Vorbereitung für Kabelverschaltung)

See merge request fronk/thetool!410
2024-06-30 10:04:20 +00:00
Daniel Spitzer
1554d6cf72 Faserplanung Vorbereitung für Kabelverschaltung
* Menüpunkt Kabelverschaltung hinzugefügt
 * Initialfiles für Kabelverschaltung
2024-06-30 12:01:56 +02:00
Daniel Spitzer
7a03d21e59 Merge branch 'spidev' into 'master'
Zeiterfassung Update

See merge request fronk/thetool!409
2024-06-25 12:54:50 +00:00
Daniel Spitzer
dc94204b9c Zeiterfassung Update
* Calenderupdate Sterbefall
2024-06-25 14:53:28 +02:00
Frank Schubert
3c4e8860f4 Merge branch 'fronkdev' into 'master'
Fix PreorderDiscount typo

See merge request fronk/thetool!408
2024-06-25 11:14:57 +00:00
Frank Schubert
4589e61ab8 WIP Contract/Billing 2024-06-24 2024-06-25 12:19:35 +02:00
Daniel Spitzer
ae975a5540 Merge branch 'spidev' into 'master'
Faserplanung

See merge request fronk/thetool!407
2024-06-24 13:09:18 +00:00
Daniel Spitzer
9904bb9f50 Faserplanung
* Migrationsvorbereitung für Kabelplanung
2024-06-24 15:07:45 +02:00
Frank Schubert
da52a802ef WIP Contract/Billing 2024-06-20 2024-06-21 12:10:04 +02:00