Auftrags-Controller: zweite Zeile per Shift-Hoch/Runter verstecken/anzeigen

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index eff55ca078745285b25d1f10a645275d8a4495c8..fb3078cff15bcf138a02bf62eda12732ce81588c 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -125,7 +125,7 @@ sub action_customer_vendor_changed {
     ->replaceWith('#order_cp_id',     $self->build_contact_select)
     ->replaceWith('#order_shipto_id', $self->build_shipto_select)
     ->val('#order_taxzone_id', $self->order->{$self->cv}->taxzone_id)
-    ->focus('#order_' . $self->cv . ' _id')
+    ->focus('#order_' . $self->cv . '_id')
     ->render($self);
 }
 
@@ -136,11 +136,12 @@ sub action_add_item {
 
   return unless $form_attr->{parts_id};
 
-  my $item      = SL::DB::OrderItem->new;
+  my $item = SL::DB::OrderItem->new;
   $item->assign_attributes(%$form_attr);
 
   my $part        = SL::DB::Part->new(id => $form_attr->{parts_id})->load;
-  my $cv_discount = $self->order->customer? $self->order->customer->discount : 0.0;
+  my $cv_method   = $self->cv;
+  my $cv_discount = $self->order->$cv_method? $self->order->$cv_method->discount : 0.0;
 
   my %new_attr;
   $new_attr{part}        = $part;
@@ -160,7 +161,7 @@ sub action_add_item {
   my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item);
 
   $self->js
-    ->append('#row_table_id tbody', $row_as_html)
+    ->append('#row_table_id', $row_as_html)
     ->val('#add_item_parts_id', '')
     ->val('#add_item_parts_id_name', '')
     ->val('#add_item_description', '')
@@ -168,6 +169,7 @@ sub action_add_item {
     ->val('#add_item_sellprice_as_number', '')
     ->val('#add_item_discount_as_percent', '')
     ->run('row_table_scroll_down')
+    ->run('row_set_keyboard_events_by_id', $item->id)
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;