X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FSEPA.pm;h=ced75be7e1274e11727231e11e8ae6000b08d25f;hb=55049b816f1c78769b3bfe734f033340d5872900;hp=d4967964eb4130ac120357fa97f8ceebe7d14210;hpb=32ee774ff3674951d5e2402750c1a3053ad63afa;p=kivitendo-erp.git diff --git a/SL/SEPA.pm b/SL/SEPA.pm index d4967964e..ced75be7e 100644 --- a/SL/SEPA.pm +++ b/SL/SEPA.pm @@ -21,8 +21,8 @@ sub retrieve_open_invoices { my $query = qq| - SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id, ${arap}.amount AS invoice_amount, ${arap}.invoice, - vc.name AS vcname, ${arap}.duedate as duedate, + SELECT ${arap}.id, ${arap}.invnumber, ${arap}.${vc}_id as vc_id, ${arap}.amount AS invoice_amount, ${arap}.invoice, + vc.name AS vcname, vc.language_id, ${arap}.duedate as duedate, COALESCE(vc.iban, '') <> '' AND COALESCE(vc.bic, '') <> '' AS vc_bank_info_ok, @@ -178,7 +178,7 @@ sub retrieve_export { my ($columns, $joins); if ($params{details}) { - $columns = qq|, arap.invnumber, arap.invoice, vc.name AS vc_name, c.accno AS chart_accno, c.description AS chart_description|; + $columns = qq|, arap.invnumber, arap.invoice, arap.transdate AS reference_date, vc.name AS vc_name, c.accno AS chart_accno, c.description AS chart_description|; $joins = qq|LEFT JOIN ${arap} arap ON (sei.${arap}_id = arap.id) LEFT JOIN ${vc} vc ON (arap.${vc}_id = vc.id) LEFT JOIN chart c ON (sei.chart_id = c.id)|; @@ -305,7 +305,7 @@ sub list_exports { push @where, 'se.vc = ?'; push @values, $vc; - my $where = ' WHERE ' . join(' AND ', map { "(${_})" } @where) if (@where); + my $where = @where ? ' WHERE ' . join(' AND ', map { "(${_})" } @where) : ''; my $query = qq|SELECT se.id, se.employee_id, se.executed, se.closed, itime::date AS export_date,