X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FGoBD.pm;h=50d56a9661158456245f32a4453f9b2e806418c7;hb=1cbc459da604c31d21593df298a522e6cbe69e2b;hp=2992b5f4edd3cee4bd8a905ac4d33fd121bfaddb;hpb=b019bd393629352431702f8d0d9f122508ec56ca;p=kivitendo-erp.git

diff --git a/SL/GoBD.pm b/SL/GoBD.pm
index 2992b5f4e..50d56a966 100644
--- a/SL/GoBD.pm
+++ b/SL/GoBD.pm
@@ -85,12 +85,12 @@ my %datev_column_defs = (
   taxkey            => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Taxkey'), },
   tax_accname       => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Tax Account Name'), },
   tax_accno         => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Tax Account'), },
-  transdate         => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Invoice Date'), },
+  transdate         => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Transdate'), },
   vcnumber          => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Customer/Vendor Number'), },
   customer_id       => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Customer (database ID)'), },
   vendor_id         => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Vendor (database ID)'), },
   itime             => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Create Date'), },
-  gldate            => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Booking Date'), },
+  gldate            => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Gldate'), },
 );
 
 my @datev_columns = qw(
@@ -417,7 +417,7 @@ sub do_datev_csv_export {
 
   my $datev = SL::DATEV->new(from => $self->from, to => $self->to);
 
-  $datev->_get_transactions(from_to => $datev->fromto);
+  $datev->generate_datev_data(from_to => $datev->fromto);
 
   if ($datev->errors) {
     die [ $datev->errors ];
@@ -549,7 +549,7 @@ sub do_csv_export {
   my $query = "SELECT " . join(', ', @select_tokens) . " FROM $table $where_clause";
 
   my $sth = $::form->get_standard_dbh->prepare($query);
-  $sth->execute(@values) or die "error executing query $query: " . $sth->errstr;
+  $sth->execute(@values) or $::form->dberror($query);
 
   while (my $row = $sth->fetch) {
     for my $keep_col (@{ $known_tables{$table}{keep} || [] }) {