Merge branch 'gewicht'

[kivitendo-erp.git] / SL / Controller / ClientConfig.pm

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 74bc8b5..148054e 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -43,6 +43,19 @@ sub action_edit {
 
   map { $self->{$_} = SL::DB::Default->get->$_ } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
 
+  map { $self->{$_} = SL::DB::Default->get->$_ } qw(warehouse_id bin_id);
+  $::form->get_lists('warehouses' => { 'key'    => 'WAREHOUSES',
+                                       'bins'   => 'BINS', });
+  $self->{WAREHOUSES} = $::form->{WAREHOUSES};
+  # leerer lagerplatz mit id 0
+  my $no_default_bin_entry = { 'id' => '0', description => '--', 'BINS' => [ { id => '0', description => ''} ] };
+  push @ { $self->{WAREHOUSES} }, $no_default_bin_entry;
+
+  if (my $max = scalar @{ $self->{WAREHOUSES} }) {
+    $self->{warehouse_id} ||= $self->{WAREHOUSES}->[$max -1]->{id};
+    $self->{bin_id}       ||= $self->{WAREHOUSES}->[$max -1]->{BINS}->[0]->{id};
+  }
+
   $self->{show_weight} = SL::DB::Default->get->show_weight;
 
   $self->render('client_config/form', title => $::locale->text('Client Configuration'));
@@ -66,7 +79,16 @@ sub action_save {
 
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(sales_order_show_delete purchase_order_show_delete sales_delivery_order_show_delete purchase_delivery_order_show_delete);
 
+<<<<<<< HEAD
+  # undef warehouse_id if the empty value is selected
+  if ( ($::form->{warehouse_id} == 0) && ($::form->{bin_id} == 0) ) {
+    undef $::form->{warehouse_id};
+    undef $::form->{bin_id};
+  }
+  map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(warehouse_id bin_id);
+=======
   SL::DB::Default->get->update_attributes('show_weight'     => $::form->{show_weight});
+>>>>>>> gewicht
 
   flash_later('info', $::locale->text('Client Configuration saved!'));