Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index 397a99f..d29578b 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -15,7 +15,7 @@ BEGIN {
   { name => "Config::Std",                         url => "http://search.cpan.org/~dconway/",   debian => 'libconfig-std-perl' },
   { name => "DateTime",                            url => "http://search.cpan.org/~drolsky/",   debian => 'libdatetime-perl' },
   { name => "DBI",             version => '1.50',  url => "http://search.cpan.org/~timb/",      debian => 'libdbi-perl' },
-  { name => "DBD::Pg",         version => '1.49',  url => "http://search.cpan.org/~dbdpg/",     debian => 'libdbd-pg' },
+  { name => "DBD::Pg",         version => '1.49',  url => "http://search.cpan.org/~dbdpg/",     debian => 'libdbd-pg-perl' },
   { name => "Email::Address",                      url => "http://search.cpan.org/~rjbs/",      debian => 'libemail-address-perl' },
   { name => "FCGI",            version => '0.72',  url => "http://search.cpan.org/~mstrout/",   debian => 'libfcgi-perl' },
   { name => "JSON",                                url => "http://search.cpan.org/~makamaka",   debian => 'libjson-perl' },

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 31c70d0..b1634cb 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -521,9 +521,7 @@ sub form_footer {
 }
 
 sub _do_save {
-  $main::auth->assert('customer_vendor_edit & ' .
-                      '(general_ledger         | invoice_edit         | vendor_invoice_edit | ' .
-                      ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit)');
+  $main::auth->assert('customer_vendor_edit');
 
   $::form->isblank("name", $::locale->text("Name missing!"));
 

diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl
index a50d184..2bec003 100755 (executable)
--- a/scripts/installation_check.pl
+++ b/scripts/installation_check.pl
@@ -13,9 +13,29 @@ BEGIN {
   $master_templates = './templates/print/';
 }
 
+unless (eval { require Config::Std; 1 }){
+  print STDERR <<EOL ;
++------------------------------------------------------------------------------+
+  Perl Modul Config::Std could not be loaded.
+
+  Debian: you may install the needed *.deb package with:
+    apt-get install libconfig-std-perl
+
+  RPM: There is a rpm package "perl-Config-Std"
+
+  Suse: you may install the needed *.rpm package with:
+    zypper install perl-Config-Std
+
++------------------------------------------------------------------------------+
+EOL
+
+  exit 72;
+}
+
 use SL::InstallationCheck;
 use SL::LxOfficeConf;
 
+
 my %check;
 Getopt::Long::Configure ("bundling");
 GetOptions(