projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Term::ReadLine::Perl::Bind in Console nicht nutzen
[kivitendo-erp.git]
/
SL
/
DB
/
DeliveryOrder.pm
diff --git
a/SL/DB/DeliveryOrder.pm
b/SL/DB/DeliveryOrder.pm
index
d8de6be
..
0602485
100644
(file)
--- 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';
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
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
@@
-132,18
+139,26
@@
sub new_from {
$args{shipto_id} = $source->shipto_id;
}
$args{shipto_id} = $source->shipto_id;
}
- my $delivery_order = $class->new(%args, %{ $params{attributes} || {} });
+ my $delivery_order = $class->new(%args);
+ $delivery_order->assign_attributes(%{ $params{attributes} }) if $params{attributes};
my $items = delete($params{items}) || $source->items_sorted;
my $items = delete($params{items}) || $source->items_sorted;
+ my %item_parents;
my @items = map {
my $source_item = $_;
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 };
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->$_ ) }
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
)),
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 };
} @{ $items };