/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 4f0087b8

Von Bernd Bleßmann vor fast 4 Jahren hinzugefügt

ID 4f0087b87f8c92049cc07aa6f3cf79ce8033e098
Vorgänger 2dc3a3f1
Nachfolger 05f4e6eb

Mahnungen: DMS/WebDAV: erzeugte Dokumente zum Mahnlauf ablegen …

und nicht zur gemahnten Rechnung.

       $self->print_dunning($myconfig, $form, $dunning_id, $dbh);
       if ($print_invoice) {
         $self->print_original_invoice($myconfig, $form, $_) for @invoice_ids;
         $self->print_original_invoice($myconfig, $form, $dunning_id, $_) for @invoice_ids;
+      }
       if ($send_email) {
-...
       $dunning_id =~ s|[^\d]||g;
       my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates, @dunned_invoices);
       my ($language_tc, $output_numberformat, $output_dateformat, $output_longdates);
       if ($form->{"language_id"}) {
         ($language_tc, $output_numberformat, $output_dateformat, $output_longdates) =
           AM->get_language_details($myconfig, $form, $form->{language_id});
-...
              ar.transdate,       ar.duedate,      ar.customer_id,
              ar.invnumber,       ar.ordnumber,    ar.cp_id,
              ar.amount,          ar.netamount,    ar.paid,
              ar.employee_id,     ar.salesman_id,  ar.id AS dunned_invoice_id,
              ar.employee_id,     ar.salesman_id,
              (SELECT cu.name FROM currencies cu WHERE cu.id = ar.currency_id) AS curr,
              (SELECT description from department WHERE id = ar.department_id) AS department,
              ar.amount - ar.paid AS open_amount,
-...
         map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal);
         map { $form->{$_} = $ref->{$_} } keys %$ref;
         map { push @{ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} }, $ref->{$_} } keys %$ref;
         push @dunned_invoices, {id => $ref->{dunned_invoice_id}, invnumber => $ref->{invnumber}};
+      }
       $sth->finish();
-...
       # this generates the file in the spool directory
       $form->parse_template($myconfig);
       # save dunning pdf in filemanagement/webdav for each invoice
       foreach my $dunned_invoice (@dunned_invoices) {
         if ($::instance_conf->get_doc_storage) {
           SL::File->save(
             object_id   => $dunned_invoice->{id},
             object_type => $form->{attachment_type},
             mime_type   => 'application/pdf',
             source      => 'created',
             file_type   => 'document',
             file_name   => $form->{attachment_filename},
             file_path   => "${spool}/$filename",
           );
+        }
         if ($::instance_conf->get_webdav_documents) {
           my $webdav = SL::Webdav->new(
             type     => 'invoice',
             number   => $dunned_invoice->{invnumber},
           );
           my $webdav_file = SL::Webdav::File->new(
             webdav   => $webdav,
             filename => $form->{attachment_filename},
           );
           $webdav_file->store(file => "${spool}/$filename");
+        }
       # save dunning pdf in filemanagement/webdav
       if ($::instance_conf->get_doc_storage) {
         SL::File->save(
           object_id   => $dunning_id,
           object_type => 'dunning',
           mime_type   => 'application/pdf',
           source      => 'created',
           file_type   => 'document',
           file_name   => $form->{attachment_filename},
           file_path   => "${spool}/$filename",
         );
+      }
       if ($::instance_conf->get_webdav_documents) {
         my $webdav = SL::Webdav->new(
           type     => 'dunning',
           number   => $dunning_id,
         );
         my $webdav_file = SL::Webdav::File->new(
           webdav   => $webdav,
           filename => $form->{attachment_filename},
         );
         $webdav_file->store(file => "${spool}/$filename");
+      }
       $main::lxdebug->leave_sub();
-...
       push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename",
                                                'name' => $attachment_filename };
       # save dunning fee pdf in filemanagement/webdav for each dunned invoice
       if ($::instance_conf->get_doc_storage || $::instance_conf->get_webdav_documents) {
         $query              = qq|SELECT trans_id, invnumber FROM dunning LEFT JOIN ar ON (ar.id = trans_id) WHERE dunning_id = ?|;
         my $dunned_invoices = selectall_hashref_query($form, $dbh, $query, $dunning_id);
         foreach my $dunned_invoice (@$dunned_invoices) {
           if ($::instance_conf->get_doc_storage) {
             SL::File->save(
               object_id   => $dunned_invoice->{trans_id},
               object_type => 'dunning',
               mime_type   => 'application/pdf',
               source      => 'created',
               file_type   => 'document',
               file_name   => $attachment_filename,
               file_path   => "${spool}/$filename",
             );
+          }
           if ($::instance_conf->get_webdav_documents) {
             my $webdav = SL::Webdav->new(
               type     => 'invoice',
               number   => $dunned_invoice->{invnumber},
             );
             my $webdav_file = SL::Webdav::File->new(
               webdav   => $webdav,
               filename => $attachment_filename,
             );
             $webdav_file->store(file => "${spool}/$filename");
+          }
+        }
       # save dunning fee pdf in filemanagement/webdav
       if ($::instance_conf->get_doc_storage) {
         SL::File->save(
           object_id   => $dunning_id,
           object_type => 'dunning',
           mime_type   => 'application/pdf',
           source      => 'created',
           file_type   => 'document',
           file_name   => $attachment_filename,
           file_path   => "${spool}/$filename",
         );
+      }
       if ($::instance_conf->get_webdav_documents) {
         my $webdav = SL::Webdav->new(
           type     => 'dunning',
           number   => $dunning_id,
         );
         my $webdav_file = SL::Webdav::File->new(
           webdav   => $webdav,
           filename => $attachment_filename,
         );
         $webdav_file->store(file => "${spool}/$filename");
+      }
       $main::lxdebug->leave_sub();
-...
+    }
     sub print_original_invoice {
       my ($self, $myconfig, $form, $invoice_id) = @_;
       my ($self, $myconfig, $form, $dunning_id, $invoice_id) = @_;
       # get one invoice as object and print to pdf
       my $invoice = SL::DB::Invoice->new(id => $invoice_id)->load;
-...
       $form->{recipient_locale}  = $saved_reicpient_locale;
       # save original invoice pdf in filemanagement/webdav for dunned invoice
       # save original invoice pdf in filemanagement/webdav for dunning
       if ($::instance_conf->get_doc_storage) {
         SL::File->save(
           object_id   => $invoice_id,
           object_type => 'dunning_orig_invoice',
           object_id   => $dunning_id,
           object_type => 'dunning',
           mime_type   => 'application/pdf',
           source      => 'created',
           file_type   => 'document',
-...
+      }
       if ($::instance_conf->get_webdav_documents) {
         my $webdav = SL::Webdav->new(
           type     => 'invoice',
           number   => $invoice->invnumber,
           type     => 'dunning',
           number   => $dunning_id,
         );
         my $webdav_file = SL::Webdav::File->new(
           webdav   => $webdav,

SL/Webdav.pm
34	34	accounts_payable => 'kreditorenbuchungen',
35	35	customer => 'kunden',
36	36	vendor => 'lieferanten',
	37	dunning => 'mahnungen',
37	38	);
38	39
39	40	sub get_all_files {

+        }
         if ($::instance_conf->get_doc_storage) {
           # object_types dunning1-dunning3 are the dunnings for the according levels.
           my @files  = SL::File->get_all_versions(object_id   => $ref->{id},
                                                   object_type => 'dunning' . $ref->{dunning_level},
                                                   file_type   => 'document',);
           # object_type  dunning is the dunning invoice with the fees.
           push @files, SL::File->get_all_versions(object_id   => $ref->{id},
           my @files  = SL::File->get_all_versions(object_id   => $ref->{dunning_id},
                                                   object_type => 'dunning',
                                                   file_type   => 'document',);
           # object_type  dunning_orig_invoice is the original dunned invoice.
           push @files, SL::File->get_all_versions(object_id   => $ref->{id},
                                                   object_type => 'dunning_orig_invoice',
                                                   file_type   => 'document',);
           if (scalar @files) {
             my $html          = join '<br>', map { SL::Presenter::FileObject::file_object($_) } @files;
             my $text          = join "\n",   map { $_->file_name                              } @files;
-...
         # print original dunned invoices, if they where printed on dunning run
         my $dunnings = SL::DB::Manager::Dunning->get_all(where => [dunning_id => $dunning_id, original_invoice_printed => 1]);
         DN->print_original_invoice(\%myconfig, $form, $_->trans_id) for @$dunnings;
         DN->print_original_invoice(\%myconfig, $form, $dunning_id, $_->trans_id) for @$dunnings;
         $i++;
+      }

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 4f0087b8

Von Bernd Bleßmann vor fast 4 Jahren hinzugefügt