X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0aa885f4f0bb531a7691a641f954ff296ffa04a5..fdebfd5d0c558cb156849b01c9c9268b29dc443b:/SL/Controller/Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 06a9f74cb..8355dda14 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -366,6 +366,7 @@ sub action_customer_vendor_changed {
     $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
                               ? $self->order->$cv_method->taxincluded_checked
                               : $::myconfig{taxincluded_checked});
+    $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id);
   }
 
   $self->order->payment_id($self->order->$cv_method->payment_id);
@@ -517,7 +518,7 @@ sub action_add_multi_items {
 
         # set discount to 100% if item isn't supposed to be charged, overwriting any customer discount
         $item->discount(1) unless $assortment_item->charge;
-        push @items, $assortment_item;
+        push @items, $item;
       }
     }
   }
@@ -1362,8 +1363,6 @@ java script functions
 
 =item * access rights
 
-=item * preset salesman from customer
-
 =item * display weights
 
 =item * history
@@ -1386,6 +1385,8 @@ java script functions
 Customer discount is not displayed as a valid discount in price source popup
 (this might be a bug in price sources)
 
+(I cannot reproduce this (Bernd))
+
 =item *
 
 No indication that <shift>-up/down expands/collapses second row.