X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCreatePeriodicInvoices.pm;h=fa5d649357965257c3f9b95fe06b158370146866;hb=db3b23aa8ab6baaa3854259b59b033fbd23541ad;hp=474762d86c1b596c699315c36e531d93be53eb08;hpb=87e65e6c1cc64bfb2d73b6914ed2ef136861dd42;p=kivitendo-erp.git

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index 474762d86..fa5d64935 100644
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -8,6 +8,7 @@ use Config::Std;
 use English qw(-no_match_vars);
 
 use SL::DB::AuthUser;
+use SL::DB::Default;
 use SL::DB::Order;
 use SL::DB::Invoice;
 use SL::DB::PeriodicInvoice;
@@ -64,9 +65,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 {
@@ -141,6 +142,18 @@ sub _create_periodic_invoice {
 
     $invoice->post(ar_id => $config->ar_chart_id) || die;
 
+    # like $form->add_shipto, but we don't need to check for a manual exception,
+    # because we can already assume this (otherwise no shipto_id from order)
+    if ($order->shipto_id) {
+
+      my $shipto_oe = SL::DB::Manager::Shipto->find_by(shipto_id => $order->shipto_id);
+      my $shipto_ar = $shipto_oe->clone_and_reset;
+
+      $shipto_ar->module('AR');            # alter module OE -> AR
+      $shipto_ar->trans_id($invoice->id);  # alter trans_id -> new id from invoice
+      $shipto_ar->save;
+    }
+
     $order->link_to_record($invoice);
 
     SL::DB::PeriodicInvoice->new(config_id         => $config->id,
@@ -202,7 +215,7 @@ sub _send_email {
   return unless $template;
 
   my $email_template = $config{periodic_invoices}->{email_template};
-  my $filename       = $email_template || ( ($user->get_config_value('templates') || "templates/webpages") . "/periodic_invoices_email.txt" );
+  my $filename       = $email_template || ( (SL::DB::Default->get->templates || "templates/webpages") . "/periodic_invoices_email.txt" );
   my %params         = ( POSTED_INVOICES  => $posted_invoices,
                          PRINTED_INVOICES => $printed_invoices );
 
@@ -232,7 +245,8 @@ 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;