Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index c2b309f..03f1104 100644 (file)
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -23,6 +23,7 @@ use strict;
   { "name" => "Template", "url" => "http://search.cpan.org/~abw/" },
   { "name" => "Digest::MD5", "url" => "http://search.cpan.org/~gaas/" },
   { "name" => "PDF::API2", "url" => "http://search.cpan.org/~areibens/" },
+  { "name" => "URI", "url" => "http://search.cpan.org/~gaas/" },
   { "name" => "XML::Writer", "url" => "http://search.cpan.org/~josephw/" },
   );
 

diff --git a/doc/INSTALL.texi b/doc/INSTALL.texi
index 3ea3b1d..9a1435a 100644 (file)
--- a/doc/INSTALL.texi
+++ b/doc/INSTALL.texi
@@ -93,7 +93,7 @@ Diese Pakete k
 
 Für Debian oder Ubuntu benötigen Sie diese Pakete:
 
-@code{apache postgresql libdbi-perl libdbd-pg-perl libpg-perl libpdf-api2-perl libclass-accessor-perl libarchive-zip-perl libtext-iconv-perl libyaml-perl libtext-csv-perl libio-stringy-perl libtemplate-perl}
+@code{apache postgresql libdbi-perl libdbd-pg-perl libpg-perl libpdf-api2-perl libclass-accessor-perl libarchive-zip-perl libtext-iconv-perl libyaml-perl libtext-csv-perl libio-stringy-perl libtemplate-perl lib-uriperl libxml-simple-perl}
 
 Für Fedora Core benötigen Sie unter anderem diese Pakete:
 
@@ -101,7 +101,7 @@ F
 
 Für OpenSuSE benötigen Sie diese Pakete:
 
-@code{apache2 postgresql-server perl-DBI perl-DBD-Pg perl-Archive-Zip perl-Class-Accessor perl-Text-Iconv perl-Text-CSV_XS perl-IO-stringy perl-Template-Toolkit}
+@code{apache2 postgresql-server perl-DBI perl-DBD-Pg perl-Archive-Zip perl-Class-Accessor perl-Text-Iconv perl-Text-CSV_XS perl-IO-stringy perl-Template-Toolkit perl-URI perl-XML-Writer}
 
 Einige Module werden von Lx-Office benötigt, sind aber evtl. nicht als
 Distributionspakete vorhanden, und/oder nicht praktikabel zu installieren.

diff --git a/locale/de/SKR04-3804-addition b/locale/de/SKR04-3804-addition
new file mode 100644 (file)
index 0000000..cebe31d
--- /dev/null
+++ b/locale/de/SKR04-3804-addition
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+
+$self->{texts} = {
+  'Database update error:'      => 'Fehler beim Datenbankupgrade:',
+};
+
+$self->{subs} = {
+  'do_query'                    => 'do_query',
+  'do_update'                   => 'do_update',
+  'mydberror'                   => 'mydberror',
+  'print_3804_already_exists'   => 'print_3804_already_exists',
+  'print_past_booking_warning'  => 'print_past_booking_warning',
+  'weiter'                      => 'continue',
+};
+
+1;