From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 18:18:41 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~40^2~1^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a3f5ca64363e68adb11dfc93672b8786cd31801f;hp=79d876f9797e2c8693d9cc88f7e18afb1fadba4d;p=kivitendo-erp.git

Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
---

diff --git a/SL/InstallationCheck.pm b/SL/InstallationCheck.pm
index bfbc1c65c..947be97d1 100644
--- a/SL/InstallationCheck.pm
+++ b/SL/InstallationCheck.pm
@@ -56,7 +56,9 @@ BEGIN {
 );
 
 @developer_modules = (
+  { name => "DBIx::Log4perl",                      url => "http://search.cpan.org/~mjevans/", },
   { name => "Devel::REPL",                         url => "http://search.cpan.org/~doy/",       debian => 'libdevel-repl-perl' },
+  { name => "Log::Log4perl",                       url => "http://search.cpan.org/~mschilli/",  debian => 'liblog-log4perl-perl' },
   { name => "LWP::Simple",                         url => "http://search.cpan.org/~gaas/",      debian => 'libwww-perl', dist_name => 'libwww-perl' },
   { name => "Moose::Role",                         url => "http://search.cpan.org/~doy/",       debian => 'libmoose-role-perl' },
   { name => "Perl::Tags",                          url => "http://search.cpan.org/~osfameron/", debian => 'libperl-tags-perl' },
diff --git a/doc/changelog b/doc/changelog
index beaa2b5e5..28da8968f 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -105,7 +105,8 @@ Wichtige Änderungen:
 
 Bugfixes:
  - Punkt in Belegnummer korrekt für WebDAV File Feature escapt (Bug 2394)
-
+ - Stornierte Rechnungen (sowohl die Stornorechnung als auch das Storno nicht
+   Buchen oder Löschen, egal was in der Mandantenkonfiguration steht)
 
 2012-12-10 - Release 3.0.0
 
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 45664520d..6b3426b60 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -164,7 +164,7 @@
 [% IF id && !is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]">
 [% END %]
-[% IF show_delete %]
+[% IF show_delete && !storno %]
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
     <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]">
 [% END %]