From: Bernd Bleßmann Date: Thu, 24 Sep 2015 14:41:45 +0000 (+0200) Subject: Auftrags-Controller: Langtext entweder aus vorhandenem Auftrag oder von der Ware X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=43a6a98867016061cb7c35b49c05bedf02ab1140;p=kivitendo-erp.git Auftrags-Controller: Langtext entweder aus vorhandenem Auftrag oder von der Ware --- diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index b6b87a87f..0eab99a1c 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -8,6 +8,7 @@ use SL::ClientJS; use SL::Presenter; use SL::Locale::String; use SL::SessionFile::Random; +use SL::PriceSource; use SL::Form; use SL::DB::Order; @@ -38,6 +39,8 @@ __PACKAGE__->run_before('_check_auth'); __PACKAGE__->run_before('_recalc', only => [ qw(edit update save save_and_delivery_order create_pdf send_email) ]); +__PACKAGE__->run_before('_get_unalterable_data', + only => [ qw(save save_and_delivery_order create_pdf send_email) ]); # # actions @@ -481,6 +484,25 @@ sub _recalc { pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}}; } + +sub _get_unalterable_data { + my ($self) = @_; + + foreach my $item (@{ $self->order->items }) { + if ($item->id) { + # load data from orderitems (db) + my $db_item = SL::DB::OrderItem->new(id => $item->id)->load; + $item->$_($db_item->$_) for qw(active_discount_source active_price_source longdescription); + } else { + # set data from part (or other sources) + $item->longdescription($item->part->notes); + #$item->active_price_source(''); + #$item->active_discount_source(''); + } + } +} + + sub _save { my ($self) = @_;