Merge branch 'master' into currency

[mfinanz.git] / SL / DN.pm

diff --git a/SL/DN.pm b/SL/DN.pm
index 46749ab37cb676c656baadfbbe13c3169e88d048..a960a4c000a8e7967f2fba36b2e14ef2bd6689eb 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -228,7 +228,7 @@ sub create_invoice_for_fees {
          -- duedate:
          (SELECT duedate FROM dunning WHERE dunning_id = ? LIMIT 1),
          'f',                   -- invoice
-         ?,                     -- curr
+         (SELECT id FROM currencies WHERE curr = ?), -- curr
          ?,                     -- notes
          -- employee_id:
          (SELECT id FROM employee WHERE login = ?)
@@ -761,7 +761,7 @@ sub print_dunning {
          ar.transdate,       ar.duedate,      ar.customer_id,
          ar.invnumber,       ar.ordnumber,    ar.cp_id,
          ar.amount,          ar.netamount,    ar.paid,
-         ar.curr,
+         (SELECT cu.curr FROM currencies cu WHERE cu.id=ar.curr) AS curr,
          ar.amount - ar.paid AS open_amount,
          ar.amount - ar.paid + da.fee + da.interest AS linetotal