From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 6 Apr 2016 12:16:17 +0000 (+0200)
Subject: SL::DB::Invoice->new_from: individuelle Lieferadressen richtig behandeln
X-Git-Tag: release-3.4.1~239
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0eb90109aca630ea37769d64d948f2f79327a7e6;p=kivitendo-erp.git

SL::DB::Invoice->new_from: individuelle Lieferadressen richtig behandeln

Individuelle Lieferadressen werden nur von shipto.trans_id zu ar.id
verlinkt, nicht aber in ar.shipto_id. Die Implementation ist analog zu
SL::DB::DeliveryOrder->new_from.
---

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index abb3e7c88..e4c24263e 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -164,7 +164,7 @@ sub new_from {
   my $terms = $source->can('payment_id') ? $source->payment_terms : undef;
 
   my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber department_id
-                                                cp_id language_id taxzone_id shipto_id globalproject_id transaction_description currency_id delivery_term_id payment_id), @columns),
+                                                cp_id language_id taxzone_id globalproject_id transaction_description currency_id delivery_term_id payment_id), @columns),
                transdate   => DateTime->today_local,
                gldate      => DateTime->today_local,
                duedate     => $terms ? $terms->calc_date(reference_date => DateTime->today_local) : DateTime->today_local,
@@ -182,6 +182,17 @@ sub new_from {
     $args{quodate}      = $source->transdate;
   }
 
+  # Custom shipto addresses (the ones specific to the sales/purchase
+  # record and not to the customer/vendor) are only linked from shipto
+  # → ar. Meaning ar.shipto_id will not be filled in that
+  # case.
+  if (!$source->shipto_id && $source->id) {
+    $args{custom_shipto} = $source->custom_shipto->clone($class) if $source->can('custom_shipto') && $source->custom_shipto;
+
+  } else {
+    $args{shipto_id} = $source->shipto_id;
+  }
+
   my $invoice = $class->new(%args);
   $invoice->assign_attributes(%{ $params{attributes} }) if $params{attributes};
   my $items   = delete($params{items}) || $source->items_sorted;