Vergessenes @charset in SQL-Upgrade-Script

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

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index 0e424de69c8142e341f5098a0891a4cd3aab0762..e16b090b7eb7229b5ed0f759f3da6267ab030f0f 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -18,7 +18,7 @@ sub action_edit {
   $self->{payment_options} = [ { title => $::locale->text("never"), value => 0 },
                                { title => $::locale->text("every time"), value => 1 },
                                { title => $::locale->text("on the same day"), value => 2 }, ];
-  $self->{accounting_options} = [ { title => $::locale->text("accrual"), value => "accrual" },
+  $self->{accounting_options} = [ { title => $::locale->text("Accrual"), value => "accrual" },
                                   { title => $::locale->text("cash"), value => "cash" }, ];
   $self->{inventory_options} = [ { title => $::locale->text("perpetual"), value => "perpetual" },
                                  { title => $::locale->text("periodic"), value => "periodic" }, ];
@@ -29,6 +29,8 @@ sub action_edit {
 
   $self->{payments_changeable} = SL::DB::Default->get->payments_changeable;
 
+  map { $self->{$_} = SL::DB::Default->get->$_ } qw(is_show_mark_as_paid ir_show_mark_as_paid ar_show_mark_as_paid ap_show_mark_as_paid);
+
   map { $self->{$_} = SL::DB::Default->get->$_ } qw(accounting_method inventory_system profit_determination);
 
   $self->{show_bestbefore}     = SL::DB::Default->get->show_bestbefore;
@@ -39,6 +41,32 @@ sub action_edit {
   #check_on_dunning = 0
   #check_on_sepa_import = 0
 
+  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);
+
+  # All warehouse / transfer default values
+  map { $self->{$_} = SL::DB::Default->get->$_ } qw(transfer_default transfer_default_use_master_default_bin transfer_default_ignore_onhand
+                                                    warehouse_id_ignore_onhand bin_id_ignore_onhand warehouse_id bin_id);
+
+  # for the default warehouse and bin we get the list and
+  # set a empty value with warehouse_id and bin_id = 0
+  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;
+
+  # set defaults to empty
+  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->{warehouse_id_ignore_onhand} ||= $self->{WAREHOUSES}->[$max -1]->{id};
+    $self->{bin_id_ignore_onhand}       ||= $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'));
 }
 
@@ -50,12 +78,33 @@ sub action_save {
 
   SL::DB::Default->get->update_attributes('payments_changeable' => $::form->{payments_changeable});
 
+  map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(is_show_mark_as_paid ir_show_mark_as_paid ar_show_mark_as_paid ap_show_mark_as_paid);
+
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(accounting_method inventory_system profit_determination);
 
   SL::DB::Default->get->update_attributes('show_bestbefore'     => $::form->{show_bestbefore});
 
   map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(datev_check_on_sales_invoice datev_check_on_purchase_invoice datev_check_on_ar_transaction datev_check_on_ap_transaction datev_check_on_gl_transaction);
 
+  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);
+
+  # 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};
+  }
+  # undef warehouse_id_ignore_onhand if the empty value is selected
+  if ( ($::form->{warehouse_id_ignore_onhand} == 0) && ($::form->{bin_id_ignore_onhand} == 0) ) {
+    undef $::form->{warehouse_id_ignore_onhand};
+    undef $::form->{bin_id_ignore_onhand};
+  }
+
+  # All warehouse / transfer default values
+  map { SL::DB::Default->get->update_attributes($_ => $::form->{$_}); } qw(transfer_default transfer_default_use_master_default_bin transfer_default_ignore_onhand
+                                                                            warehouse_id_ignore_onhand bin_id_ignore_onhand warehouse_id bin_id);
+
+  SL::DB::Default->get->update_attributes('show_weight'     => $::form->{show_weight});
+
   flash_later('info', $::locale->text('Client Configuration saved!'));
 
   $self->redirect_to(action => 'edit');