From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 1 Oct 2015 11:43:25 +0000 (+0200)
Subject: Rechnungssuche: optionale Spalte Mahnstufe implementiert
X-Git-Tag: release-3.4.1~681
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=cff1389b37e5adfde7734718a02290421aa1bf9a;p=kivitendo-erp.git

Rechnungssuche: optionale Spalte Mahnstufe implementiert
---

diff --git a/SL/AR.pm b/SL/AR.pm
index ad38a7f8e..284174396 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -467,6 +467,7 @@ sub ar_transactions {
     qq|  c.id as customer_id, | .
     qq|  e.name AS employee, | .
     qq|  e2.name AS salesman, | .
+    qq|  dc.dunning_description, | .
     qq|  tz.description AS taxzone, | .
     qq|  pt.description AS payment_terms, | .
     qq{  ( SELECT ch.accno || ' -- ' || ch.description
@@ -481,6 +482,7 @@ sub ar_transactions {
     qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
     qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
+    qq|LEFT JOIN dunning_config dc ON (a.dunning_config_id = dc.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
     qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
     qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| .
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index e299d90a9..148ac0be9 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -922,7 +922,7 @@ sub ar_transactions {
   @columns =
     qw(transdate id type invnumber ordnumber cusordnumber 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 customertype direct_debit);
+       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype direct_debit dunning_description);
 
   my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
   my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
@@ -969,6 +969,7 @@ sub ar_transactions {
     'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
     'customertype'            => { 'text' => $locale->text('Customer type'), },
     'direct_debit'            => { 'text' => $locale->text('direct debit'), },
+    dunning_description       => { 'text' => $locale->text('Dunning level'), },
     %column_defs_cvars,
   );
 
diff --git a/locale/de/all b/locale/de/all
index 2a05468f5..ff04503ba 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -964,6 +964,7 @@ $self->{texts} = {
   'Dunning Level missing in row ' => 'Mahnlevel fehlt in ',
   'Dunning Process Config saved!' => 'Mahnwesenkonfiguration gespeichert!',
   'Dunning Process started for selected invoices!' => 'Mahnprozess für selektierte Rechnungen gestartet',
+  'Dunning level'               => 'Mahnstufe',
   'Dunning number'              => 'Mahnungsnummer',
   'Dunning overview'            => 'Mahnungsübersicht',
   'Dunning status'              => 'Mahnstatus',
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 4e066042a..7d3158ee0 100644
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -214,6 +214,8 @@
            <td nowrap>[% 'Document Project Number' | $T8 %]</td>
            <td align=right><input name="l_transaction_description" id="l_transaction_description" class=checkbox type=checkbox value=Y[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]></td>
            <td nowrap>[% 'Transaction description' | $T8 %]</td>
+           <td align=right><input name="l_dunning_description" id="l_dunning_description" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Dunning level' | $T8 %]</td>
           </tr>
           <tr>
            <td align=right><input name="l_taxzone" id="l_taxzone" class=checkbox type=checkbox value=Y></td>