Commit Graph

2540 Commits

Author SHA1 Message Date
Luca Haid
400c48643e Changed notify duration 2024-11-27 13:52:17 +00:00
Luca Haid
d6aeee9f79 Merge branch 'feature/warehouse-improve' into 'master'
Changed notify duration

See merge request fronk/thetool!768
2024-11-27 13:46:01 +00:00
Luca Haid
1cf6b0f0b1 Changed notify duration 2024-11-27 13:46:00 +00:00
Luca Haid
a46a8479eb Merge branch 'feature/warehouse-improve' into 'master'
Changed notify duration

See merge request fronk/thetool!767
2024-11-27 13:17:50 +00:00
Luca Haid
465509a0c6 Changed notify duration 2024-11-27 13:17:49 +00:00
Luca Haid
ef5e2b151e Merge branch 'feature/partner-search-preorder' into 'master'
Removed Price as necesatiy

See merge request fronk/thetool!766
2024-11-27 11:54:41 +00:00
Luca Haid
6ee92de994 Removed Price as necesatiy 2024-11-27 12:54:22 +01:00
Luca Haid
436a3fb469 Merge branch 'feature/partner-search-preorder' into 'master'
added partner search to preorder

See merge request fronk/thetool!765
2024-11-27 11:30:40 +00:00
Luca Haid
2225e89a22 added partner search to preorder 2024-11-27 12:30:22 +01:00
Luca Haid
892ca52c23 Merge branch 'feature/warehouse-improve' into 'master'
fixed hoursEntries to be text

See merge request fronk/thetool!764
2024-11-27 09:57:32 +00:00
Luca Haid
58e868eac0 fixed hoursEntries to be text 2024-11-27 10:54:58 +01:00
Daniel Spitzer
bf7693d5ec Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!763
2024-11-26 19:55:58 +00:00
Daniel Spitzer
02c5e0b8b6 Kalender
Update:
* Serientermine werden nun als Eventweise richtig angezeigt
2024-11-26 20:53:46 +01:00
Luca Haid
7aeea7d882 Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs

See merge request fronk/thetool!762
2024-11-25 10:47:07 +00:00
Luca Haid
f3a1aef719 switched 2 inputs 2024-11-25 10:47:06 +00:00
Frank Schubert
c2afcc7aa1 Merge branch 'fronkdev' into 'master'
Improved of subcd handling in Rimo Import

See merge request fronk/thetool!761
2024-11-22 19:00:32 +00:00
Frank Schubert
30530a0177 Improved of subcd handling in Rimo Import 2024-11-22 19:53:46 +01:00
Frank Schubert
1c28cc7c26 Merge branch 'fronkdev' into 'master'
Added Rimo External ID Filter in AddressDB/Index

See merge request fronk/thetool!760
2024-11-22 14:57:55 +00:00
Frank Schubert
86c3c6543e Added Rimo External ID Filter in AddressDB/Index 2024-11-22 15:57:00 +01:00
Frank Schubert
4cb88e11e4 Merge branch 'fronkdev' into 'master'
Counting EFH/MPH from Hausnummer now in Prordercampaign/Index

See merge request fronk/thetool!759
2024-11-22 13:24:45 +00:00
Frank Schubert
1c5ea0d91d Counting EFH/MPH from Hausnummer now in Prordercampaign/Index 2024-11-22 14:23:52 +01:00
Frank Schubert
c28a322210 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-11-22 13:54:30 +01:00
Frank Schubert
7dafe1357f WIP Preorderconstruction API 2024-11-22 13:54:07 +01:00
Frank Schubert
402de3673d Merge branch 'fronkdev' into 'master'
preorderaddressreporting user see all visibilites in AddressAPI

See merge request fronk/thetool!758
2024-11-22 12:50:31 +00:00
Frank Schubert
1dec1de189 preorderaddressreporting user see all visibilites in AddressAPI 2024-11-22 13:48:34 +01:00
Luca Haid
02ae370515 Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs

See merge request fronk/thetool!757
2024-11-21 09:12:45 +00:00
Luca Haid
0cf35b19b1 switched 2 inputs 2024-11-21 09:12:44 +00:00
Luca Haid
11ec0cf97b Update WarehouseShippingNoteController.php 2024-11-21 09:10:39 +00:00
Luca Haid
21e5c828f1 Update WarehouseShippingNoteController.php 2024-11-20 16:11:19 +00:00
Frank Schubert
defde2f419 Merge branch 'fronkdev' into 'master'
Preorder/Index: Borderpoint now visible for all users

See merge request fronk/thetool!755
2024-11-20 13:11:14 +00:00
Frank Schubert
492cc784e7 Preorder/Index: Borderpoint now visible for all users 2024-11-20 14:10:03 +01:00
Luca Haid
c80e3d442a Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs

See merge request fronk/thetool!754
2024-11-20 12:26:23 +00:00
Luca Haid
5bb51fd676 switched 2 inputs 2024-11-20 12:26:22 +00:00
Luca Haid
b36f8108ad Merge branch 'feature/graphing' into 'master'
Added Graphing

See merge request fronk/thetool!753
2024-11-19 19:20:03 +00:00
Luca Haid
6b2c292282 Added Graphing 2024-11-19 20:19:46 +01:00
Frank Schubert
e7f07e1486 Added ORDER BY in ContractjournalModel::search() 2024-11-19 19:02:23 +01:00
Frank Schubert
36c48b258a Merge branch 'master' into fronkdev 2024-11-19 18:45:04 +01:00
Frank Schubert
0cb4a89156 carrying over create+edit dates from Order when committing Contractqueue 2024-11-19 18:43:40 +01:00
Daniel Spitzer
4d55a584fb Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!752
2024-11-19 14:31:33 +00:00
Daniel Spitzer
857e850d32 Kalender
Update:
* Abwesenheiten werden nun bei den Kalendern angezeigt
2024-11-19 15:29:35 +01:00
Frank Schubert
8a0015cef9 Merge branch 'fronkdev' into 'master'
Create Workorder button in Preorder/Index now always visible for admins

See merge request fronk/thetool!751
2024-11-19 14:29:34 +00:00
Frank Schubert
77f37fbc27 Create Workorder button in Preorder/Index now always visible for admins 2024-11-19 15:25:44 +01:00
Frank Schubert
25f2452f02 WIP Preorderconstruction Api 2024-11-19 13:15:57 +01:00
Daniel Spitzer
5a715fd70b Merge branch 'spidev' into 'master'
Zeiterfassung

See merge request fronk/thetool!750
2024-11-19 08:28:40 +00:00
Daniel Spitzer
6e970adac7 Zeiterfassung
Update:
* Abwesenheitskalender geht nun 3 Jahre in die Zukunft
2024-11-19 09:27:05 +01:00
Daniel Spitzer
9f6f0428c1 Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!749
2024-11-18 14:39:29 +00:00
Daniel Spitzer
20fa3f9df9 Kalender
Update:
* Termine Teilnehmer können nun beliebig hinzugefügt und entfernt werden
2024-11-18 15:28:46 +01:00
Daniel Spitzer
74a7d2963b Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!748
2024-11-18 13:28:38 +00:00
Daniel Spitzer
c9cfbb1f36 Kalender
Update:
* Serientermine die schon länger als 1 Jahr laufen werden nun 3 Jahre in die Zugunft angezeigt
2024-11-18 14:27:53 +01:00
Daniel Spitzer
e549ca703f Merge branch 'spidev' into 'master'
Kalender

See merge request fronk/thetool!747
2024-11-18 12:11:51 +00:00