From: G. Richardson <information@lx-office-hosting.de>
Date: Thu, 19 May 2011 09:20:17 +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~15^2~7
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e7c0b7735ba1144f8b5df864ff8ad537d5cdf87c?hp=14cb0d372f4a99e49fd1097850f076709820d1f3

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

diff --git a/SL/Common.pm b/SL/Common.pm
index dae75322f..c0bca0195 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -372,9 +372,8 @@ sub webdav_folder {
     mkdir_with_parents($path);
 
   } else {
-    my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
+    my $base_path = $ENV{'SCRIPT_NAME'};
     $base_path =~ s|[^/]+$||;
-    $base_path =~ s|/$||;
     # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2.
     if (opendir my $dir, $path) {
       foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
@@ -390,7 +389,7 @@ sub webdav_folder {
 
         push @{ $form->{WEBDAV} }, {
           'name' => $fname,
-          'link' => "$base_path/$file",
+          'link' => $base_path . $file,
           'type' => $is_directory ? $main::locale->text('Directory') : $main::locale->text('File'),
         };
       }
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 775d4dff7..e3cecef11 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -401,7 +401,7 @@ sub _get_transactions {
     my $firstrun = 1;
     my $subcent  = abs($count) < 0.02;
 
-    while (abs($count) > 0.01 || $firstrun || ($subcent && abs($count) > 0.001)) {
+    while (abs($count) > 0.01 || $firstrun || ($subcent && abs($count) > 0.005)) {
       my $ref2 = $sth->fetchrow_hashref("NAME_lc");
       last unless ($ref2);
 
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index b78ebb015..e0631b863 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -106,6 +106,7 @@ sub checkbox_tag {
   $attributes{id}    ||= $self->name_to_id($name);
   $attributes{value}   = 1 unless defined $attributes{value};
   my $label            = delete $attributes{label};
+  my $checkall         = delete $attributes{checkall};
 
   if ($attributes{checked}) {
     $attributes{checked} = 'checked';
@@ -115,6 +116,7 @@ sub checkbox_tag {
 
   my $code  = $self->html_tag('input', undef,  %attributes, name => $name, type => 'checkbox');
   $code    .= $self->html_tag('label', $label, for => $attributes{id}) if $label;
+  $code    .= $self->javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall;
 
   return $code;
 }
@@ -578,6 +580,10 @@ If C<%attributes> contains a key C<label> then a HTML 'label' tag is
 created with said C<label>. No attribute named C<label> is created in
 that case.
 
+If C<%attributes> contains a key C<checkall> then the value is taken as a
+JQuery selector and clicking this checkbox will also toggle all checkboxes
+matching the selector.
+
 =item C<date_tag $name, $value, cal_align =E<gt> $align_code, %attributes>
 
 Creates a date input field, with an attached javascript that will open a
diff --git a/config/lx_office.conf.default b/config/lx_office.conf.default
index c8924efd4..f1e7621c6 100644
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
@@ -59,6 +59,7 @@ bind_password =
 [system]
 # EUR: Einnahmen-Überschussrechnung (net income method). Set this to 1
 # if your company uses the net income method and to 0 for balancing.
+# Additional note in german: Sollversteuerung = 0; Istversteuerung = 1
 eur = 1
 
 # Set language for login and admin forms. Currently "de" (German),
diff --git a/doc/changelog b/doc/changelog
index 03a8f54af..ef2adab7b 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -39,7 +39,7 @@
 
   Liste gefixter Bugs aus dem Bugtracker:
 
-  - Bugfix 1613: Status teilweise
+  - Bugfix 1613: Abteilung wird bei Verkaufsrechnungen nicht gespeichert
   - Bugfix 1642: Lieferantenrabatt wird korrekt gespeichert, aber nicht mehr angezeigt
   - Bugfix 1626: Beim Festlegen der Standardkonten kann beim Warenbestand eine Überschrift ausgewählt werden.
   - Bugfix 1584: Summen und Saldenliste: Export to PDF/CSV in EÜR Modus falsch