Commit Graph

956 Commits

Author SHA1 Message Date
Frank Schubert
df5c8746cf Merge branch 'fronkdev' into 'master'
Billing/Index Sums

See merge request fronk/thetool!452
2024-07-08 19:27:49 +00:00
Frank Schubert
cbb0c24629 Billing/Index Sums 2024-07-08 21:27:27 +02:00
Daniel Spitzer
5f8c23a912 Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix

See merge request fronk/thetool!451
2024-07-08 19:22:21 +00:00
Daniel Spitzer
c3af1b7374 Zeiterfassung Bugfix
* Typo Fehler bei JS include behoben
2024-07-08 21:21:55 +02:00
Frank Schubert
daa2feb312 Merge branch 'fronkdev' into 'master'
Added Sums in Billing/Index

See merge request fronk/thetool!449
2024-07-08 19:11:51 +00:00
Frank Schubert
ac1d2772ef Added Sums in Billing/Index 2024-07-08 21:11:11 +02:00
Daniel Spitzer
1bc75231c9 Merge branch 'spidev' into 'master'
Faserplanung Update

See merge request fronk/thetool!448
2024-07-08 19:03:47 +00:00
Daniel Spitzer
8d74d30fba Faserplanung Update
* Umbau Rohrverzeichnis auf Ajax Table
 * Auslagerung der JS vom Rohrverzeichnis in eigene Datei
2024-07-08 21:03:13 +02:00
Daniel Spitzer
aeb4e9a2bf Merge branch 'spidev' into 'master'
Zeiterfassung Update/Bugfixes

See merge request fronk/thetool!447
2024-07-08 18:45:43 +00:00
Daniel Spitzer
3a3269a677 Zeiterfassung Update/Bugfixes
* 0 Urlaubstage werden nun in Personalübersich angezeigt
2024-07-08 20:45:07 +02:00
Daniel Spitzer
4e50b2dabc Merge branch 'spidev' into 'master'
Zeiterfassung Update/Bugfixes

See merge request fronk/thetool!445
2024-07-08 17:35:59 +00:00
Daniel Spitzer
6b3412afe6 Zeiterfassung Update/Bugfixes
* Homeofficetage werden wenn sie in Kombination mit Arztbesuch/Anwesenheiten nun richtig berechnet
 * Verrechnungsübersicht zeigt nun historisch BP/Gutstunden und Mehrstunden
 * Aufbuchen und Mindern wird nun in Verrechnet bei den NLZs angezeigt
2024-07-08 19:31:57 +02:00
Frank Schubert
8e9a9a2e1b auto generate fibu_num for billingaddresses 2024-07-08 17:51:54 +02:00
Frank Schubert
857a095f16 Added email notifications to VoicecallHistory::addContractIds() 2024-07-08 15:47:43 +02:00
Frank Schubert
fcbf35721e Added billingaddress note in Address/View 2024-07-08 15:03:00 +02:00
Frank Schubert
6b62f6c149 Fixed billing_delivery in Address/Form 2024-07-08 14:56:59 +02:00
Frank Schubert
5da539a4d2 Fixed billing delivery in Address/View 2024-07-08 14:53:47 +02:00
Frank Schubert
3f22ee7f31 Importing missing voicenumbers & disabled ivt button in Order 2024-07-08 01:25:06 +02:00
Frank Schubert
d6da19574e Ivt Import Tweaks 2024-07-07 23:01:10 +02:00
Frank Schubert
dbd332018b Tweak for 1st time billing 2024-07-07 21:28:20 +02:00
Frank Schubert
5bb0f1978c small changes to invoice & removed debugging 2024-07-07 16:10:39 +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
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
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
7e65c7929c Zeiterfassung
* Fix Aktiv/Inaktiv Anzeige bei der Personaladministration
2024-07-05 11:50:27 +02: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
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
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
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
Frank Schubert
da52a802ef WIP Contract/Billing 2024-06-20 2024-06-21 12:10:04 +02:00
Frank Schubert
92724ca6b5 WIP Contract 2024-06-13 2024-06-20 17:59:51 +02:00
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