From 9263b0fac80043206bb1e32c47e2abbc3395d206 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Tue, 4 Jan 2011 14:12:32 +0100 Subject: [PATCH] =?utf8?q?Kundentyp=20in=20Rechnungssuche=20auch=20als=20W?= =?utf8?q?ert=20in=20Rechnungs=C3=BCbersicht=20anzeigen=20und=20exportiere?= =?utf8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/AR.pm | 3 ++- bin/mozilla/ar.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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)) { -- 2.20.1