MassRecordCreationAndPrinting - MassInvoiceCreatePrint: Auftrag schliessen

diff --git a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
index 371e587f7b63b474c60ab2e134ab247faa977179..ebd20e13e8fc0a432b314a496e64ac7401bea021 100644 (file)
--- a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
+++ b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
@@ -11,6 +11,7 @@ use SL::DB::Invoice;
 use SL::DB::Printer;
 use SL::SessionFile;
 use SL::Template;
 use SL::DB::Printer;
 use SL::SessionFile;
 use SL::Template;

+use SL::ARAP;

 use SL::Locale::String qw(t8);
 use SL::Helper::MassPrintCreatePDF qw(:all);
 use SL::Helper::CreatePDF qw(:all);
 use SL::Locale::String qw(t8);
 use SL::Helper::MassPrintCreatePDF qw(:all);
 use SL::Helper::CreatePDF qw(:all);


@@ -41,6 +42,7 @@ sub create_invoices {
 
   my $job_obj = $self->{job_obj};
   my $db      = $job_obj->db;
 
   my $job_obj = $self->{job_obj};
   my $db      = $job_obj->db;

+  my $dbh     = SL::DB->client->dbh;

 
   $job_obj->set_data(status => CONVERTING_DELIVERY_ORDERS())->save;
 
 
   $job_obj->set_data(status => CONVERTING_DELIVERY_ORDERS())->save;
 


@@ -55,6 +57,11 @@ sub create_invoices {
       my $invoice              = $sales_delivery_order->convert_to_invoice(%conversion_params);
 
       die $db->error if !$invoice;
       my $invoice              = $sales_delivery_order->convert_to_invoice(%conversion_params);
 
       die $db->error if !$invoice;

+
+      ARAP->close_orders_if_billed('dbh'     => $dbh,
+                                   'arap_id' => $invoice->id,
+                                   'table'   => 'ar',);
+

       # update shop status
       my @linked_shop_orders = $invoice->linked_records(
         from      => 'ShopOrder',
       # update shop status
       my @linked_shop_orders = $invoice->linked_records(
         from      => 'ShopOrder',

diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index 09812601595ec125c97dcc5dd77c6edd2c0e1abe..bfaf0a29035576423581f4abfedc894c789564b7 100644 (file)
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -19,6 +19,7 @@ use SL::Helper::File qw(store_pdf append_general_pdf_attachments doc_storage_ena
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::SessionFile;
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::SessionFile;

+use SL::ARAP;

 use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (
 use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (


@@ -57,6 +58,7 @@ sub action_create_invoices {
   }
 
   my $db = SL::DB::Invoice->new->db;
   }
 
   my $db = SL::DB::Invoice->new->db;

+  my $dbh = SL::DB->client->dbh;

   my @invoices;
   my @already_closed_delivery_orders;
 
   my @invoices;
   my @already_closed_delivery_orders;
 


@@ -73,6 +75,11 @@ sub action_create_invoices {
 
       } else {
         my $invoice = $delivery_order->convert_to_invoice() || die $db->error;
 
       } else {
         my $invoice = $delivery_order->convert_to_invoice() || die $db->error;

+
+        ARAP->close_orders_if_billed('dbh'     => $dbh,
+                                     'arap_id' => $invoice->id,
+                                     'table'   => 'ar',);
+

         push @invoices, $invoice;
       }
     }
         push @invoices, $invoice;
       }
     }