From 03f9eac39d30ffe348947910e98929292ef42617 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 22 Feb 2016 11:45:18 +0100
Subject: [PATCH] =?utf8?q?Sornorechnungen=20l=C3=B6schen=20k=C3=B6nnen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Stornorechnungen (Rechnungsnummern »Storno zu 12345«), nicht aber
stornierte Rechnung (Rechnungsnummer »12345«), sollten vom Frontend her
löschbar sein, sofern die Mandantenkonfiguration dies
zulässt. Andernfalls hätte man keine Chance, eine fälschlicherweise
stornierte Rechnung wieder zu ent-stornieren.

Der Backendcode kann Stornorechnungen bereits seit langem richtig
löschen. Dadurch wird die stornierte Rechnung auch automatisch wieder
geöffnet.
---
 SL/IS.pm                               | 2 +-
 templates/webpages/is/form_footer.html | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SL/IS.pm b/SL/IS.pm
index c82e731fa..6e9e96012 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1907,7 +1907,7 @@ sub retrieve_invoice {
       qq|SELECT
            a.invnumber, a.ordnumber, a.quonumber, a.cusordnumber,
            a.orddate, a.quodate, a.globalproject_id,
-           a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
+           a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.storno_id, a.gldate,
            a.shippingpoint, a.shipvia, a.notes, a.intnotes, a.taxzone_id,
            a.duedate, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.shipto_id, a.cp_id,
            a.employee_id, a.salesman_id, a.payment_id,
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index 1a9a39334..741d7ad8f 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -170,8 +170,10 @@
 [% IF id && !is_type_credit_note %]
     <input class="submit" type="submit" name="action" value="[% 'Credit Note' | $T8 %]" data-require-transaction-description="[% INSTANCE_CONF.get_require_transaction_description_ps %]">
 [% END %]
-[% IF show_delete && !storno %]
+[% IF show_delete && (!storno || storno_id) %]
     <input class="submit" type="submit" name="action" value="[% 'Delete' | $T8 %]">
+[% END %]
+[% IF show_delete && !storno %]
     <input class="submit" type="submit" name="action" value="[% 'Post' | $T8 %]" data-require-transaction-description="[% INSTANCE_CONF.get_require_transaction_description_ps %]">
 [% END %]
     <input class="submit" type="submit" name="action" value="[% 'Order' | $T8 %]">
-- 
2.20.1