From 547401680ef809e57fcf15e66cf8430c0bdd4cfe Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 4 May 2007 13:14:35 +0000
Subject: [PATCH] =?utf8?q?Anzeige=20der=20Rechnungstypen:=20Aufteilung=20d?=
 =?utf8?q?er=20Stornorechnung=20in=20die=20urspr=C3=BCngliche=20Rechnung?=
 =?utf8?q?=20mit=20Storno=20"R(S)"=20und=20die=20Stornorechnung=20selber?=
 =?utf8?q?=20"S".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/ar.pl | 7 ++++++-
 locale/de/all     | 1 +
 locale/de/ar      | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index da33886a1..e7b36efc0 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1644,8 +1644,13 @@ sub ar_transactions {
 
     $column_data{invnumber} =
       "<td><a href=$module?action=edit&id=$ar->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+
+    my $is_storno  = $ar->{storno} && ($ar->{invnumber} =~ /^Storno zu/);
+    my $has_storno = $ar->{storno} && !$is_storno;
+
     $column_data{type} = "<td>" .
-      ($ar->{storno}     ? $locale->text("Storno (one letter abbreviation)") :
+      ($has_storno       ? $locale->text("Invoice with Storno (abbreviation)") :
+       $is_storno        ? $locale->text("Storno (one letter abbreviation)") :
        $ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") :
        $ar->{invoice}    ? $locale->text("Invoice (one letter abbreviation)") :
                            $locale->text("AR Transaction (abbreviation)"))
diff --git a/locale/de/all b/locale/de/all
index 247a89a28..bf1d90fd5 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -572,6 +572,7 @@ gestartet',
   'Invoice Number missing!'     => 'Rechnungsnummer fehlt!',
   'Invoice deleted!'            => 'Rechnung gelöscht!',
   'Invoice has already been storno\'d!' => 'Diese Rechnung wurde bereits storniert.',
+  'Invoice with Storno (abbreviation)' => 'R(S)',
   'Invoices'                    => 'Rechnungen',
   'Is this a summary account to record' => 'Buchungskonto in',
   'It is possible to do this automatically for some Buchungsgruppen, but not for all.' => 'Es ist m&ouml;glich, dies f&uuml;r einige, aber nicht f&uuml;r alle Buchungsgruppen automatisch zu erledigen.',
diff --git a/locale/de/ar b/locale/de/ar
index 3ccb13d6f..c34ab7835 100644
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -73,6 +73,7 @@ $self->{texts} = {
   'Invoice Date'                => 'Rechnungsdatum',
   'Invoice Date missing!'       => 'Rechnungsdatum fehlt!',
   'Invoice Number'              => 'Rechnungsnummer',
+  'Invoice with Storno (abbreviation)' => 'R(S)',
   'Jan'                         => 'Jan',
   'January'                     => 'Januar',
   'Jul'                         => 'Jul',
-- 
2.20.1