X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FGoBD.pm;h=9c95a0ae39a362e1e46934900944c228d6a3d111;hb=f05bd96b031d7d4ffaf4804704684ae929a0890a;hp=45f055f8545536e40067370968143573af71d397;hpb=e2332bfd203a5d9925034dfdd90a15b3c9c66044;p=kivitendo-erp.git diff --git a/SL/GoBD.pm b/SL/GoBD.pm index 45f055f85..9c95a0ae3 100644 --- a/SL/GoBD.pm +++ b/SL/GoBD.pm @@ -19,6 +19,7 @@ use List::UtilsBy qw(partition_by sort_by); use SL::DB::Helper::ALL; # since we work on meta data, we need everything use SL::DB::Helper::Mappings; use SL::Locale::String qw(t8); +use SL::Version; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(from to writer company location) ], @@ -85,12 +86,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 +418,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 ]; @@ -579,7 +580,7 @@ sub tag { sub make_comment { my $gobd_version = API_VERSION(); - my $kivi_version = $::form->read_version; + my $kivi_version = SL::Version->get_version; my $person = $::myconfig{name}; my $contact = join ', ', (t8("Email") . ": $::myconfig{email}" ) x!! $::myconfig{email},