X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FPaymentTerm.pm;h=2f62bd9ac5790fb8b8b059918c6c2341bd31433f;hb=bcdc9f7040d4bc0c0b4d7ce77f1afc29543b04a4;hp=b78da528d3bf80545377169af88b411f5435d1a9;hpb=cbb59a58cac23f3973badcf52d4e0ec999453033;p=kivitendo-erp.git

diff --git a/SL/DB/PaymentTerm.pm b/SL/DB/PaymentTerm.pm
index b78da528d..2f62bd9ac 100644
--- a/SL/DB/PaymentTerm.pm
+++ b/SL/DB/PaymentTerm.pm
@@ -35,7 +35,7 @@ sub calc_date {
   }
 
   my $terms           = ($params{terms} // 'net') eq 'discount' ? 'terms_skonto' : 'terms_netto';
-  my $date            = $reference_date->add(days => $self->$terms);
+  my $date            = $reference_date->clone->add(days => $self->$terms);
 
   my $dow             = $date->day_of_week;
   $date               = $date->add(days => 8 - $dow) if $dow > 5;
@@ -57,8 +57,15 @@ SL::DB::PaymentTerm - Rose model for the payment_terms table
 =head1 SYNOPSIS
 
   my $terms             = SL::DB::PaymentTerm->new(id => $::form->{payment_id})->load;
-  my $due_date_net      = $erms->calc_date(terms => 'net');      # uses terms_netto
-  my $due_date_discount = $erms->calc_date(terms => 'discount'); # uses terms_skonto
+  my $due_date_net      = $terms->calc_date(terms => 'net');      # uses terms_netto
+  my $due_date_discount = $terms->calc_date(terms => 'discount'); # uses terms_skonto
+
+  # Calculate due date taking the existing invoice date and the due
+  # date entered by the user into account:
+  my $due_date = $terms->calc_date(
+    reference_date => $::form->{invdate},
+    due_date       => $::form->{duedate},
+  );
 
 =head1 FUNCTIONS