From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 8 Oct 2010 11:04:34 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~104
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/0991e77d75e77fdeca7a8396dcaee7b9dd782168?hp=f147b6eb9250111ed6882e4d8b11ad477ac6fefe

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

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b40e7ed9a..83da8b5a9 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -229,7 +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 @@ 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();