projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
sepa.pl
diff --git
a/bin/mozilla/sepa.pl
b/bin/mozilla/sepa.pl
index
fd45f80
..
ce334b2
100755
(executable)
--- a/
bin/mozilla/sepa.pl
+++ b/
bin/mozilla/sepa.pl
@@
-113,7
+113,7
@@
sub bank_transfer_create {
}
if ($error_message || !$form->{confirmation}) {
}
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 };
$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)) {
} 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->{$_};
}
$bank_transfer->{"our_${_}"} = $bank_account->{$_};
}
@@
-176,7
+176,7
@@
sub bank_transfer_list {
my $form = $main::form;
my $locale = $main::locale;
my $form = $main::form;
my $locale = $main::locale;
- my $cgi = $
main::cgi
;
+ my $cgi = $
::request->{cgi}
;
my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor';
$form->{title} = $vc eq 'customer' ? $::locale->text('List of bank collections') : $locale->text('List of bank transfers');
my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor';
$form->{title} = $vc eq 'customer' ? $::locale->text('List of bank collections') : $locale->text('List of bank transfers');
@@
-443,7
+443,7
@@
sub bank_transfer_download_sepa_xml {
my $form = $main::form;
my $myconfig = \%main::myconfig;
my $locale = $main::locale;
my $form = $main::form;
my $myconfig = \%main::myconfig;
my $locale = $main::locale;
- my $cgi = $
main::cgi
;
+ my $cgi = $
::request->{cgi}
;
my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor';
if (!$myconfig->{company}) {
my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor';
if (!$myconfig->{company}) {
@@
-481,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},
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',
'message_id' => $message_id,
'grouped' => 1,
'collection' => $vc eq 'customer',