Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e9b11e12

Von Jan Büren vor fast 3 Jahren hinzugefügt

  • ID e9b11e128378926d08c0e468603627aa7617ce10
  • Vorgänger 5532b7c8
  • Nachfolger 2f694073

Offene Forderung: Falls Typ Schlussrechnung, Hinweis auf manuelles Ausbuchen

Unterschiede anzeigen:

SL/RP.pm
1296 1296
    SELECT ${ct}.id AS ctid, ${ct}.name,
1297 1297
      street, zipcode, city, country, contact, email,
1298 1298
      phone as customerphone, fax as customerfax, ${ct}number,
1299
      "invnumber", "transdate",
1299
      "invnumber", "transdate", "type",
1300 1300
      (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",
1301 1301
      "duedate", invoice, ${arap}.id, date_part('days', now() - duedate) as overduedays, datepaid, (amount - paid) as current_open,
1302 1302
      (SELECT $buysell
bin/mozilla/rp.pl
98 98
# $locale->text('Payments')
99 99
# $locale->text('Project Transactions')
100 100
# $locale->text('Business evaluation')
101
# $locale->text('Final Invoice, please use mark as paid manually')
101 102

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

  
......
1006 1007

  
1007 1008
  my $report = SL::ReportGenerator->new(\%myconfig, $form);
1008 1009

  
1009
  my @columns = qw(statement ct invnumber transdate duedate amount open datepaid current_open);
1010
  my @columns = qw(statement ct invnumber transdate duedate amount open datepaid current_open type);
1010 1011
  my %column_defs = (
1011 1012
    'statement' => { raw_header_data => SL::Presenter::Tag::checkbox_tag("checkall", checkall => '[name^=statement_]'), 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, align => "center" },
1012 1013
    'ct'        => { 'text' => $form->{ct} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
......
1017 1018
    'open'      => { 'text' => $locale->text('Open'), },
1018 1019
    'datepaid'  => { 'text' => $locale->text('Date of Last Payment'), visible => ($form->{reporttype} eq 'custom') },
1019 1020
    'current_open' => { 'text' => $locale->text('Open Amount at Last Payment Date'), visible => ($form->{reporttype} eq 'custom') },
1021
    'type'      => { 'text' => $locale->text('Note'), },
1020 1022
  );
1021 1023

  
1022 1024
  my %column_alignment = ('statement' => 'center',
......
1103 1105
    }
1104 1106

  
1105 1107
    $row->{invnumber}->{link} =  build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
1108
    if ($row->{type}->{data} eq 'final_invoice') {
1109
      $row->{type}->{data} = $locale->text('Final Invoice, please use mark as paid manually');
1110
      $row->{type}->{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'callback', 'id=' . E($ref->{id}));
1111
    } else {
1112
      $row->{type}->{data} = '';
1113
    }
1106 1114

  
1107 1115
    if ($previous_ctid != $ref->{ctid}) {
1108 1116
      $row->{statement}->{raw_data} =
locale/de/all
1569 1569
  'Filter record template'      => 'Filter für Buchungsvorlagen',
1570 1570
  'Final Invoice'               => 'Schlussrechnung',
1571 1571
  'Final Invoice (one letter abbreviation)' => 'F',
1572
  'Final Invoice, please use mark as paid manually' => 'Rechnungstyp Schlussrechnung, bitte den Beleg manuell als bezahlt markieren',
1572 1573
  'Financial Controlling'       => 'Finanzcontrolling',
1573 1574
  'Financial Controlling Report' => 'Finanzcontrollingbericht',
1574 1575
  'Financial Overview'          => 'Finanzübersicht',

Auch abrufbar als: Unified diff