From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 7 Oct 2010 10:24:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~104^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/be253985ee9b61172d6cd468b3af11801eeb7118?hp=-c

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

be253985ee9b61172d6cd468b3af11801eeb7118
diff --combined bin/mozilla/io.pl
index 602273b4f,41c55b0c0..83da8b5a9
--- a/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();