From 1d15301bf430856b94067dc7c57b850e682d6058 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 19:16:52 +0100
Subject: [PATCH] =?utf8?q?Bugfix=20zu=202173.=20Kein=20=C3=9Cberbuchen=20v?=
 =?utf8?q?on=20Stornos=20closes=20#2173=20Stornos=20sollten=20nicht=20mehr?=
 =?utf8?q?=20=C3=BCberbucht=20oder=20bebucht=20werden,=20egal=20was=20in?=
 =?utf8?q?=20der=20Mandantenkonfiguration=20eingestellt=20ist.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/changelog                          | 3 ++-
 templates/webpages/is/form_footer.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 3cffe0590..d3a49a372 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 %]
-- 
2.20.1