Revert "CVars: in Artikelstammdaten sind alle CVars gültig"

[mfinanz.git] / SL / DATEV.pm

diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index e5efcf7130882b1a2ea9b46b8b32d7cb23c4c36b..51fe4bde59a142b57e76793e45bda6d08c4a8d74 100644 (file)
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -35,6 +35,7 @@ use SL::DATEV::KNEFile;
 use SL::DATEV::CSV;
 use SL::DB;
 use SL::HTML::Util ();
 use SL::DATEV::CSV;
 use SL::DB;
 use SL::HTML::Util ();

+use SL::Iconv;

 use SL::Locale::String qw(t8);
 
 use Data::Dumper;
 use SL::Locale::String qw(t8);
 
 use Data::Dumper;


@@ -373,29 +374,53 @@ sub csv_export {
 
   if ($self->exporttype == DATEV_ET_BUCHUNGEN) {
 
 
   if ($self->exporttype == DATEV_ET_BUCHUNGEN) {
 

-  $self->generate_datev_data(from_to => $self->fromto);
-  return if $self->errors;
-  my $datev_ref;
-  ($datev_ref, $self->{warnings}) = SL::DATEV::CSV->new(datev_lines  => $self->generate_datev_lines,
-                                                       from         => $self->from,
-                                                       to           => $self->to,
-                                                       locked       => $self->locked,
-                                                      );
+    $self->generate_datev_data(from_to => $self->fromto);
+    return if $self->errors;
+
+    my $datev_csv = SL::DATEV::CSV->new(
+      datev_lines  => $self->generate_datev_lines,
+      from         => $self->from,
+      to           => $self->to,
+      locked       => $self->locked,
+    );
+
+
+    my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv";
+
+    my $csv = Text::CSV_XS->new({
+                binary       => 1,
+                sep_char     => ";",
+                always_quote => 1,
+                eol          => "\r\n",
+              }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag();
+
+    # get encoding from defaults - use cp1252 if DATEV strict export is used
+    my $enc = ($::instance_conf->get_datev_export_format eq 'cp1252') ? 'cp1252' : 'utf-8';
+    my $csv_file = IO::File->new($self->export_path . '/' . $filename, ">:encoding($enc)") or die "Can't open: $!";
+
+    $csv->print($csv_file, $_) for @{ $datev_csv->header };
+    $csv->print($csv_file, $_) for @{ $datev_csv->lines  };
+    $csv_file->close;
+    $self->{warnings} = $datev_csv->warnings;
+
+    # convert utf-8 to cp1252//translit if set
+    if ($::instance_conf->get_datev_export_format eq 'cp1252-translit') {
+
+      my $filename_translit = "EXTF_DATEV_kivitendo_translit" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv";
+      open my $fh_in,  '<:encoding(UTF-8)',  $self->export_path . '/' . $filename or die "could not open $filename for reading: $!";
+      open my $fh_out, '>', $self->export_path . '/' . $filename_translit         or die "could not open $filename_translit for writing: $!";

 
 

-  my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv";
+      my $converter = SL::Iconv->new("utf-8", "cp1252//translit");

 
 

-  my $csv = Text::CSV_XS->new({
-              binary       => 1,
-              sep_char     => ";",
-              always_quote => 1,
-              eol          => "\r\n",
-            }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag();
+      print $fh_out $converter->convert($_) while <$fh_in>;
+      close $fh_in;
+      close $fh_out;

 
 

-  my $csv_file = IO::File->new($self->export_path . '/' . $filename, '>:encoding(cp1252)') or die "Can't open: $!";
-  $csv->print($csv_file, $_) for @{ $datev_ref };
-  $csv_file->close;
+      unlink $self->export_path . '/' . $filename or warn "Could not unlink $filename: $!";
+      $filename = $filename_translit;
+    }

 
 

-  return { download_token => $self->download_token, filenames => $filename };
+    return { download_token => $self->download_token, filenames => $filename };

 
   } elsif ($self->exporttype == DATEV_ET_STAMM) {
     die 'will never be implemented';
 
   } elsif ($self->exporttype == DATEV_ET_STAMM) {
     die 'will never be implemented';


@@ -408,7 +433,7 @@ sub csv_export {
     die 'unrecognized exporttype';
   }
 
     die 'unrecognized exporttype';
   }
 

-return $result;
+  return $result;

 }
 
 sub obe_export {
 }
 
 sub obe_export {


@@ -549,7 +574,7 @@ sub generate_datev_data {
        UNION ALL
 
        SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo,
        UNION ALL
 
        SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo,

-         gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date,
+         gl.reference AS invnumber, NULL AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date,

          gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id,
          c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
          FALSE AS invoice,
          gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id,
          c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
          FALSE AS invoice,


@@ -1026,7 +1051,6 @@ sub generate_datev_lines {
         $datev_data{belegfeld2} = $transaction->[$haben]->{'duedate'};
       }
     }
         $datev_data{belegfeld2} = $transaction->[$haben]->{'duedate'};
       }
     }

-    $datev_data{soll_haben_kennzeichen} = (0 < $umsatz) ? 'H' : 'S';

     $datev_data{umsatz} = abs($umsatz); # sales invoices without tax have a different sign???
 
     # Dies ist die einzige Stelle die datevautomatik auswertet. Was soll gesagt werden?
     $datev_data{umsatz} = abs($umsatz); # sales invoices without tax have a different sign???
 
     # Dies ist die einzige Stelle die datevautomatik auswertet. Was soll gesagt werden?


@@ -1047,7 +1071,7 @@ sub generate_datev_lines {
       $datev_data{buchungsschluessel} = $taxkey;
     }
 
       $datev_data{buchungsschluessel} = $taxkey;
     }
 

-    push(@datev_lines, \%datev_data);
+    push(@datev_lines, \%datev_data) if $datev_data{umsatz};

   }
 
   # example of modifying export data:
   }
 
   # example of modifying export data:


