Commit Graph
3312 Commits
Author SHA1 Message Date
Frank Schubert 46c97221eb Merge branch 'master' into fronkdev 2024-08-30 11:54:30 +02:00
Frank Schubert 69cd4d79e9 Merge branch 'fronkdev' into 'master'
small layout change

See merge request fronk/thetool!616
2024-08-30 09:47:20 +00:00
Frank Schubert 38149de505 small layout change 2024-08-30 11:46:02 +02:00
Frank Schubert 5c495f1e3f Merge branch 'fronkdev' into 'master'
Added Mailtemplate

See merge request fronk/thetool!615
2024-08-29 21:23:32 +00:00
Frank Schubert ebd5d6182a Added Mailtemplate 2024-08-29 23:22:49 +02:00
Frank Schubert 8d6fbe14a1 Merge branch 'fronkdev' into 'master'
small change in Invoice/Index

See merge request fronk/thetool!614
2024-08-29 14:02:20 +00:00
Frank Schubert 42d2541f6a small change in Invoice/Index 2024-08-29 16:01:43 +02:00
Frank Schubert 0f1e72bc9e Merge branch 'fronkdev' into 'master'
small InvoiceJob update

See merge request fronk/thetool!613
2024-08-29 13:30:49 +00:00
Frank Schubert c9552055dd small InvoiceJob update 2024-08-29 15:29:47 +02:00
Frank Schubert 6583c7e388 Merge branch 'fronkdev' into 'master'
fixed mailtemplte migration

See merge request fronk/thetool!612
2024-08-29 12:54:01 +00:00
Frank Schubert b713e803c9 fixed mailtemplte migration 2024-08-29 14:53:41 +02:00
Frank Schubert 7f6fbe27dd Merge branch 'fronkdev' into 'master'
Added InvoiceJob

See merge request fronk/thetool!611
2024-08-29 12:52:30 +00:00
Frank Schubert 1ed2dddb97 Added InvoiceJob 2024-08-29 14:51:37 +02:00
Frank Schubert ba8a544f25 Merge branch 'fronkdev' into 'master'
Added another number in Voicecallhistory addContractIds

See merge request fronk/thetool!610
2024-08-28 14:41:20 +00:00
Frank Schubert 248013423d Added another number in Voicecallhistory addContractIds 2024-08-28 16:40:51 +02:00
Frank Schubert c5a2da4b7d Merge branch 'fronkdev' into 'master'
Added numbers to VoiceCallHistory ContractIds ignore list

See merge request fronk/thetool!609
2024-08-28 14:32:05 +00:00
Frank Schubert 0b45e82d8d Added numbers to VoiceCallHistory ContractIds ignore list 2024-08-28 16:31:23 +02:00
Luca Haid eb553e5f90 Fixed Xinon Logo Height on PDF Generation 2024-08-27 06:17:54 +00:00
Frank Schubert 777db69586 Merge branch 'fronkdev' into 'master'
update mailtemplate migration

See merge request fronk/thetool!608
2024-08-26 13:18:33 +00:00
Frank Schubert c26d32826b update mailtemplate migration 2024-08-26 15:18:09 +02:00
Frank Schubert c454eec76a Merge branch 'fronkdev' into 'master'
Added timestamps to AddressDB export

See merge request fronk/thetool!607
2024-08-26 13:17:37 +00:00
Frank Schubert ef1d42907f Added timestamps to AddressDB export 2024-08-26 15:15:56 +02:00
Daniel Spitzer ccfedc1fe8 Merge branch 'spidev' into 'master'
Zeiterfassung Abwesenheitskalender Änderung

See merge request fronk/thetool!606
2024-08-26 10:22:31 +00:00
Daniel Spitzer aa2ee8bbbc Zeiterfassung Abwesenheitskalender Änderung
* Mitarbeiter die ausgetreten sind werden im Kalender mit dem Geburtstag nicht mehr angezeigt
2024-08-26 12:21:15 +02:00
Luca Haid 599d5f7f77 Merge branch 'bugfix/warehouseeshop' into 'master'
now not only showing xinon users

