X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/c1716dbdeb0ba6d2cd9c708a2c54b9845e9532b4..5ecfae1c3691bbac614fd2dbf2036d5e5f28ba21:/SL/SEPA.pm diff --git a/SL/SEPA.pm b/SL/SEPA.pm index 38341eccd..d2eb13fff 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, @@ -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, @@ -403,6 +403,12 @@ sub post_payment { # Update the invoice to reflect the new paid amount. do_statement($form, @{ $handles{update_arap} }, $orig_item->{amount}, $orig_item->{"${arap}_id"}); + # Update datepaid of invoice. set_datepaid (which has some extra logic) + # finds the date from acc_trans, where the payment has already been + # recorded above, so we don't need to explicitly pass + # $item->{execution_date} + IO->set_datepaid(table => "$arap", id => $orig_item->{"${arap}_id"}, dbh => $dbh); + # Update the item to reflect that it has been posted. do_statement($form, @{ $handles{finish_item} }, $item->{execution_date}, $item_id);