From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 28 Dec 2010 13:52:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~55
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/1f8f0aa0be2133ce5c93b2928cb5847a56b1c1fb?hp=67323585abd0916a113e8dcd32222e9627f1556c

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

diff --git a/SL/IC.pm b/SL/IC.pm
index ad1703650..28fcc66b6 100644
--- 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 41cd39041..607eb389e 100644
--- 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 39d02f2e0..9735b39e7 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -1103,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&uuml;r eine Entnahme ausgew&auml;hlt.',
diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html
index 6ccb7a20e..6252ee169 100644
--- 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 %]