X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdo.pl;h=7f83bf399b7398b0083096116fd3ae7819e96863;hb=34211d2356367e21aa8f624caa7b17ee4b8ec4ac;hp=80e38e860d737fc0f923597818f57bee98c1eaca;hpb=e69e36574126ff1a2913a4604c36f9e116ac8cdc;p=kivitendo-erp.git

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 80e38e860..7f83bf399 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -185,8 +185,6 @@ sub order_links {
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
-  $form->{salesman_id} = $salesman_id if ($editing);
-
   $lxdebug->leave_sub();
 }
 
@@ -774,6 +772,9 @@ sub invoice_multi {
     $ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row
     map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
     map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost);
+		$form->{"discount_$form->{rowcount}"}	= $form->{"discount_$form->{rowcount}"}  * 100;	#s.a. Bug 1151
+		# Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen
+		# Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09
   }
   delete $form->{form_details};