From: Sven Donath <lxo@dexo.de>
Date: Thu, 23 Sep 2010 21:46:51 +0000 (+0200)
Subject: Merge fix
X-Git-Tag: release-2.6.2beta1~122
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6cf3f7762efd40bee49a2b8f11bb4ab6915d9071?ds=inline;hp=-c

Merge fix
---

6cf3f7762efd40bee49a2b8f11bb4ab6915d9071
diff --combined bin/mozilla/admin.pl
index 891c4ba42,b8b4cfe44..ebf01c679
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@@ -79,10 -79,7 +79,10 @@@ sub run 
        $form->{error_message} = $locale->text('Incorrect Password!');
        adminlogin();
      } else {
 -      $auth->create_or_refresh_session() if ($auth->session_tables_present());
 +      if ($auth->session_tables_present()) {
 +        $::auth->set_session_value('rpw', $::form->{rpw});
 +        $::auth->create_or_refresh_session();
 +      }
        call_sub($locale->findsub($form->{action}));
      }
    } elsif ($auth->authenticate_root($form->{rpw}, 0) == $auth->OK()) {
@@@ -651,7 -648,7 +651,7 @@@ sub dbselect_source 
    my $locale         = $main::locale;
  
    $form->{dbport}    = '5432';
-   $form->{dbuser}    = 'postgres';
+   $form->{dbuser}    = 'lxoffice';
    $form->{dbdefault} = 'template1';
    $form->{dbhost}    = 'localhost';
  
diff --combined bin/mozilla/common.pl
index 2f0ee8175,6729d16a2..82a988ec5
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@@ -183,7 -183,7 +183,7 @@@ sub part_selection_internal 
  
    my @header_sort  = qw(partnumber description);
    my %header_title = ( "partnumber"  => $locale->text("Part Number"),
-                        "description" => $locale->text("Part description"),
+                        "description" => $locale->text("Part Description"),
                         );
  
    my @header =
@@@ -727,13 -727,4 +727,13 @@@ sub gl_transaction 
    $main::lxdebug->leave_sub();
  }
  
 +if ($::use_rdbo) {
 +  eval {
 +    require SL::DB::Helpers::Mappings;
 +    sub db {
 +      goto &SL::DB::Helpers::Mappings::db;
 +    }
 +  } or die $@;
 +}
 +
  1;