X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FDB%2FPeriodicInvoicesConfig.pm;h=074d4e317b502d02a5cb57351d625b2d6712b937;hb=c9370086d4e1dd6051847ecdd7a0c85bbf9fc2a1;hp=7270c8f42b05ebfd30e75ec55f40332b0e58a741;hpb=fde528b67be0e4375fdee44b2cadbfb7e0adadbd;p=kivitendo-erp.git

diff --git a/SL/DB/PeriodicInvoicesConfig.pm b/SL/DB/PeriodicInvoicesConfig.pm
index 7270c8f42..074d4e317 100644
--- a/SL/DB/PeriodicInvoicesConfig.pm
+++ b/SL/DB/PeriodicInvoicesConfig.pm
@@ -60,37 +60,37 @@ sub handle_automatic_extension {
   return $end_date;
 }
 
-sub get_previous_invoice_date {
+sub get_previous_billed_period_start_date {
   my $self  = shift;
 
   my $query = <<SQL;
-    SELECT MAX(ar.transdate)
+    SELECT MAX(period_start_date)
     FROM periodic_invoices
-    LEFT JOIN ar ON (ar.id = periodic_invoices.ar_id)
-    WHERE periodic_invoices.config_id = ?
+    WHERE config_id = ?
 SQL
 
-  my ($max_transdate) = $self->dbh->selectrow_array($query, undef, $self->id);
+  my ($date) = $self->dbh->selectrow_array($query, undef, $self->id);
 
-  return undef unless $max_transdate;
-  return ref $max_transdate ? $max_transdate : $self->db->parse_date($max_transdate);
+  return undef unless $date;
+  return ref $date ? $date : $self->db->parse_date($date);
 }
 
 sub calculate_invoice_dates {
   my ($self, %params) = @_;
 
-  my $cur_date   = $self->first_billing_date        || $self->start_date;
-  my $start_date = $self->get_previous_invoice_date || DateTime->new(year => 1970, month => 1, day => 1);
-  my $end_date   = $self->end_date                  || DateTime->today_local->add(years => 10);
   my $period_len = $self->get_period_length;
+  my $cur_date   = $self->first_billing_date || $self->start_date;
+  my $end_date   = $self->end_date           || DateTime->today_local->add(years => 10);
+  my $start_date = $params{past_dates} ? undef                       : $self->get_previous_billed_period_start_date;
+  $start_date    = $start_date         ? $start_date->add(days => 1) : $cur_date->clone;
 
   $start_date    = max($start_date, $params{start_date}) if $params{start_date};
   $end_date      = min($end_date,   $params{end_date})   if $params{end_date};
 
   my @dates;
 
-  while ($cur_date < $end_date) {
-    push @dates, $cur_date->clone if $cur_date > $start_date;
+  while ($cur_date <= $end_date) {
+    push @dates, $cur_date->clone if $cur_date >= $start_date;
 
     $cur_date->add(months => $period_len);
   }