From: Jan Büren <jan@lx-office-hosting.de>
Date: Thu, 12 May 2011 13:11:32 +0000 (+0200)
Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~25^2~40
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/1740411d06cfea8f43fce1db3e7fa08b7ceb262e?ds=sidebyside;hp=-c

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

1740411d06cfea8f43fce1db3e7fa08b7ceb262e
diff --combined SL/Form.pm
index 97ae0d454,f43328e10..dfff9b4f7
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@@ -779,13 -779,6 +779,6 @@@ sub _prepare_html_template 
    $language = "de" unless ($language);
  
    if (-f "templates/webpages/${file}.html") {
-     if ((-f ".developer") && ((stat("templates/webpages/${file}.html"))[9] > (stat("locale/${language}/all"))[9])) {
-       my $info = "Developer information: templates/webpages/${file}.html is newer than the translation file locale/${language}/all.\n" .
-         "Please re-run 'locales.pl' in 'locale/${language}'.";
-       print(qq|<pre>$info</pre>|);
-       ::end_of_request();
-     }
- 
      $file = "templates/webpages/${file}.html";
  
    } else {
@@@ -1637,24 -1630,7 +1630,24 @@@ sub date_closed 
    my $dbh = $self->dbconnect($myconfig);
  
    my $query = "SELECT 1 FROM defaults WHERE ? < closedto";
 -  my $sth = prepare_execute_query($self, $dbh, $query, $date);
 +  my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date));
 +
 +  # Falls $date = '' - Fehlermeldung aus der Datenbank. Ich denke,
 +  # es ist sicher ein conv_date vorher IMMER auszuführen.
 +  # Testfälle ohne definiertes closedto:
 +  #   Leere Datumseingabe i.O.
 +  #     SELECT 1 FROM defaults WHERE '' < closedto
 +  #   normale Zahlungsbuchung über Rechnungsmaske i.O.
 +  #     SELECT 1 FROM defaults WHERE '10.05.2011' < closedto 
 +  # Testfälle mit definiertem closedto (30.04.2011):
 +  #  Leere Datumseingabe i.O.
 +  #   SELECT 1 FROM defaults WHERE '' < closedto
 +  # normale Buchung im geschloßenem Zeitraum i.O.
 +  #   SELECT 1 FROM defaults WHERE '21.04.2011' < closedto
 +  #     Fehlermeldung: Es können keine Zahlungen für abgeschlossene Bücher gebucht werden!
 +  # normale Buchung in aktiver Buchungsperiode i.O.
 +  #   SELECT 1 FROM defaults WHERE '01.05.2011' < closedto
 +
    my ($closed) = $sth->fetchrow_array;
  
    $main::lxdebug->leave_sub();