Offene Forderung: Falls Typ Schlussrechnung, Hinweis auf manuelles Ausbuchen

diff --git a/SL/RP.pm b/SL/RP.pm
index 80e83d56912249e66349a235015d6e5a38672a4b..28d01af19c7572ab34c65db403679a1b79a42d35 100644 (file)
--- a/SL/RP.pm
+++ b/SL/RP.pm
@@ -1296,7 +1296,7 @@ sub aging {
     SELECT ${ct}.id AS ctid, ${ct}.name,
       street, zipcode, city, country, contact, email,
       phone as customerphone, fax as customerfax, ${ct}number,
     SELECT ${ct}.id AS ctid, ${ct}.name,
       street, zipcode, city, country, contact, email,
       phone as customerphone, fax as customerfax, ${ct}number,

-      "invnumber", "transdate",
+      "invnumber", "transdate", "type",

       (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, datepaid, (amount - paid) as current_open,
       (SELECT $buysell
       (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, datepaid, (amount - paid) as current_open,
       (SELECT $buysell

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 2c3c560567e9fc9f7350f82bf247eaa86632f06a..630a2b5bddbd795f5ab664200736f0d1bacac4b2 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -98,6 +98,7 @@ use strict;
 # $locale->text('Payments')
 # $locale->text('Project Transactions')
 # $locale->text('Business evaluation')
 # $locale->text('Payments')
 # $locale->text('Project Transactions')
 # $locale->text('Business evaluation')

+# $locale->text('Final Invoice, please use mark as paid manually')

 
 # $form->parse_html_template('rp/html_report_susa')
 
 
 # $form->parse_html_template('rp/html_report_susa')
 


@@ -1006,7 +1007,7 @@ sub aging {
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
 
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 

-  my @columns = qw(statement ct invnumber transdate duedate amount open datepaid current_open);
+  my @columns = qw(statement ct invnumber transdate duedate amount open datepaid current_open type);

   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'), },
   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'), },


@@ -1017,6 +1018,7 @@ sub aging {
     'open'      => { 'text' => $locale->text('Open'), },
     'datepaid'  => { 'text' => $locale->text('Date of Last Payment'), visible => ($form->{reporttype} eq 'custom') },
     'current_open' => { 'text' => $locale->text('Open Amount at Last Payment Date'), visible => ($form->{reporttype} eq 'custom') },
     'open'      => { 'text' => $locale->text('Open'), },
     'datepaid'  => { 'text' => $locale->text('Date of Last Payment'), visible => ($form->{reporttype} eq 'custom') },
     'current_open' => { 'text' => $locale->text('Open Amount at Last Payment Date'), visible => ($form->{reporttype} eq 'custom') },

+    'type'      => { 'text' => $locale->text('Note'), },

   );
 
   my %column_alignment = ('statement' => 'center',
   );
 
   my %column_alignment = ('statement' => 'center',


@@ -1103,6 +1105,12 @@ sub aging {
     }
 
     $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
     }
 
     $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));

+    if ($row->{type}->{data} eq 'final_invoice') {
+      $row->{type}->{data} = $locale->text('Final Invoice, please use mark as paid manually');
+      $row->{type}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
+    } else {
+      $row->{type}->{data} = '';
+    }

 
     if ($previous_ctid != $ref->{ctid}) {
       $row->{statement}->{raw_data} =
 
     if ($previous_ctid != $ref->{ctid}) {
       $row->{statement}->{raw_data} =

diff --git a/locale/de/all b/locale/de/all
index 1edac184d7d28a85b29d2960170864b011648e20..42f9db400861dfc542c85e711943d688dead8533 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1569,6 +1569,7 @@ $self->{texts} = {
   'Filter record template'      => 'Filter für Buchungsvorlagen',
   'Final Invoice'               => 'Schlussrechnung',
   'Final Invoice (one letter abbreviation)' => 'F',
   'Filter record template'      => 'Filter für Buchungsvorlagen',
   'Final Invoice'               => 'Schlussrechnung',
   'Final Invoice (one letter abbreviation)' => 'F',

+  'Final Invoice, please use mark as paid manually' => 'Rechnungstyp Schlussrechnung, bitte den Beleg manuell als bezahlt markieren',

   'Financial Controlling'       => 'Finanzcontrolling',
   'Financial Controlling Report' => 'Finanzcontrollingbericht',
   'Financial Overview'          => 'Finanzübersicht',
   'Financial Controlling'       => 'Finanzcontrolling',
   'Financial Controlling Report' => 'Finanzcontrollingbericht',
   'Financial Overview'          => 'Finanzübersicht',