From: Moritz Bunkus Date: Mon, 24 Feb 2014 09:28:18 +0000 (+0100) Subject: Revert "Überlagerte benutzerdefinierte Variablen werden in wiederkehrende Rechnungen... X-Git-Tag: release-3.2.0beta~491^2~16 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f26083d9a08116e4d2a72f975f3bc2b81955dcea?ds=inline;hp=-c Revert "Überlagerte benutzerdefinierte Variablen werden in wiederkehrende Rechnungen nicht übernommen" This reverts commit 5bd7e74db1f425a8bbc43357e949efcc1d4eb135. --- f26083d9a08116e4d2a72f975f3bc2b81955dcea diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 78fa46f5b..c0a936c7b 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -7,7 +7,6 @@ use strict; use Carp; use List::Util qw(first); -use List::MoreUtils qw(pairwise); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; @@ -16,7 +15,6 @@ use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::PriceTaxCalculator; use SL::DB::Helper::PriceUpdater; use SL::DB::Helper::TransNumberGenerator; -use SL::DB::CustomVariable; __PACKAGE__->meta->add_relationship( invoiceitems => { @@ -162,14 +160,6 @@ sub new_from { fxsellprice => $source_item->sellprice,); } @{ $source->items_sorted }; - my $i = 0; - foreach my $item (@items) { - my $source_cvars = $source->items_sorted->[$i]->cvars_by_config; - my $target_cvars = $item->cvars_by_config; - pairwise { $a->value($b->value) } @{ $target_cvars }, @{ $source_cvars }; - $i++; - } - $invoice->invoiceitems(\@items); return $invoice;