Invoice, DeliveryOrder-DB: bei Erstellen aus anderen Belegen Preisquellen beibehalten

diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm
index f5fb2d54eefe190132531a4164c9624398e8f7b6..c99d2fdca8b7e449d78827e0d32227fc94be9f9b 100644 (file)
--- 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
 
     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,
                                          )),
                                    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 08c5809731613b643543501acbd455090d7e87cc..e8b49c46f0051a580a484dbdb43525fe43e1abea 100644 (file)
--- 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
 
     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,
                              deliverydate     => $source_item->reqdate,
                              fxsellprice      => $source_item->sellprice,
                              custom_variables => \@custom_variables,