See merge request fronk/thetool!605
2024-08-26 07:48:12 +00:00
Luca 43cc2f6cce now not only showing xinon users 2024-08-26 10:45:56 +02:00
Frank Schubert 7af6d36bc1 WIP Mailtemplate 2024-08-22 2024-08-23 11:12:57 +02:00
Frank Schubert 789fe28fc5 Added ADBStatusflag update from Rimo import 2024-08-22 14:07:20 +02:00
Frank Schubert 9e5d229f83 Merge branch 'fronkdev' into 'master'
Added period after end of senttences

See merge request fronk/thetool!604
2024-08-21 12:53:22 +00:00
Frank Schubert a9c195bcc1 Added period after end of senttences 2024-08-21 14:52:20 +02:00
Luca Haid 3def74eb01 Fixed unecessary characters 2024-08-21 09:38:42 +00:00
Luca 67cad4280b fixed problem when changer->address is null 2024-08-21 10:56:45 +02:00
Luca Haid e3f0fca2c8 Merge branch 'bugfix/leitungsbau' into 'master'
fixed problem when changer->address is null

See merge request fronk/thetool!603
2024-08-21 07:56:52 +00:00
Luca Haid 96a4d79c63 Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
fixed page 0 on client side rendered tables

See merge request fronk/thetool!602
2024-08-21 06:18:16 +00:00
Luca 4221eb7f45 fixed page 0 on client side rendered tables 2024-08-21 09:18:02 +02:00
Frank Schubert 1b51b82866 Merge branch 'fronkdev' into 'master'
fixed numbers in Order in Voicecallhistory::addContractIds

See merge request fronk/thetool!601
2024-08-20 19:55:42 +00:00
Frank Schubert f24a9d47e5 fixed numbers in Order in Voicecallhistory::addContractIds 2024-08-20 21:55:01 +02:00
Frank Schubert 00c76ad8c0 Merge branch 'fronkdev' into 'master'
added voicenumber filter to OrderProductModel

See merge request fronk/thetool!600
2024-08-20 19:43:15 +00:00
Frank Schubert f72c1dc4db added voicenumber filter to OrderProductModel 2024-08-20 21:42:39 +02:00
Frank Schubert 995266f65b Merge branch 'fronkdev' into 'master'
Added in_order type of missing number in addContractIds

See merge request fronk/thetool!599
2024-08-20 19:32:43 +00:00
Frank Schubert 66597cdde4 Added in_order type of missing number in addContractIds 2024-08-20 21:32:17 +02:00
Frank Schubert e651962f42 Merge branch 'fronkdev' into 'master'
Fixed updating existing Voicenumber when saving ContractConfig

See merge request fronk/thetool!598
2024-08-20 19:23:12 +00:00
Frank Schubert 35c750a444 Fixed updating existing Voicenumber when saving ContractConfig 2024-08-20 21:22:34 +02:00
Frank Schubert 9d362b87d9 Merge branch 'fronkdev' into 'master'
Added customer number to credit invoice csv expot

See merge request fronk/thetool!597
2024-08-20 18:43:49 +00:00
Frank Schubert 7d4a1373fd Added customer number to credit invoice csv expot 2024-08-20 20:43:09 +02:00
Frank Schubert e688065194 Merge branch 'fronkdev' into 'master'
Added customer_number to credit invoice export

See merge request fronk/thetool!596
2024-08-20 18:35:54 +00:00
Frank Schubert 1131230170 Added customer_number to credit invoice export 2024-08-20 20:35:17 +02:00
Frank Schubert 3f87c49e62 Merge branch 'fronkdev' into 'master'
added link to icon in quick contract view

See merge request fronk/thetool!595
2024-08-20 18:24:26 +00:00
Frank Schubert ac2061b069 added link to icon in quick contract view 2024-08-20 20:23:03 +02:00
Frank Schubert 28baa0de85 Merge branch 'fronkdev' into 'master'
Added icons in quick contract view

See merge request fronk/thetool!594
2024-08-20 18:16:50 +00:00