From: Jan Büren <jan@kivitendo.de>
Date: Wed, 18 Aug 2021 10:37:55 +0000 (+0200)
Subject:  #485 Forderungsliste um Zahlungsdatum erweitert
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~391
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=606b21908d42b97e98769da21ba4bcc72c58f92d;p=kivitendo-erp.git

 #485 Forderungsliste um Zahlungsdatum erweitert

Für nachträgliche Auswertungen der OPOS-Liste (Werthaltigkeit
im nachfolgendem Buchungsjahr)
---

diff --git a/SL/RP.pm b/SL/RP.pm
index ef93e73bb..70549a2c8 100644
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1298,7 +1298,7 @@ sub aging {
       phone as customerphone, fax as customerfax, ${ct}number,
       "invnumber", "transdate",
       (amount - COALESCE((SELECT sum(amount)*$ml FROM acc_trans WHERE chart_link ilike '%paid%' AND acc_trans.trans_id=${arap}.id AND acc_trans.transdate <= (date $todate)),0)) as "open", "amount",
-      "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays,
+      "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays, datepaid,
       (SELECT $buysell
        FROM exchangerate
        WHERE (${arap}.currency_id = exchangerate.currency_id)
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 392bf46bb..13545f2ad 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1006,8 +1006,7 @@ sub aging {
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  my @columns = qw(statement ct invnumber transdate duedate amount open);
-
+  my @columns = qw(statement ct invnumber transdate duedate amount open datepaid);
   my %column_defs = (
     'statement' => { raw_header_data => SL::Presenter::Tag::checkbox_tag("checkall", checkall => '[name^=statement_]'), 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, align => "center" },
     'ct'        => { 'text' => $form->{ct} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
@@ -1016,6 +1015,7 @@ sub aging {
     'duedate'   => { 'text' => $locale->text('Due'), },
     'amount'    => { 'text' => $locale->text('Amount'), },
     'open'      => { 'text' => $locale->text('Open'), },
+    'datepaid'  => { 'text' => $locale->text('Date Paid'), visible => ($form->{reporttype} eq 'custom') },
   );
 
   my %column_alignment = ('statement' => 'center',