From f4de41a247f7d78958d9c6e7fb21d5480ba741c6 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 24 Feb 2014 11:53:01 +0100 Subject: [PATCH] SL::DB::DeliveryOrder->new_from: Positionsfeld ordnumber aus Quellbeleg setzen MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit …und nicht aus den Positionen kopieren. --- SL/DB/DeliveryOrder.pm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index d8de6beb5..75eab64b0 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -97,6 +97,13 @@ sub new_from { croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) eq 'SL::DB::Order'; + my ($item_parent_id_column, $item_parent_column); + + if (ref($source) eq 'SL::DB::Order') { + $item_parent_id_column = 'trans_id'; + $item_parent_column = 'order'; + } + my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; my %args = ( map({ ( $_ => $source->$_ ) } qw(cp_id currency_id customer_id cusordnumber department_id employee_id globalproject_id intnotes language_id notes @@ -134,16 +141,23 @@ sub new_from { my $delivery_order = $class->new(%args, %{ $params{attributes} || {} }); my $items = delete($params{items}) || $source->items_sorted; + my %item_parents; my @items = map { my $source_item = $_; + my $source_item_id = $_->$item_parent_id_column; my @custom_variables = map { _clone_orderitem_cvar($_) } @{ $source_item->custom_variables }; + $item_parents{$source_item_id} ||= $source_item->$item_parent_column; + my $item_parent = $item_parents{$source_item_id}; + SL::DB::DeliveryOrderItem->new(map({ ( $_ => $source_item->$_ ) } - qw(base_qty cusordnumber description discount lastcost longdescription marge_price_factor ordnumber parts_id price_factor price_factor_id + qw(base_qty cusordnumber description discount lastcost longdescription marge_price_factor parts_id price_factor price_factor_id project_id qty reqdate sellprice serialnumber transdate unit )), - custom_variables => \@custom_variables); + custom_variables => \@custom_variables, + ordnumber => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber, + ); } @{ $items }; -- 2.20.1