/ - Diff - projekt kivitendo - wissen

       $cv_type_found = 'vendor' if $self->entry->record_type eq 'ap_transaction';
       $self->render(
         'email_journal/show',
         title    => $::locale->text('View email'),
         CUSTOMER_VENDOR => , $customer_vendor,
         CV_TYPE_FOUND => $cv_type_found,
         title                  => $::locale->text('View email'),
         CUSTOMER_VENDOR        => $customer_vendor,
         CV_TYPE_FOUND          => $cv_type_found,
         RECORD_TYPES_WITH_INFO => \@record_types_with_info,
         RECORD_TYPES_TO_TEXT   => \%record_types_to_text,
         back_to  => $back_to,
-...
     sub action_zugferd_import_with_attachment {
       my ($self) = @_;
       my $email_journal_id   = $::form->{email_journal_id};
       my $attachment_id      = $::form->{attachment_id};
       my $email_journal_id = $::form->{email_journal_id};
       my $attachment_id    = $::form->{attachment_id};
       die "no 'email_journal_id' was given" unless $email_journal_id;
       die "no 'attachment_id' was given"    unless $attachment_id;
       die t8("No attachment is selected")   unless $attachment_id;
       my $record_id   = $::form->{"record_id"};
       my $record_type = $::form->{"record_type"};
       die "ZUGFeRD-Import only implemented for ap transaction templates" unless $record_type == 'ap_transaction';
       my $attachment = SL::DB::EmailJournalAttachment->new(id => $attachment_id)->load();
       my $content = $attachment->content; # scalar ref
-...
         die(t8("Could not extract Factur-X/ZUGFeRD data, data and error message:") . " $res{'message'}");
+      }
       my $form_defaults = SL::Controller::ZUGFeRD->build_ap_transaction_form_defaults(\%res);
       my $vendor;
       if ($record_id) {
         my $ap_template = SL::DB::RecordTemplate->new(id => $record_id)->load();
         $vendor = $ap_template->vendor;
+      }
       my $form_defaults = SL::Controller::ZUGFeRD->build_ap_transaction_form_defaults(\%res, vendor => $vendor);
       $form_defaults->{email_journal_id}    = $email_journal_id;
       $form_defaults->{email_attachment_id} = $attachment_id;
       $form_defaults->{callback}            = $::form->{back_to};
-...
       flash_later('info',
         t8("The ZUGFeRD/Factur-X invoice '#1' has been loaded.", $attachment->name));
       $self->redirect_to(
         controller    => 'ap.pl',
         action        => 'load_zugferd',
         form_defaults => $form_defaults,
         controller         => 'ap.pl',
         action             => 'load_zugferd',
         record_template_id => $record_id,
         form_defaults      => $form_defaults,
       );
+    }
-...
         id => $attachment_id,
       )->load if $attachment_id;
       $self->js->hide('#zugferd_import_div');
       if ($attachment && $attachment->content =~ m/^%PDF|<\?xml/) {
         my $content = $attachment->content;
         my %res;
         if ( $content =~ m/^%PDF/ ) {
           %res = %{SL::ZUGFeRD->extract_from_pdf($content)};
         } else {
           %res = %{SL::ZUGFeRD->extract_from_xml($content)};
+        }
         if ($res{'result'} == SL::ZUGFeRD::RES_OK()) {
           $self->js->show('#zugferd_import_div');
+        }
+      }
       $self->js
         ->replaceWith('#attachment_preview',
           SL::Presenter::EmailJournal::attachment_preview(

+    }
     sub build_ap_transaction_form_defaults {
       my ($self, $data) = @_;
       my ($self, $data, %params) = @_;
       my $vendor = $params{vendor};
       my $parser = $data->{'invoice_xml'};
-...
       my $iban = $metadata{'iban'};
       my $invnumber = $metadata{'invnumber'};
       if ( ! ($metadata{'ustid'} or $metadata{'taxnumber'}) ) {
         die t8("Cannot process this invoice: neither VAT ID nor tax ID present.");
+      }
       if ($vendor) {
         if ($metadata{'ustid'} && $vendor->ustid && ($metadata{'ustid'} ne $vendor->ustid)) {
           $intnotes .= "\n" . t8('USt-IdNr.') . ': '
           . t8("Record VAT ID #1 doesn't match vendor VAT ID #2", $metadata{'ustid'}, $vendor->ustid);
+        }
         if ($metadata{'taxnumber'} && $vendor->taxnumber && ($metadata{'taxnumber'} ne $vendor->taxnumber)) {
           $intnotes .= "\n" . t8("Tax Number") . ': '
           . t8("Record tax ID #1 doesn't match vendor tax ID #2", $metadata{'taxnumber'}, $vendor->taxnumber);
+        }
       } else {
         if ( ! ($metadata{'ustid'} or $metadata{'taxnumber'}) ) {
           die t8("Cannot process this invoice: neither VAT ID nor tax ID present.");
+        }
       my $vendor = find_vendor($metadata{'ustid'}, $metadata{'taxnumber'});
         $vendor = find_vendor($metadata{'ustid'}, $metadata{'taxnumber'});
       die t8("Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor " .
               "#3 exists and whether it has the correct tax ID/VAT ID." ,
                $metadata{'ustid'},
                $metadata{'taxnumber'},
                $metadata{'vendor_name'},
       ) unless $vendor;
         die t8("Vendor with VAT ID (#1) and/or tax ID (#2) not found. Please check if the vendor " .
                 "#3 exists and whether it has the correct tax ID/VAT ID." ,
                  $metadata{'ustid'},
                  $metadata{'taxnumber'},
                  $metadata{'vendor_name'},
         ) unless $vendor;
+      }
       # Check IBAN specified on bill matches the one we've got in

           data  => sub {
             my $id = $_[0]->id;
             my $record_type = $_[0]->record_type;
             is_escaped(button_tag(
                 "kivi.EmailJournal.apply_action_with_attachment(
                 '$id', '$record_type');",
                 $::locale->text('Select'),
               ))
             if ($record_type eq 'ap_transaction' && ref $_[0] eq 'SL::DB::RecordTemplate') {
               return is_escaped(
                 button_tag(
                   "kivi.EmailJournal.apply_action_with_attachment(
                   '$id', '$record_type');",
                   $::locale->text('Select'),
+                )
                 . " " .
                 button_tag(
                   "kivi.EmailJournal.zugferd_import_with_attachment(
                   '$id', '$record_type');",
                   $::locale->text('Factur-X/ZUGFeRD import'),
+                )
               );
             } else {
               return is_escaped(button_tag(
                   "kivi.EmailJournal.apply_action_with_attachment(
                   '$id', '$record_type');",
                   $::locale->text('Select'),
                 ));
