From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 1 Oct 2015 11:25:06 +0000 (+0200)
Subject: Mahnungen: Links zu Debitorenrechnungen gefixt
X-Git-Tag: release-3.4.1~684
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=78c8e7ac6600a975f31242165c81e537ce28bc07;p=kivitendo-erp.git

Mahnungen: Links zu Debitorenrechnungen gefixt

In der ersten Maske, in der die anzumahnenen Rechnungen ausgewählt
werden können, wurden Links immer nur auf is.pl gesetzt, auch für
Debitorenbuchungen.
---

diff --git a/SL/DN.pm b/SL/DN.pm
index 0ada08c4d..2bead22c7 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -529,7 +529,7 @@ sub get_invoices {
 
   $query =
     qq|SELECT
-         a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,
+         a.id, a.invoice, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,
          ct.name AS customername, a.customer_id, a.duedate,
          a.amount - a.paid AS open_amount,
          a.direct_debit,
diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index 63e50397d..bfc6403a6 100644
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -62,7 +62,7 @@
      <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>
      <td>
       <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">
-      <a href="is.pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
+      <a href="[% IF row.invoice %]is[% ELSE %]ar[% END %].pl?action=edit&type=invoice&id=[% row.id | url %]">[% HTML.escape(row.invnumber) %]</a>
      </td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>