Merge branch 'master' into currency

[kivitendo-erp.git] / SL / BackgroundJob / CreatePeriodicInvoices.pm

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index dc7fd79..a316c3a 100644 (file)
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -22,7 +22,7 @@ sub run {
   my $self        = shift;
   $self->{db_obj} = shift;
 
-  my $configs = SL::DB::Manager::PeriodicInvoicesConfig->get_all(where => [ active => 1 ]);
+  my $configs = SL::DB::Manager::PeriodicInvoicesConfig->get_all(query => [ active => 1 ]);
 
   foreach my $config (@{ $configs }) {
     my $new_end_date = $config->handle_automatic_extension;
@@ -64,9 +64,9 @@ sub run {
 }
 
 sub _log_msg {
-  # my $message  = join('', @_);
-  # $message    .= "\n" unless $message =~ m/\n$/;
-  # $::lxdebug->message(0, $message);
+  my $message  = join('', @_);
+  $message    .= "\n" unless $message =~ m/\n$/;
+  $::lxdebug->message(LXDebug::DEBUG1(), $message);
 }
 
 sub _generate_time_period_variables {
@@ -75,8 +75,8 @@ sub _generate_time_period_variables {
   my $period_end_date   = $period_start_date->clone->truncate(to => 'month')->add(months => $config->get_period_length)->subtract(days => 1);
 
   my @month_names       = ('',
-                           'Januar', 'Februar', 'März',      'April',   'Mai',      'Juni',
-                           'Juli',   'August',  'September', 'Oktober', 'November', 'Dezember');
+                           $::locale->text('January'), $::locale->text('February'), $::locale->text('March'),     $::locale->text('April'),   $::locale->text('May'),      $::locale->text('June'),
+                           $::locale->text('July'),    $::locale->text('August'),   $::locale->text('September'), $::locale->text('October'), $::locale->text('November'), $::locale->text('December'));
 
   my $vars = { current_quarter     => $period_start_date->quarter,
                previous_quarter    => $period_start_date->clone->subtract(months => 3)->quarter,
@@ -184,7 +184,7 @@ sub _calculate_dates {
 sub _send_email {
   my ($posted_invoices, $printed_invoices) = @_;
 
-  read_config 'config/periodic_invoices.conf' => my %config;
+  my %config = %::lx_office_conf;
 
   return if !$config{periodic_invoices} || !$config{periodic_invoices}->{send_email_to} || !scalar @{ $posted_invoices };
 
@@ -232,15 +232,16 @@ sub _print_invoice {
   $form->{formname}     = $form->{type};
   $form->{format}       = 'pdf';
   $form->{media}        = 'printer';
-  $form->{OUT}          = "| " . $config->printer->printer_command;
+  $form->{OUT}          = $config->printer->printer_command;
+  $form->{OUT_MODE}     = '|-';
 
   $form->prepare_for_printing;
 
   $form->throw_on_error(sub {
     eval {
-      $form->parse_template(\%::myconfig, $::userspath);
+      $form->parse_template(\%::myconfig);
       1;
-    } || die $EVAL_ERROR->{error};
+    } || die $EVAL_ERROR->getMessage;
   });
 }