From: G. Richardson <information@kivitendo-premium.de>
Date: Thu, 11 Dec 2014 09:29:20 +0000 (+0100)
Subject: SL/DB/Invoice->abbreviation prüft jetzt invoice_type
X-Git-Tag: release-3.2.0beta~191
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=49f5b7f70599c029e87c494f559a6da5fde0d0c7;p=kivitendo-erp.git

SL/DB/Invoice->abbreviation prüft jetzt invoice_type
---

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index a84324c40..6af70994b 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -330,14 +330,13 @@ sub displayable_type {
 }
 
 sub abbreviation {
-  my $self = shift;
+  my ($self) = @_;
 
-  return t8('AR Transaction (abbreviation)') if !$self->invoice;
-  return t8('Credit note (one letter abbreviation)') if $self->type eq 'credit_note' && $self->amount < 0 && !$self->storno;
-  return t8('Invoice (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->type ne 'credit_note' && $self->amount < 0 &&  $self->storno;
-  return t8('Credit note (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->type eq 'credit_note' && $self->amount > 0 &&  $self->storno;
+  return t8('AR Transaction (abbreviation)')         if $self->invoice_type eq 'ar_transaction';
+  return t8('Credit note (one letter abbreviation)') if $self->invoice_type eq 'credit_note';
+  return t8('Invoice (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->invoice_type eq 'invoice_storno';
+  return t8('Credit note (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")"  if $self->invoice_type eq 'credit_note_storno';
   return t8('Invoice (one letter abbreviation)');
-
 }
 
 sub date {