From: Jan Büren <jan@lx-office-hosting.de>
Date: Mon, 22 Nov 2010 13:48:27 +0000 (+0100)
Subject: FiBu -> Bericht -> Offene Forderung | Offene Verbindlichkeiten um Altersstrukturliste... 
X-Git-Tag: release-2.6.2beta1~86
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=891fe11e0c8386b11920ddd3d14947e6e4dfb7a6;p=kivitendo-erp.git

FiBu -> Bericht -> Offene Forderung | Offene Verbindlichkeiten um Altersstrukturliste (30, 60, 90, 120) erweitert
---

diff --git a/SL/RP.pm b/SL/RP.pm
index 1ee39843c..99595c166 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1182,9 +1182,19 @@ sub aging {
     $dpt_join = qq| JOIN department d ON (a.department_id = d.id) |;
     $where .= qq| AND (a.department_id = | . conv_i($department_id, 'NULL') . qq|)|;
   }
+  my $review_of_aging_list;
+  if ($form->{review_of_aging_list}) {
+    if ($form->{review_of_aging_list} =~ m "-"){
+      my @period = split(/-/, $form->{review_of_aging_list});
+      $review_of_aging_list = " AND $period[0] < date_part('days', now() - duedate) 
+                                AND date_part('days', now() - duedate)  < $period[1]";
+    } else {
+      $form->{review_of_aging_list} =~ s/[^0-9]//g;
+      $review_of_aging_list = " AND $form->{review_of_aging_list} < date_part('days', now() - duedate)"; 
+    }
+  }
 
   my $q_details = qq|
-    -- between 0-30 days
 
     SELECT ${ct}.id AS ctid, ${ct}.name,
       street, zipcode, city, country, contact, email,
@@ -1202,7 +1212,7 @@ sub aging {
       AND (${arap}.${ct}_id = ${ct}.id)
       AND (${ct}.id = ?)
       AND (transdate <= (date $todate) $fromwhere )
-
+      $review_of_aging_list
     ORDER BY ctid, transdate, invnumber |;
 
   my $sth_details = prepare_query($form, $dbh, $q_details);
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 9862f30fb..e1b0773f7 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -265,14 +265,14 @@ sub report {
 
 <input type=hidden name=title value="$form->{title}">
 
-<table width=100%>
+<table width=100% border="0">
   <tr>
     <th class=listtop>$form->{title}</th>
   </tr>
   <tr height="5"></tr>
   <tr>
     <td>
-      <table>
+      <table border="0">
       $department
 |;
 
@@ -805,6 +805,18 @@ $jsscript
           <th align=right>| . $locale->text($label) . qq|</th>
           <td>$vc</td>
         </tr>
+        <tr>
+          <td>| . $locale->text('Review of Aging list') . qq|</td>
+          <td><select name="review_of_aging_list"> 
+              <option></option>
+              <option>0-30</option>
+              <option>30-60</option>
+              <option>60-90</option>
+              <option>90-120</option>
+              <option>> 120</option>
+              </select>
+          </td>
+        </tr>
         <tr>
           <td align=left colspan=4>| . $locale->text('From') . qq|&nbsp;
               $button1
diff --git a/doc/changelog b/doc/changelog
index 1eae93f3d..0623529ac 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -19,6 +19,7 @@
     befinden anzuzeigen (s.a.: doc/excel_templates.txt).
   - FiBu -> Bericht um Suchfeld Kontonummer erweitert
   - Ansprechpartner für abweichende Lieferadresse, um das Attribut Geschlecht erweitert
+  - FiBu -> Bericht -> Offene Forderung | Offene Verbindlichkeiten um Altersstrukturliste (30, 60, 90, 120) erweitert
 
   API Änderungen:
 
diff --git a/locale/de/all b/locale/de/all
index 56acd0937..97a436685 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -1358,6 +1358,7 @@ $self->{texts} = {
   'Revenue Account'             => 'Erlöskonto',
   'Revenues EU with UStId'      => 'Erl&ouml;se EU m. UStId',
   'Revenues EU without UStId'   => 'Erl&ouml;se EU o. UStId',
+  'Review of Aging list'        => 'Altersstrukturliste',
   'Right'                       => 'Rechts',
   'SAVED'                       => 'Gespeichert',
   'SAVED FOR DUNNING'           => 'Gespeichert',