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

diff --git a/SL/AR.pm b/SL/AR.pm
index 1754fe6ea5515385d63984b9fd45ba3345b79faf..a3284ed9265f1541d84fa29733a98324068f4804 100644 (file)
--- 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|  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, | .
     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 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";
     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 0e5ab85a9b54265a2c6926236c7d35d3527ecb4a..585301c25a22139e6fe9c8e19aad833e49801a07 100644 (file)
--- 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
   @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);
 
   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'), },
     '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)) {
   );
 
   foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {