X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/6092ef39d7da3d61b6df25c9dc3ff23b1a7b8acb..b293ff8ad52fc76ba0c44783e3982418114d6b08:/SL/DN.pm diff --git a/SL/DN.pm b/SL/DN.pm index d9d02a626..76ee1b834 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -657,8 +657,9 @@ sub get_invoices { ct.name AS customername, a.customer_id, a.duedate, a.amount - a.paid AS open_amount, a.direct_debit, + pt.description as payment_term, dep.description as departmentname, - + ct.invoice_mail AS cv_email, cfg.dunning_description, cfg.dunning_level, d.transdate AS dunning_date, d.duedate AS dunning_duedate, @@ -676,6 +677,7 @@ sub get_invoices { LEFT JOIN customer ct ON (a.customer_id = ct.id) LEFT JOIN department dep ON (a.department_id = dep.id) + LEFT JOIN payment_terms pt ON (a.payment_id = pt.id) LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id) LEFT JOIN dunning_config nextcfg ON (nextcfg.id = @@ -967,7 +969,7 @@ sub print_dunning { c.country, c.department_1, c.department_2, c.email, c.customernumber, c.greeting, c.contact, c.phone, c.fax, c.homepage, c.email, c.taxincluded, c.business_id, c.taxnumber, c.iban, - c.ustid, + c.ustid, c.currency_id, curr.name as currency, ar.id AS invoice_id, co.* FROM dunning d @@ -975,6 +977,7 @@ sub print_dunning { LEFT JOIN customer c ON (ar.customer_id = c.id) LEFT JOIN contacts co ON (ar.cp_id = co.cp_id) LEFT JOIN employee e ON (ar.salesman_id = e.id) + LEFT JOIN currencies curr ON (c.currency_id = curr.id) WHERE (d.dunning_id = ?) LIMIT 1|; my $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);