X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=9aa17adec56d00d42a45f8cb6c5f69e4151c44ad;hb=5e9cefa2067da6326e3cb9ab6834c51f21bfca2c;hp=2d6ab07348505f4693fcb7fb0676b34ecb67b3a8;hpb=4f43ec85816b8f5c9031ff35adfa9e0d33c4306f;p=kivitendo-erp.git

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 2d6ab0734..9aa17adec 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp;
 use List::Util qw(first sum);
 
-use Rose::DB::Object::Helpers qw(has_loaded_related);
+use Rose::DB::Object::Helpers qw(has_loaded_related forget_related);
 use SL::DB::MetaSetup::Invoice;
 use SL::DB::Manager::Invoice;
 use SL::DB::Helper::Payment qw(:ALL);
@@ -131,7 +131,7 @@ sub closed {
 sub _clone_orderitem_delivery_order_item_cvar {
   my ($cvar) = @_;
 
-  my $cloned = Rose::DB::Object::Helpers::clone_and_reset($_);
+  my $cloned = $_->clone_and_reset;
   $cloned->sub_module('invoice');
 
   return $cloned;
@@ -162,9 +162,10 @@ sub new_from {
   }
 
   my $terms = $source->can('payment_id') ? $source->payment_terms : undef;
+  $terms = $source->customer->payment_terms if !defined $terms && $source->customer;
 
   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), @columns),
                transdate   => DateTime->today_local,
                gldate      => DateTime->today_local,
                duedate     => $terms ? $terms->calc_date(reference_date => DateTime->today_local) : DateTime->today_local,
@@ -175,6 +176,8 @@ sub new_from {
                employee_id => (SL::DB::Manager::Employee->current || SL::DB::Employee->new(id => $source->employee_id))->id,
             );
 
+  $args{payment_id} = ( $terms ? $terms->id : $source->payment_id);
+
   if ($source->type =~ /_order$/) {
     $args{deliverydate} = $source->reqdate;
     $args{orddate}      = $source->transdate;
@@ -182,6 +185,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;
@@ -695,7 +709,7 @@ Mandatory params are
 =back
 
 Currently the amount of the invoice object is used for the acc_trans amount.
-Use C<recalculate_amounts> before calling this mehtod if amount it isn't known
+Use C<recalculate_amounts> before calling this method if amount isn't known
 yet or you didn't set it manually.
 
 =item C<add_ar_amount_row %params>