X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fsepa.pl;h=f559c604b56f3003d1c8c52383030787c7450446;hb=8084ef359515031ec8429b49baf0ab09858f55d2;hp=f6041fbcde8a851a825ad5334d298dd943133083;hpb=57463eed482c9f107a6bb35d8b24d666175570a3;p=kivitendo-erp.git diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl index f6041fbcd..f559c604b 100755 --- a/bin/mozilla/sepa.pl +++ b/bin/mozilla/sepa.pl @@ -113,7 +113,7 @@ sub bank_transfer_create { } if ($error_message || !$form->{confirmation}) { - my @vc_ids = uniq map { $_->{"${vc}_id"} } @bank_transfers; + my @vc_ids = uniq map { $_->{vc_id} } @bank_transfers; $vc_bank_info ||= CT->get_bank_info('vc' => $vc, 'id' => \@vc_ids); my @vc_bank_info = sort { lc $a->{name} cmp lc $b->{name} } values %{ $vc_bank_info }; @@ -136,7 +136,7 @@ sub bank_transfer_create { } else { foreach my $bank_transfer (@bank_transfers) { foreach (qw(iban bic)) { - $bank_transfer->{"vc_${_}"} = $vc_bank_info->{ $bank_transfer->{"${vc}_id"} }->{$_}; + $bank_transfer->{"vc_${_}"} = $vc_bank_info->{ $bank_transfer->{vc_id} }->{$_}; $bank_transfer->{"our_${_}"} = $bank_account->{$_}; } @@ -248,6 +248,7 @@ sub bank_transfer_list { 'attachment_basename' => $locale->text('banktransfers') . strftime('_%Y%m%d', localtime time), ); $report->set_options_from_form(); + $locale->set_numberformat_wo_thousands_separator(\%::myconfig) if lc($report->{options}->{output_format}) eq 'csv'; $report->set_columns(%column_defs); $report->set_column_order(@columns); @@ -480,7 +481,7 @@ sub bank_transfer_download_sepa_xml { my $sepa_xml = SL::SEPA::XML->new('company' => $myconfig->{company}, 'creditor_id' => $myconfig->{sepa_creditor_id}, - 'src_charset' => $main::dbcharset || 'ISO-8859-15', + 'src_charset' => $::lx_office_conf{system}->{dbcharset} || 'ISO-8859-15', 'message_id' => $message_id, 'grouped' => 1, 'collection' => $vc eq 'customer',