From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 3 Jul 2007 15:49:11 +0000 (+0000)
Subject: Rechnungsliste: Unterscheidung zwischen Stornorechnung und stornierter Rechnung wiede... 
X-Git-Tag: release-2.4.3^2~52
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3915f5c658e23587976dcc08ce137f4350429fcb;p=kivitendo-erp.git

Rechnungsliste: Unterscheidung zwischen Stornorechnung und stornierter Rechnung wieder gefixt.
---

diff --git a/SL/AR.pm b/SL/AR.pm
index cd4063695..79653a757 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -411,7 +411,7 @@ sub ar_transactions {
     qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate, | .
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
-    qq|  a.shippingpoint, a.storno, a.globalproject_id, | .
+    qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
     qq|  a.marge_total, a.marge_percent, | .
     qq|  a.transaction_description, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 57822abc9..627cbee87 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -781,7 +781,7 @@ sub form_footer {
 
     # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
     print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
-      if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap'));
+      if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}));
 
     print qq| <input class=submit type=submit name=action value="| . $locale->text('Post Payment') . qq|">
               <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|">
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index f755bbc15..305b6aaad 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1534,8 +1534,8 @@ sub ar_transactions {
 
     map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
 
-    my $is_storno  = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
-    my $has_storno = $ar->{storno} && !$is_storno;
+    my $is_storno  = $ar->{storno} && !$ar->{storno_id};
+    my $has_storno = $ar->{storno} && $ar->{storno_id};
 
     $ar->{type} =
       $has_storno       ? $locale->text("Invoice with Storno (abbreviation)") :