From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 14:15:13 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~55
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/bfd8b7a229bf1bec0a6ed2c2e8a76d6cab30704a?hp=17a24be3b58e37945b47dbd35176c0dc1c067fb4

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

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 3e54c1ed8..b722e2081 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -412,7 +412,7 @@ sub update_delivery_order {
         map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
 
         $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
-        $form->{"sellprice_$i"}          = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+        $form->{"sellprice_$i"}          = $form->format_amount(\%myconfig, $form->{"sellprice_$i"} * (1 - $form->{tradediscount}));
         $form->{"lastcost_$i"}          = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
         $form->{"qty_$i"}                = $form->format_amount(\%myconfig, $form->{"qty_$i"});
       }
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 5af79bedc..5454d4d83 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -116,6 +116,7 @@
        <tr>
         <input type="hidden" name="[% vc %]_id" value="[% HTML.escape(the_vc_id) %]">
         <input type="hidden" name="old[% vc %]" value="[% HTML.escape(the_oldvc) %]">
+        <input type="hidden" name="tradediscount" value="[% HTML.escape(tradediscount) %]">
         <th align="right">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</th>
         <td>
          [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %]