Bei Kunden -> Angebot, gibt es nach dem Speichern des Angebots keinen Funktionsunters...

[kivitendo-erp.git] / SL / Auth.pm

diff --git a/SL/Auth.pm b/SL/Auth.pm
index 8ac2293..3e0dc0a 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -222,7 +222,7 @@ sub create_database {
     $main::form->error($main::locale->text('The connection to the template database failed:') . "\n" . $DBI::errstr);
   }
 
-  my $charset    = $main::charset;
+  my $charset    = $main::dbcharset;
   $charset     ||= Common::DEFAULT_CHARSET;
   my $encoding   = $Common::charset_to_db_encoding{$charset};
   $encoding    ||= 'UNICODE';
@@ -234,9 +234,18 @@ sub create_database {
   $dbh->do($query);
 
   if ($dbh->err) {
+    my $error = $dbh->errstr();
+
+    $query                 = qq|SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname = 'template0'|;
+    my ($cluster_encoding) = $dbh->selectrow_array($query);
+
+    if ($cluster_encoding && ($cluster_encoding =~ m/^(?:UTF-?8|UNICODE)$/i) && ($encoding !~ m/^(?:UTF-?8|UNICODE)$/i)) {
+      $error = $main::locale->text('Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.');
+    }
+
     $dbh->disconnect();
 
-    $main::form->error($main::locale->text('The creation of the authentication database failed:') . "\n" . $DBI::errstr);
+    $main::form->error($main::locale->text('The creation of the authentication database failed:') . "\n" . $error);
   }
 
   $dbh->disconnect();
@@ -250,7 +259,7 @@ sub create_tables {
   my $self = shift;
   my $dbh  = $self->dbconnect();
 
-  my $charset    = $main::charset;
+  my $charset    = $main::dbcharset;
   $charset     ||= Common::DEFAULT_CHARSET;
 
   $dbh->rollback();
@@ -620,6 +629,20 @@ sub all_rights_full {
   my $locale = $main::locale;
 
   my @all_rights = (
+    ["--crm",                         $locale->text("CRM optional software")], 
+    ["crm_search",                    $locale->text("CRM search")], 
+    ["crm_new",                               $locale->text("CRM create customers, vendors and contacts")], 
+    ["crm_service",                   $locale->text("CRM services")], 
+    ["crm_admin",                     $locale->text("CRM admin")], 
+    ["crm_adminuser",                 $locale->text("CRM user")], 
+    ["crm_adminstatus",                       $locale->text("CRM status")], 
+    ["crm_email",                     $locale->text("CRM send email")], 
+    ["crm_termin",                    $locale->text("CRM termin")], 
+    ["crm_opportunity",                       $locale->text("CRM opportunity")], 
+    ["crm_knowhow",                   $locale->text("CRM know how")], 
+    ["crm_follow",                    $locale->text("CRM follow up")], 
+    ["crm_notices",                   $locale->text("CRM notices")], 
+    ["crm_other",                     $locale->text("CRM other")], 
     ["--master_data",                  $locale->text("Master Data")],
     ["customer_vendor_edit",           $locale->text("Create and edit customers and vendors")],
     ["part_service_assembly_edit",     $locale->text("Create and edit parts, services, assemblies")],