X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FDeliveryOrder.pm;h=395a44944621ec4d40f2d4d6081cfbc178246bfa;hb=ce73964f91267ab5eecb2832765efbb3752c2a59;hp=fef0ee5a3bea53d2840fdfc725ee6d234b6500de;hpb=2851ec9a444d93086dc5356122b7143711d955c0;p=kivitendo-erp.git diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index fef0ee5a3..395a44944 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -19,8 +19,9 @@ use SL::DB::Unit; use SL::Helper::Number qw(_format_total _round_total); -use List::Util qw(first notall); -use List::MoreUtils qw(any); +use List::Util qw(first); +use List::MoreUtils qw(any pairwise); +use Math::Round qw(nhimult); __PACKAGE__->meta->add_relationship(orderitems => { type => 'one to many', class => 'SL::DB::DeliveryOrderItem', @@ -184,39 +185,31 @@ sub new_from_time_recordings { croak("Unsupported object type in sources") if any { ref($_) ne 'SL::DB::TimeRecording' } @$sources; croak("Cannot create delivery order from source records of different customers") if any { $_->customer_id != $sources->[0]->customer_id } @$sources; - my %args = ( - is_sales => 1, - delivered => 0, - customer_id => $sources->[0]->customer_id, - taxzone_id => $sources->[0]->customer->taxzone_id, - currency_id => $sources->[0]->customer->currency_id, - employee_id => SL::DB::Manager::Employee->current->id, - salesman_id => SL::DB::Manager::Employee->current->id, - items => [], - ); - my $delivery_order = $class->new(%args); - $delivery_order->assign_attributes(%{ $params{attributes} }) if $params{attributes}; - # - one item per part (article) # - qty is sum of duration # - description goes to item longdescription # - ordered and summed by date # - each description goes to an ordered list # - (as time recording descriptions are formatted text by now, use stripped text) - # - merge same descriptions (todo) + # - merge same descriptions # - ### config - my $default_partnummer = 6; - my $default_part_id = SL::DB::Manager::Part->find_by(partnumber => $default_partnummer)->id; + my $default_part_id = $params{default_part_id} ? $params{default_part_id} + : $params{default_partnumber} ? SL::DB::Manager::Part->find_by(partnumber => $params{default_partnumber})->id + : undef; + my $override_part_id = $params{override_part_id} ? $params{override_part_id} + : $params{override_partnumber} ? SL::DB::Manager::Part->find_by(partnumber => $params{override_partnumber})->id + : undef; # check parts and collect entries my %part_by_part_id; my $entries; foreach my $source (@$sources) { - my $part_id = $source->part_id ? $source->part_id - : $default_part_id ? $default_part_id - : undef; + next if !$source->duration; + + my $part_id = $override_part_id; + $part_id ||= $source->part_id; + $part_id ||= $default_part_id; die 'article not found for entry "' . $source->displayable_times . '"' if !$part_id; @@ -225,16 +218,21 @@ sub new_from_time_recordings { die 'article unit must be time based for entry "' . $source->displayable_times . '"' if !$part_by_part_id{$part_id}->unit_obj->is_time_based; } - my $date = $source->start_time->to_kivitendo; - $entries->{$part_id}->{$date}->{duration} += _round_total($source->duration_in_hours); + my $date = $source->date->to_kivitendo; + $entries->{$part_id}->{$date}->{duration} += $params{rounding} + ? nhimult(0.25, ($source->duration_in_hours)) + : _round_total($source->duration_in_hours); # add content if not already in description - my $new_description = $source->description_as_stripped_html; + my $new_description = '' . $source->description_as_stripped_html; + $entries->{$part_id}->{$date}->{content} ||= ''; $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 + $entries->{$part_id}->{$date}->{date_obj} = $source->start_time || $source->date; # for sorting } + my @items; + my $h_unit = SL::DB::Manager::Unit->find_h_unit; my @keys = sort { $part_by_part_id{$a}->partnumber cmp $part_by_part_id{$b}->partnumber } keys %$entries; @@ -257,12 +255,48 @@ sub new_from_time_recordings { parts_id => $part_by_part_id{$key}->id, description => $part_by_part_id{$key}->description, qty => $qty, + base_qty => $h_unit->convert_to($qty, $part_by_part_id{$key}->unit_obj), unit_obj => $h_unit, - sellprice => $part_by_part_id{$key}->sellprice, + sellprice => $part_by_part_id{$key}->sellprice, # Todo: use price rules to get sellprice longdescription => $longdescription, ); - $delivery_order->add_items($item); + push @items, $item; + } + + my $delivery_order; + + if ($params{related_order}) { + # collect suitable items in related order + my @items_to_use; + my @new_attributes; + foreach my $item (@items) { + my $item_to_use = first {$item->parts_id == $_->parts_id} @{ $params{related_order}->items_sorted }; + + die "no suitable item found in related order" if !$item_to_use; + + my %new_attributes; + $new_attributes{$_} = $item->$_ for qw(qty base_qty unit_obj longdescription); + push @items_to_use, $item_to_use; + push @new_attributes, \%new_attributes; + } + + $delivery_order = $class->new_from($params{related_order}, items => \@items_to_use, %params); + pairwise { $a->assign_attributes( %$b) } @{$delivery_order->items}, @new_attributes; + + } else { + my %args = ( + is_sales => 1, + delivered => 0, + customer_id => $sources->[0]->customer_id, + taxzone_id => $sources->[0]->customer->taxzone_id, + currency_id => $sources->[0]->customer->currency_id, + employee_id => SL::DB::Manager::Employee->current->id, + salesman_id => SL::DB::Manager::Employee->current->id, + items => \@items, + ); + $delivery_order = $class->new(%args); + $delivery_order->assign_attributes(%{ $params{attributes} }) if $params{attributes}; } return $delivery_order; @@ -399,11 +433,12 @@ order. =item C -Creates a new C instace from the time recordings +Creates a new C instance from the time recordings given as C<$sources>. All time recording entries must belong to the same customer. Time recordings are sorted by article and date. For each article a new delivery order item is created. If no article is associated with an -entry, a default article will be used (hard coded). +entry, a default article will be used. The article given in the time +recording entry can be overriden. Entries of the same date (for each article) are summed together and form a list entry in the long description of the item. @@ -420,6 +455,36 @@ C<%params> can include the following options: An optional hash reference. If it exists then it is used to set attributes of the newly created delivery order object. +=item C + +An optional part id which is used as default value if no part is set +in the time recording entry. + +=item C + +Like C but given as partnumber, not as id. + +=item C + +An optional part id which is used instead of a value set in the time +recording entry. + +=item C + +Like C but given as partnumber, not as id. + +=item C + +An optional C object. If it exists then it is used to +generate the delivery order from that via C. +The generated items are created from a suitable item of the related +order. If no suitable item is found, an exception is thrown. + +=item C + +An optional boolean value. If truish, then the durations of the time entries +are rounded up to the full quarters of an hour. + =back =item C