GoBD: Bei unbalanced ledger Fehlern abbrechen und Fehler zeigen

diff --git a/SL/Controller/GoBD.pm b/SL/Controller/GoBD.pm
index 463c6d743dc84885755c6720bbf0946630a9c59b..a151adb0c741bb7c2d898858268960d7322f06dd 100644 (file)
--- a/SL/Controller/GoBD.pm
+++ b/SL/Controller/GoBD.pm
@@ -35,6 +35,7 @@ sub action_export {
     return;
   }
 
     return;
   }
 

+  my $filename;

   my $gobd = SL::GoBD->new(
     company    => $::instance_conf->get_company,
     location   => $::instance_conf->get_address,
   my $gobd = SL::GoBD->new(
     company    => $::instance_conf->get_company,
     location   => $::instance_conf->get_address,


@@ -42,7 +43,16 @@ sub action_export {
     to         => $self->to,
   );
 
     to         => $self->to,
   );
 

-  my $filename = $gobd->generate_export;
+  eval {
+    $filename = $gobd->generate_export;
+  } or do {
+    my $errors = $@;
+    flash('error', t8('The export failed because of malformed transactions. Please fix those before exporting.'));
+
+    $::lxdebug->dump(0,  "GoBD errors:", \@$errors);
+    $self->action_filter;
+    return;
+  };

 
   $self->send_file($filename, name => t8('gobd-#1-#2.zip', $self->from->ymd, $self->to->ymd), unlink => 1);
 }
 
   $self->send_file($filename, name => t8('gobd-#1-#2.zip', $self->from->ymd, $self->to->ymd), unlink => 1);
 }

diff --git a/SL/GoBD.pm b/SL/GoBD.pm
index e8a055891e5457c43eb8f2a2f15a2977f62bb71e..2992b5f4edd3cee4bd8a905ac4d33fd121bfaddb 100644 (file)
--- a/SL/GoBD.pm
+++ b/SL/GoBD.pm
@@ -419,6 +419,10 @@ sub do_datev_csv_export {
 
   $datev->_get_transactions(from_to => $datev->fromto);
 
 
   $datev->_get_transactions(from_to => $datev->fromto);
 

+  if ($datev->errors) {
+    die [ $datev->errors ];
+  }
+

   for my $transaction (@{ $datev->{DATEV} }) {
     for my $entry (@{ $transaction }) {
       $entry->{sortkey} = join '-', map { lc } (DateTime->from_kivitendo($entry->{transdate})->strftime('%Y%m%d'), $entry->{name}, $entry->{reference});
   for my $transaction (@{ $datev->{DATEV} }) {
     for my $entry (@{ $transaction }) {
       $entry->{sortkey} = join '-', map { lc } (DateTime->from_kivitendo($entry->{transdate})->strftime('%Y%m%d'), $entry->{name}, $entry->{reference});

diff --git a/locale/de/all b/locale/de/all
index 82715cf9076ef615854aa24790eb883268efb41a..b4038f0c9816b175938e89ad5368489f3a5cdd9a 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2904,6 +2904,7 @@ $self->{texts} = {
   'The execution schedule is invalid.' => 'Der Ausführungszeitplan ist ungültig.',
   'The execution type is invalid.' => 'Der Ausführungstyp ist ungültig.',
   'The existing record has been created from the link target to add.' => 'Der bestehende Beleg wurde aus dem auszuwählenden Verknüpfungsziel erstellt.',
   'The execution schedule is invalid.' => 'Der Ausführungszeitplan ist ungültig.',
   'The execution type is invalid.' => 'Der Ausführungstyp ist ungültig.',
   'The existing record has been created from the link target to add.' => 'Der bestehende Beleg wurde aus dem auszuwählenden Verknüpfungsziel erstellt.',

+  'The export failed because of malformed transactions. Please fix those before exporting.' => 'Es sind fehlerhafte Buchungen im Exportzeitraum vorhanden. Bitte korrigieren Sie diese vor dem Export.',

   'The factor is missing in row %d.' => 'Der Faktor fehlt in Zeile %d.',
   'The factor is missing.'      => 'Der Faktor fehlt.',
   'The file has been sent to the printer.' => 'Die Datei wurde an den Drucker geschickt.',
   'The factor is missing in row %d.' => 'Der Faktor fehlt in Zeile %d.',
   'The factor is missing.'      => 'Der Faktor fehlt.',
   'The file has been sent to the printer.' => 'Die Datei wurde an den Drucker geschickt.',