+            }
           },
         };
+      }

             "The ZUGFeRD/Factur-X invoice '#1' has been loaded.", $file_name));
+      }
       my $template_ap = SL::DB::Manager::RecordTemplate->get_first(where => [vendor_id => $::form->{form_defaults}->{vendor_id}]);
       my $template_ap;
       $template_ap ||= SL::DB::RecordTemplate->new(id => $::form->{record_template_id})->load()
         if $::form->{record_template_id};
       $template_ap ||= SL::DB::Manager::RecordTemplate->get_first(where => [vendor_id => $::form->{form_defaults}->{vendor_id}])
         if $::form->{form_defaults}->{vendor_id};
       if ($template_ap) {
         $::form->{id} = $template_ap->id;
         # set default values for items

         $.post("controller.pl", data, kivi.eval_json_result);
+      }
       ns.zugferd_import_with_attachment = function() {
       ns.zugferd_import_with_attachment = function(record_id, record_type) {
         let data = $('#record_action_form').serializeArray();
         data.push({ name: 'action', value: 'EmailJournal/zugferd_import_with_attachment' });
         data.push({ name: 'record_id', value: record_id });
         data.push({ name: 'record_type', value: record_type });
         $.post("controller.pl", data, kivi.eval_json_result);
+      }

       'No articles have been added yet.' => 'Es wurden noch keine Artikel hinzugefügt.',
       'No assembly has been selected yet.' => 'Es wurde noch kein Erzeugnis ausgewahlt.',
       'No attachment'               => 'Kein Anhang',
       'No attachment is selected'   => 'Kein Anhang ausgewählt',
       'No background job has been created yet.' => 'Es wurden noch keine Hintergrund-Jobs angelegt.',
       'No bank account chosen!'     => 'Kein Bankkonto ausgewählt!',
       'No bank account configured for bank code/BIC #1, account number/IBAN #2.' => 'Kein Bankkonto für BLZ/BIC #1, Kontonummer/IBAN #2 konfiguriert.',
-...
       'Reconciliation with bank'    => 'Kontenabgleich mit Bank',
       'Record IBAN #1 doesn\'t match vendor IBAN #2' => 'Beleg IBAN #1 stimmt nicht mit Lieferanten IBAN #2 überein',
       'Record Type'                 => 'Belegtyp',
       'Record VAT ID #1 doesn\'t match vendor VAT ID #2' => 'Beleg USt-IdNr. #1 stimmt nicht mit Lieferanten USt-IdNr. #2 überein',
       'Record Vendor Invoice'       => 'Einkaufsrechnung erfassen',
       'Record in'                   => 'Buchen auf',
       'Record number'               => 'Belegnummer',
       'Record numbers and dates'    => 'Belegnummern &amp; Datum',
       'Record numbers changeable'   => 'Änderbarkeit von Belegnummern',
       'Record tax ID #1 doesn\'t match vendor tax ID #2' => 'Beleg Steuernummer #1 stimmt nicht mit Lieferanten Steuernummer #2 überein',
       'Record templates'            => 'Belegvorlagen',
       'Record type to create'       => 'Anzulegender Belegtyp',
       'Record\'s files'             => 'Belegdateien',

       'No articles have been added yet.' => '',
       'No assembly has been selected yet.' => '',
       'No attachment'               => '',
       'No attachment is selected'   => '',
       'No background job has been created yet.' => '',
       'No bank account chosen!'     => '',
       'No bank account configured for bank code/BIC #1, account number/IBAN #2.' => '',
-...
       'Reconciliation with bank'    => '',
       'Record IBAN #1 doesn\'t match vendor IBAN #2' => '',
       'Record Type'                 => '',
       'Record VAT ID #1 doesn\'t match vendor VAT ID #2' => '',
       'Record Vendor Invoice'       => '',
       'Record in'                   => '',
       'Record number'               => '',
       'Record numbers and dates'    => '',
       'Record numbers changeable'   => '',
       'Record tax ID #1 doesn\'t match vendor tax ID #2' => '',
       'Record templates'            => '',
       'Record type to create'       => '',
       'Record\'s files'             => '',

           </div>
           [% END %]
           <div id="zugferd_import_div" style="display:none">
             <!-- get shown if the attachment is valid zugferd -->
             [% L.button_tag('kivi.EmailJournal.zugferd_import_with_attachment();',
               LxERP.t8('Factur-X/ZUGFeRD import'),
               style="margin-top:5px"
+              )
             %]
           </div>
         </div></div> <!-- action_div -->
         <div id="record_selection_div">
-...
                 [% LxERP.t8('Hide Records') %]
               </a>
               <div class="toggle_panel_block">
                 <div id="record_list">LxERP.t8("Loading...")</div>
                 <div id="record_list">[% LxERP.t8("Loading...") %]</div>
               </div>
             </div><!-- /.record_toggle -->
           </div><!-- record_div -->

           </div>
         </div>
         <div id="zugferd_import_div" style="display:none">
           <!-- get shown if the attachment is valid zugferd -->
           [% L.button_tag('kivi.EmailJournal.zugferd_import_with_attachment();',
             LxERP.t8('Factur-X/ZUGFeRD import'),
             style="margin-top:5px"
+            )
           %]
         </div>
       </tr> <tr>
         <td>
         <div id="record_selection_div">
-...
                 [% LxERP.t8('Hide Records') %]
               </a>
               <div class="toggle_panel_block">
                 <div id="record_list">LxERP.t8("Loading...")</div>
                 <div id="record_list">[% LxERP.t8("Loading...") %]</div>
               </div>
             </div><!-- /.record_toggle -->
           </div><!-- record_div -->

Projekt

Allgemein

Profil

projekt kivitendo

Revision 6aa3c3ea

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt