Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp

diff --combined bin/mozilla/io.pl
index 602273b4f68b81dfa4a8ad668cc17beba1969595,41c55b0c0c0ee4a72aebe1e8e4a9adceb3d97610..83da8b5a9b7961b39abf5a8d95b48405dec9bec5
--- 1/bin/mozilla/io.pl
--- 2/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@@ -229,7 -229,6 +229,6 @@@ sub display_row 
      }
      my $this_unit = $form->{"unit_$i"};
      $this_unit    = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units);
-     $this_unit  ||= "kg";
  
      if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) {
        my @values = ('', map { $_->{id}                      } @{ $form->{ALL_PRICE_FACTORS} });
@@@ -2072,7 -2071,7 +2071,7 @@@ sub _update_custom_variables 
  
    my $form     = $main::form;
  
 -  $form->{CVAR_CONFIGS}       ||= { };
 +  $form->{CVAR_CONFIGS}         = { } unless ref $form->{CVAR_CONFIGS} eq 'HASH';
    $form->{CVAR_CONFIGS}->{IC} ||= CVar->get_configs(module => 'IC');
  
    $main::lxdebug->leave_sub();