Merge von 784,790 aus unstable: Bugfix 220 Nachtrag Variablen

-Neue Variable p_discount = Rabattprozente pro Position fuer Rechnungen, Auftraege und Angebote eingefuert. Die Variable discount enthaelt den als Rabatt gewaehrten Betrag
-Latex-template-variablen fuer r784 angepasst

diff --git a/SL/IS.pm b/SL/IS.pm
index 14f375a..484dcb9 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -167,6 +167,7 @@ sub invoice_details {
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
 
       push(@{ $form->{discount} }, $discount);
+      push(@{ $form->{p_discount} }, $form->{"discount_$i"});
 
       $form->{total} += $linetotal;
 

diff --git a/SL/OE.pm b/SL/OE.pm
index 6dec175..5350065 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -914,6 +914,7 @@ sub order_details {
       $linetotal = ($linetotal != 0) ? $linetotal : " ";
 
       push(@{ $form->{discount} }, $discount);
+      push(@{ $form->{p_discount} }, $form->{"discount_$i"});
 
       $form->{ordtotal} += $linetotal;
 

diff --git a/doc/latex-template-variablen.html b/doc/latex-template-variablen.html
index 8cbb7b2..e19eb6d 100644 (file)
--- a/doc/latex-template-variablen.html
+++ b/doc/latex-template-variablen.html
@@ -524,6 +524,10 @@ td {
     <td><code>description</code></td>
     <td>Artikelbeschreibung</td>
    </tr>
+   <tr>
+    <td><code>discount</code></td>
+    <td>Rabatt als Betrag</td>
+   </tr>
    <tr>
     <td><code>linetotal</code></td>
     <td>Zeilensumme (Anzahl * Einzelpreis)</td>
@@ -541,7 +545,10 @@ td {
     <td>Artikelnummer</td>
    </tr>
    <tr>
-    <td><code>partnotes</code></td>
+   <td><code>p_discount</code></td>
+    <td>Rabatt in Prozent</td>
+   </tr>
+   <td><code>partnotes</code></td>
     <td>Die beim Artikel gespeicherten Bemerkungen</td>
    </tr>
    <tr>