Commit Graph

1824 Commits

Author SHA1 Message Date
Frank Schubert
77fd9fb897 Merge branch 'fronkdev' into 'master'
enabled billingaddress cleanup script

See merge request fronk/thetool!437
2024-07-08 12:39:18 +00:00
Frank Schubert
9f8d77f34f enabled billingaddress cleanup script 2024-07-08 14:38:46 +02:00
Frank Schubert
deebfaf625 Merge branch 'fronkdev' into 'master'
Added billingaddress cleanup script

See merge request fronk/thetool!436
2024-07-08 12:34:23 +00:00
Frank Schubert
9a68b3ee32 Added billingaddress cleanup script 2024-07-08 14:33:01 +02:00
Frank Schubert
3df3a12559 Merge branch 'fronkdev' into 'master'
Added Bankdata check script

See merge request fronk/thetool!435
2024-07-08 11:50:03 +00:00
Frank Schubert
002e2bbfa2 Added Bankdata check script 2024-07-08 13:49:38 +02:00
Frank Schubert
e3b53a2184 Merge branch 'fronkdev' into 'master'
Fixed finding orders in ivt import

See merge request fronk/thetool!434
2024-07-08 10:19:15 +00:00
Frank Schubert
66d0a70481 Fixed finding orders in ivt import 2024-07-08 12:18:43 +02:00
Frank Schubert
a8e8ce7094 Merge branch 'fronkdev' into 'master'
Fixed canceled billing

See merge request fronk/thetool!433
2024-07-08 09:00:12 +00:00
Frank Schubert
14d3b65d50 Fixed canceled billing 2024-07-08 10:58:43 +02:00
Frank Schubert
12dce78159 Merge branch 'fronkdev' into 'master'
Importing missing voicenumbers & disabled ivt button in Order

See merge request fronk/thetool!432
2024-07-07 23:25:52 +00:00
Frank Schubert
3f22ee7f31 Importing missing voicenumbers & disabled ivt button in Order 2024-07-08 01:25:06 +02:00
Frank Schubert
4c87fb7d76 Merge branch 'fronkdev' into 'master'
Ivt Import Tweaks

See merge request fronk/thetool!431
2024-07-07 21:01:42 +00:00
Frank Schubert
d6da19574e Ivt Import Tweaks 2024-07-07 23:01:10 +02:00
Frank Schubert
77c0081b05 Merge branch 'fronkdev' into 'master'
Tweak for 1st time billing

See merge request fronk/thetool!430
2024-07-07 19:29:03 +00:00
Frank Schubert
dbd332018b Tweak for 1st time billing 2024-07-07 21:28:20 +02:00
Frank Schubert
d93323d3e9 Merge branch 'fronkdev' into 'master'
Tweaks to Ivt Import

See merge request fronk/thetool!429
2024-07-07 19:10:06 +00:00
Frank Schubert
e49d47ed7d Tweaks to Ivt Import 2024-07-07 21:08:32 +02:00
Frank Schubert
35fc1d9b74 Merge branch 'fronkdev' into 'master'
Tweaks to IVT Import

See merge request fronk/thetool!428
2024-07-07 16:04:02 +00:00
Frank Schubert
0913f367ec Tweaks to IVT Import 2024-07-07 18:03:33 +02:00
Frank Schubert
71668b0b69 Merge branch 'fronkdev' into 'master'
removed debugging

See merge request fronk/thetool!427
2024-07-07 14:49:05 +00:00
Frank Schubert
3a0ebb3bf4 removed debugging 2024-07-07 16:48:41 +02:00
Frank Schubert
4154bb70b8 Merge branch 'fronkdev' into 'master'
small changes to invoice & removed debugging

See merge request fronk/thetool!426
2024-07-07 14:11:45 +00:00
Frank Schubert
5bb0f1978c small changes to invoice & removed debugging 2024-07-07 16:10:39 +02:00
Frank Schubert
93d9cd7f78 Merge branch 'fronkdev' into 'master'
Invoice optival change & Voicenumber billing fix & Fixed billing-fibu-data migration

See merge request fronk/thetool!425
2024-07-07 13:03:07 +00: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