From: Jan Büren Date: Wed, 6 Jan 2021 19:40:39 +0000 (+0100) Subject: Einträge am selben Tag nicht erneut in die Beschreibung aufnehmen X-Git-Tag: kivitendo-mebil_0.1-0~9^2~308 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2851ec9a444d93086dc5356122b7143711d955c0;p=kivitendo-erp.git Einträge am selben Tag nicht erneut in die Beschreibung aufnehmen --- diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index 9e14c82a1..fef0ee5a3 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -227,7 +227,11 @@ sub new_from_time_recordings { my $date = $source->start_time->to_kivitendo; $entries->{$part_id}->{$date}->{duration} += _round_total($source->duration_in_hours); - $entries->{$part_id}->{$date}->{content} .= '
  • ' . $source->description_as_stripped_html . '
  • '; + # add content if not already in description + my $new_description = $source->description_as_stripped_html; + $entries->{$part_id}->{$date}->{content} .= '
  • ' . $new_description . '
  • ' + unless $entries->{$part_id}->{$date}->{content} =~ m/\Q$new_description/; + $entries->{$part_id}->{$date}->{date_obj} = $source->start_time; # for sorting }