From: Moritz Bunkus Date: Thu, 5 Feb 2015 09:31:07 +0000 (+0100) Subject: Invoice, DeliveryOrder-DB: bei Erstellen aus anderen Belegen Preisquellen beibehalten X-Git-Tag: release-3.2.0~51 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a94080db277740fb7666781601a83ada92ff38c2;p=kivitendo-erp.git Invoice, DeliveryOrder-DB: bei Erstellen aus anderen Belegen Preisquellen beibehalten --- diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index f5fb2d54e..c99d2fdca 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -155,7 +155,7 @@ sub new_from { SL::DB::DeliveryOrderItem->new(map({ ( $_ => $source_item->$_ ) } 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 active_discount_source active_price_source )), custom_variables => \@custom_variables, ordnumber => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber, diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 08c580973..e8b49c46f 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -196,7 +196,7 @@ sub new_from { SL::DB::InvoiceItem->new(map({ ( $_ => $source_item->$_ ) } qw(parts_id description qty sellprice discount project_id serialnumber pricegroup_id transdate cusordnumber unit - base_qty longdescription lastcost price_factor_id), @item_columns), + base_qty longdescription lastcost price_factor_id active_discount_source active_price_source), @item_columns), deliverydate => $source_item->reqdate, fxsellprice => $source_item->sellprice, custom_variables => \@custom_variables,