From: Jan Büren <jan@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 18:18:02 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~40^2~3
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/24cc5f2baffdb1fd52acb76e8d73be3e694b1737?hp=e94625b35f4b17a63425a12b9ca14797b5bb5847

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

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 %]