X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/41229db38e57ad893178df32d7a30045ef77f5fd..2e1b486eddce9f07ee80a937f6f2e1cddcf754b8:/SL/Controller/Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 9310f9110..2773f2c1e 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -20,10 +20,13 @@ use SL::DB::Project;
 use SL::DB::Default;
 use SL::DB::Unit;
 use SL::DB::Price;
+use SL::DB::Part;
 
 use SL::Helper::DateTime;
 use SL::Helper::CreatePDF qw(:all);
 
+use SL::Controller::Helper::GetModels;
+
 use List::Util qw(max first);
 use List::MoreUtils qw(none pairwise first_index);
 use English qw(-no_match_vars);
@@ -31,7 +34,7 @@ use File::Spec;
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(order valid_types type cv p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models) ],
 );
 
 
@@ -292,13 +295,18 @@ sub action_customer_vendor_changed {
                               : $::myconfig{taxincluded_checked});
   }
 
+  $self->order->payment_id($self->order->$cv_method->payment_id);
+  $self->order->delivery_term_id($self->order->$cv_method->delivery_term_id);
+
   $self->_recalc();
 
   $self->js
-    ->replaceWith('#order_cp_id',       $self->build_contact_select)
-    ->replaceWith('#order_shipto_id',   $self->build_shipto_select)
-    ->val(        '#order_taxzone_id',  $self->order->taxzone_id)
-    ->val(        '#order_taxincluded', $self->order->taxincluded)
+    ->replaceWith('#order_cp_id',            $self->build_contact_select)
+    ->replaceWith('#order_shipto_id',        $self->build_shipto_select)
+    ->val(        '#order_taxzone_id',       $self->order->taxzone_id)
+    ->val(        '#order_taxincluded',      $self->order->taxincluded)
+    ->val(        '#order_payment_id',       $self->order->payment_id)
+    ->val(        '#order_delivery_term_id', $self->order->delivery_term_id)
     ->focus(      '#order_' . $self->cv . '_id');
 
   $self->_js_redisplay_amounts_and_taxes;
@@ -339,22 +347,21 @@ sub action_add_item {
 }
 
 sub action_show_multi_items_dialog {
-  my ($self) = @_;
-
-  $self->{multi_items}->{parts} = SL::DB::Manager::Part->get_all_sorted(where => [ obsolete => 0 ]);
-  my $dialog_html = $self->render('order/tabs/_multi_items_dialog', { output => 0 });
+  require SL::DB::PartsGroup;
+  $_[0]->render('order/tabs/_multi_items_dialog', { layout => 0 },
+                all_partsgroups => SL::DB::Manager::PartsGroup->get_all);
+}
 
-  $self->js
-    ->run('show_multi_items_dialog', $dialog_html, t8('Add multiple parts'))
-    ->reinit_widgets
-    ->render();
+sub action_multi_items_update_result {
+  $_[0]->render('order/tabs/_multi_items_result', { layout => 0 },
+                multi_items => $_[0]->multi_items_models->get);
 }
 
 sub action_add_multi_items {
   my ($self) = @_;
 
-  my @form_attr = grep { $_->{qty} } @{ $::form->{add_multi_items} };
-  return unless scalar @form_attr;
+  my @form_attr = grep { $_->{qty_as_number} } @{ $::form->{add_multi_items} };
+  return $self->js->render() unless scalar @form_attr;
 
   my @items;
   foreach my $attr (@form_attr) {
@@ -469,6 +476,23 @@ sub init_order {
   _make_order();
 }
 
+sub init_multi_items_models {
+  SL::Controller::Helper::GetModels->new(
+    controller     => $_[0],
+    model          => 'Part',
+    with_objects   => [ qw(unit_obj) ],
+    disable_plugin => 'paginated',
+    source         => $::form->{multi_items},
+    sorted         => {
+      _default    => {
+        by  => 'partnumber',
+        dir => 1,
+      },
+      partnumber  => t8('Partnumber'),
+      description => t8('Description')}
+  );
+}
+
 sub _check_auth {
   my ($self) = @_;