Merge fix

diff --combined bin/mozilla/admin.pl
index 891c4ba,b8b4cfe..ebf01c6
--- 1/bin/mozilla/admin.pl
--- 2/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 2f0ee81,6729d16..82a988e
--- 1/bin/mozilla/common.pl
--- 2/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;