@@ -1405,6 +1429,8 @@ sub csv_export_for_tax_accountant {
 sub check_vcnumbers_are_valid_pk_numbers {
   my ($self) = @_;
 
 sub check_vcnumbers_are_valid_pk_numbers {
   my ($self) = @_;
 

+  # better use a class variable and set this in sub new (also needed in DATEV::CSV)
+  # calculation is also a bit more sane in sub check_valid_length_of_accounts

   my $length_of_accounts = length(SL::DB::Manager::Chart->get_first(where => [charttype => 'A'])->accno) // 4;
   my $pk_length = $length_of_accounts + 1;
   my $query = <<"SQL";
   my $length_of_accounts = length(SL::DB::Manager::Chart->get_first(where => [charttype => 'A'])->accno) // 4;
   my $pk_length = $length_of_accounts + 1;
   my $query = <<"SQL";


@@ -1426,7 +1452,7 @@ sub check_valid_length_of_accounts {
 SQL
 
   my $accno_length = selectall_hashref_query($::form, SL::DB->client->dbh, $query);
 SQL
 
   my $accno_length = selectall_hashref_query($::form, SL::DB->client->dbh, $query);

-  if (1 < keys $accno_length) {
+  if (1 < scalar @$accno_length) {

     $::form->error(t8("Invalid combination of ledger account number length." .
                       " Mismatch length of #1 with length of #2. Please check your account settings. ",
                       $accno_length->[0]->{char_length}, $accno_length->[1]->{char_length}));
     $::form->error(t8("Invalid combination of ledger account number length." .
                       " Mismatch length of #1 with length of #2. Please check your account settings. ",
                       $accno_length->[0]->{char_length}, $accno_length->[1]->{char_length}));


@@ -1632,33 +1658,6 @@ Example:
   # };
 
 
   # };
 
 

-=item csv_buchungsexport
-
-Generates the CSV-Format data for the CSV DATEV export and returns
-an 2-dimensional array as an array_ref.
-
-Requires $self->fromto for a valid DATEV header.
-
-Furthermore we assume that the first day of the fiscal year is
-the first of January and we cannot guarantee that our data in kivitendo
-is locked, that means a booking cannot be modified after a defined (vat tax)
-period.
-Some validity checks (max_length and regex) will be done if the
-data structure contains them and the field is defined.
-
-To add or alter the structure of the data take a look at SL::DATEV::CSV.pm
-
-=item _csv_buchungsexport_to_file
-
-Generates one downloadable csv file wrapped in a zip archive.
-Basically this method is just a thin wrapper for TEXT::CSV_XS.pm
-
-Generates a CSV-file with the same encodings as defined in DATEV Format CSV 2015:
- $ file
- $ EXTF_Buchungsstapel.csv: ISO-8859 text, with very long lines, with CRLF line terminators
-
-Usage: _csv_buchungsexport_to_file($self, data => $self->csv_buchungsexport);
-

 =item check_vcnumbers_are_valid_pk_numbers
 
 Returns 1 if all vcnumbers are suitable for the DATEV export, 0 if not.
 =item check_vcnumbers_are_valid_pk_numbers
 
 Returns 1 if all vcnumbers are suitable for the DATEV export, 0 if not.