From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 27 Apr 2015 07:34:45 +0000 (+0200)
Subject: Lieferantentyp und -Rabatt oben in Einkaufmasken richtig anzeigen.
X-Git-Tag: release-3.3.0beta~126
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=332980848d088adfe7e1cd025c23452325134207;p=kivitendo-erp.git

Lieferantentyp und -Rabatt oben in Einkaufmasken richtig anzeigen.

Die Anzeige von Typ und Rabatt war in Angebot/Auftrag und Lieferschein schon
vorgesehen, aber der Rabatt wurd nicht geholt. In der Einkaufsrechnung fehlte
die Anzeige ganz.
---

diff --git a/SL/IR.pm b/SL/IR.pm
index 0fecc27a8..17dcaf388 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -1135,7 +1135,7 @@ sub get_vendor {
          v.email, v.cc, v.bcc, v.language_id, v.payment_id, v.delivery_term_id,
          v.street, v.zipcode, v.city, v.country, v.taxzone_id, cu.name AS curr, v.direct_debit,
          $duedate + COALESCE(pt.terms_netto, 0) AS duedate,
-         b.description AS business
+         b.discount AS tradediscount, b.description AS business
        FROM vendor v
        LEFT JOIN business b       ON (b.id = v.business_id)
        LEFT JOIN payment_terms pt ON (v.payment_id = pt.id)
diff --git a/templates/webpages/ir/form_header.html b/templates/webpages/ir/form_header.html
index 5a8cb024a..362bd8957 100644
--- a/templates/webpages/ir/form_header.html
+++ b/templates/webpages/ir/form_header.html
@@ -80,6 +80,12 @@
             <span class="plus[% IF is_credit_remaining_negativ %]0[% ELSE %]1[% END %]">[% LxERP.format_amount(creditremaining,0 ,'0') %]</span>
           </td>
         </tr>
+[%- IF business %]
+        <tr>
+          <th align="right">[% 'Vendor type' | $T8 %]</th>
+          <td>[% business %]; [% 'Trade Discount' | $T8 %] [% LxERP.format_amount(tradediscount * 100) %] %</td>
+        </tr>
+[%- END %]
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
           <td colspan="3"><select name="AP" style="width:250px;">[% selectAP %]</select></td>