Merge branch 'master' of ssh://git-bblessmann@lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/IC.pm b/SL/IC.pm
index ad17036..28fcc66 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -176,7 +176,7 @@ sub get_part {
 
       my $i = 1;
 
-      while (($form->{"make_$i"}, $form->{"model_$i"}, $form->{"old_lastcost_$i"}, 
+      while (($form->{"make_$i"}, $form->{"model_$i"}, $form->{"old_lastcost_$i"},
                 $form->{"lastcost_$i"}, $form->{"lastupdate_$i"}, $form->{"sortorder_$i"}) = $sth->fetchrow_array)
       {
         $i++;
@@ -502,9 +502,9 @@ sub save {
       if (($form->{"make_$i"}) || ($form->{"model_$i"})) {
         #hli
         $value = $form->parse_amount($myconfig, $form->{"lastcost_$i"});
-        if ($value == $form->{"old_lastcost_$i"}) 
+        if ($value == $form->{"old_lastcost_$i"})
         {
-            if ($form->{"lastupdate_$i"} eq "") { 
+            if ($form->{"lastupdate_$i"} eq "") {
                 $lastupdate = 'now()';
             } else {
                 $lastupdate = $dbh->quote($form->{"lastupdate_$i"});

diff --git a/SL/RP.pm b/SL/RP.pm
index 41cd390..607eb38 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -74,7 +74,7 @@ sub balance_sheet {
   }
 
   # get end of financial year and convert to Date format
-  my ($closedto) = selectfirst_arrayref_query($form, $dbh, 'SELECT closedto FROM defaults');
+  my ($closedto) = selectfirst_array_query($form, $dbh, 'SELECT closedto FROM defaults');
 
   # get date of last opening balance
   my $startdate = get_openbalance_date($closedto, $form->{asofdate});

diff --git a/locale/de/all b/locale/de/all
index d83821a..9735b39 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -225,6 +225,7 @@ $self->{texts} = {
   'Authentification tables creation' => 'Anlegen der Tabellen zur Benutzerauthentifizierung',
   'Auto Send?'                  => 'Auto. Versand?',
   'Automatically created invoice for fee and interest for dunning %s' => 'Automatisch erzeugte Rechnung für Gebühren und Zinsen zu Mahnung %s',
+  'Available'                   => 'Verfügbar',
   'Available qty'               => 'Lagerbestand',
   'BALANCE SHEET'               => 'BILANZ',
   'BIC'                         => 'BIC',
@@ -1102,7 +1103,7 @@ $self->{texts} = {
   'Not done yet'                => 'Noch nicht fertig',
   'Not obsolete'                => 'Gültig',
   'Note'                        => 'Hinweis',
-  'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' => 'Achtung: Steuerschlüssel brauchen ein gültiges "Gültig ab"-Datum und werden andernfalls ignoriert.',
+  'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' => '',
   'Notes'                       => 'Bemerkungen',
   'Notes (will appear on hard copy)' => 'Bemerkungen',
   'Nothing has been selected for removal.' => 'Es wurde nichts für eine Entnahme ausgewählt.',
@@ -1451,6 +1452,7 @@ $self->{texts} = {
   'Select the checkboxes that match users to the groups they should belong to.' => 'Wählen Sie diejenigen Checkboxen aus, die die Benutzer zu den gewüschten Gruppen zuordnen.',
   'Select type of removal'      => 'Grund der Entnahme auswählen',
   'Select type of transfer'     => 'Grund der Umlagerung auswählen',
+  'Selected'                    => 'Ausgewählt',
   'Selection'                   => 'Auswahlbox',
   'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' => 'Auswahlboxen: Das Optionenfeld muss die für die Auswahl verfügbaren Einträge enthalten. Die Einträge werden mit \'##\' voneinander getrennt. Beispiel: \'Früh##Normal##Spät\'.',
   'Sell Price'                  => 'Verkaufspreis',

diff --git a/scripts/locales.pl b/scripts/locales.pl
index ff2638b..16f2b3e 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -31,6 +31,7 @@ parse_args();
 my $basedir      = "../..";
 my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
+my @progdirs     = ( "$basedir/SL/Template/Plugin" );
 my $dbupdir      = "$basedir/sql/Pg-upgrade";
 my $dbupdir2     = "$basedir/sql/Pg-upgrade2";
 my $menufile     = "menu.ini";
@@ -42,11 +43,17 @@ my ($ALL_HEADER, $MISSING_HEADER, $LOST_HEADER);
 init();
 
 opendir DIR, "$bindir" or die "$!";
-my @progfiles = grep { /\.pl$/ && !/(_custom|^\.)/ } readdir DIR;
+my @progfiles = map { [ $_, $bindir ] } grep { /\.pl$/ && !/(_custom|^\.)/ } readdir DIR;
 seekdir DIR, 0;
 my @customfiles = grep /_custom/, readdir DIR;
 closedir DIR;
 
+foreach my $dir (@progdirs) {
+  opendir DIR, $dir or die "$!";
+  push @progfiles, map { [ $_, $dir ] } grep { /\.pm$/ } readdir DIR;
+  closedir DIR;
+}
+
 # put customized files into @customfiles
 my @menufiles;
 
@@ -91,7 +98,7 @@ chomp $charset;
 
 my %old_texts = %{ $self->{texts} || {} };
 
-map({ handle_file($_, $bindir); } @progfiles);
+map({ handle_file(@{ $_ }); } @progfiles);
 map({ handle_file($_, $dbupdir); } @dbplfiles);
 map({ handle_file($_, $dbupdir2); } @dbplfiles2);
 
@@ -283,11 +290,11 @@ sub extract_text_between_parenthesis {
 
     } else {
       if ($quote_next) {
+        $text .= '\\' unless $cur_char eq "'";
         $text .= $cur_char;
         $quote_next = 0;
 
       } elsif ($cur_char eq '\\') {
-        $text .= $cur_char;
         $quote_next = 1;
 
       } elsif ($cur_char eq $inside_string) {

diff --git a/templates/webpages/admin/edit_groups.html b/templates/webpages/admin/edit_groups.html
index 41cbf72..af71026 100644 (file)
--- a/templates/webpages/admin/edit_groups.html
+++ b/templates/webpages/admin/edit_groups.html
@@ -6,10 +6,7 @@
   <p class="message_ok">[% message %]</p>
   [% END %]
 
-  <form method="post" action="admin.pl">
-     <input type="hidden" name="back_nextsub" value="list_users">
-    <p><input type="submit" class="submit" name="action" value="[% 'Back' | $T8 %]"></p>
-  </form>
+  <p><a href="admin.pl?action=login">[% 'Back' | $T8 %]</a></p>
 
  <div class="listheading">[% 'Add a new group' | $T8 %]</div>
  <form method="post" action="admin.pl">
@@ -25,8 +22,6 @@
 
 
  <form name="Form" method="post" action="admin.pl">
-
-
   <div class="listheading">[% 'Edit and delete a group' | $T8 %]</div>
 
   [% IF num_groups %]
@@ -48,7 +43,6 @@
    <input type="submit" class="submit" name="action" value="[% 'Edit' | $T8 %]">
    <input type="submit" class="submit" name="action" value="[% 'Delete' | $T8 %]">
    [% END %]
-   <input type="hidden" name="back_nextsub" value="list_users">
   </p>
  </form>
 

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 6ccb7a2..6252ee1 100644 (file)
--- a/templates/webpages/am/edit_accounts.html
+++ b/templates/webpages/am/edit_accounts.html
@@ -143,7 +143,7 @@ window.onload = function() {
   <legend>
     [% 'Taxkeys and Taxreport Preferences' | $T8 %]
   </legend>
-  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not be in effect otherwise.' | $T8 %]</p>
+  <p style='font-weight:normal'>[% 'Note: Taxkeys must have a "valid from" date, and will not behave correctly without.' | $T8 %]</p>
 
             <table>
 [% IF account_exists %]