From: Jan Büren <jan@kivitendo-premium.de>
Date: Thu, 4 Sep 2014 07:11:16 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~320
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/164570bd39ebce873bac5f899d392003ef915ea1?hp=406563ed1b78806f09febe49fc37f0b9fb97e6b5

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/IS.pm b/SL/IS.pm
index f429034e8..6c5aa9ffe 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -238,7 +238,7 @@ sub invoice_details {
 
       my $discount_round_error       = $discount + ($linetotal_exact - $nodiscount_exact_linetotal); # not used
 
-      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, 2);
+      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, $decimalplaces);
 
       push @{ $form->{TEMPLATE_ARRAYS}->{netprice} },       ($form->{"netprice_$i"} != 0) ? $form->format_amount($myconfig, $form->{"netprice_$i"}, $decimalplaces) : '';
       push @{ $form->{TEMPLATE_ARRAYS}->{netprice_nofmt} }, ($form->{"netprice_$i"} != 0) ? $form->{"netprice_$i"} : '';
diff --git a/SL/OE.pm b/SL/OE.pm
index 279b08cce..52a5a61d6 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1236,7 +1236,7 @@ sub order_details {
 
       my $discount_round_error       = $discount + ($linetotal_exact - $nodiscount_exact_linetotal); # not used
 
-      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, 2);
+      $form->{"netprice_$i"}   = $form->round_amount($form->{"qty_$i"} ? ($linetotal / $form->{"qty_$i"}) : 0, $decimalplaces);
 
       push @{ $form->{TEMPLATE_ARRAYS}->{netprice} },       ($form->{"netprice_$i"} != 0) ? $form->format_amount($myconfig, $form->{"netprice_$i"}, $decimalplaces) : '';
       push @{ $form->{TEMPLATE_ARRAYS}->{netprice_nofmt} }, ($form->{"netprice_$i"} != 0) ? $form->{"netprice_$i"} : '';
diff --git a/doc/dokumentation.xml b/doc/dokumentation.xml
index 5e86d1a0d..b7695c63f 100644
--- a/doc/dokumentation.xml
+++ b/doc/dokumentation.xml
@@ -3912,7 +3912,7 @@ ln -s $(pwd)/kivitendo-task-server.service /etc/systemd/system/</programlisting>
               <term><varname>netprice</varname></term>
 
               <listitem>
-                <para>Nettopreis</para>
+                <para>Alternative zu <varname>sellprice</varname>, aber <varname>netprice</varname> entspricht dem effektiven Einzelpreis und beinhaltet Zeilenrabatt und Preisfaktor. <varname>netprice</varname> wird rückgerechnet aus Zeilensumme / Menge. Diese Variable ist nützlich, wenn man den gewährten Rabatt in der Druckvorlage nicht anzeigen möchte, aber Menge * Einzelpreis trotzdem die angezeigte Zeilensumme ergeben soll. <varname>netprice</varname> hat nichts mit Netto/Brutto im Sinne von Steuern zu tun.</para>
               </listitem>
             </varlistentry>
 
diff --git a/templates/print/RB/invoice.html b/templates/print/RB/invoice.html
index 2858f4f08..b4a5ec9d9 100644
--- a/templates/print/RB/invoice.html
+++ b/templates/print/RB/invoice.html
@@ -133,7 +133,7 @@ adjust the colspan if you include this to shift subtotal one to the right
 <!--
 you can also use netprice instead of sellprice if you
 don't want to show the discount
-netprice = sellprice - discount
+netprice = linetotal/qty
 -->
 
     <tr>