From: Jan Büren <jan@lx-office-hosting.de>
Date: Tue, 4 Jan 2011 13:12:32 +0000 (+0100)
Subject: Kundentyp in Rechnungssuche auch als Wert in Rechnungsübersicht anzeigen und exportieren
X-Git-Tag: release-2.6.2beta1~2^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9263b0fac80043206bb1e32c47e2abbc3395d206;p=kivitendo-erp.git

Kundentyp in Rechnungssuche auch als Wert in Rechnungsübersicht anzeigen und exportieren
---

diff --git a/SL/AR.pm b/SL/AR.pm
index 1754fe6ea..a3284ed92 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -417,7 +417,7 @@ sub ar_transactions {
     qq|  a.marge_total, a.marge_percent, | .
     qq|  a.transaction_description, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
-    qq|  c.name, c.customernumber, c.country, c.ustid, | .
+    qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
     qq|  e.name AS employee, | .
     qq|  e2.name AS salesman, | .
     qq|  tz.description AS taxzone, | .
@@ -436,6 +436,7 @@ sub ar_transactions {
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
     qq|LEFT JOIN tax_zones tz ON (tz.id = c.taxzone_id)| .
     qq|LEFT JOIN payment_terms pt ON (pt.id = c.payment_id)| .
+    qq|LEFT JOIN business b ON (b.id = c.business_id)| .
     qq|LEFT JOIN department d ON (d.id = a.department_id)|;
 
   my $where = "1 = 1";
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 0e5ab85a9..585301c25 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1346,7 +1346,7 @@ sub ar_transactions {
   @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid
        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
-       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts);
+       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype);
 
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
@@ -1382,6 +1382,7 @@ sub ar_transactions {
     'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
     'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
+    'customertype'            => { 'text' => $locale->text('Customer type'), },
   );
 
   foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {