Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d6a21120

Von Moritz Bunkus vor mehr als 8 Jahren hinzugefügt

  • ID d6a2112059bfd74eaa3926b8f9d1cfb52bf0e2f4
  • Vorgänger b0eb18bf
  • Nachfolger b103ea25

Mahnungen: Rechnungen mit Lastschrifteinzug nur auf Wunsch mit anzeigen

Unterschiede anzeigen:

SL/DN.pm
523 523
       WHERE dunning_level = (SELECT MAX(dunning_level) FROM dunning_config)|;
524 524
  my ($id_for_max_dunning_level) = selectrow_query($form, $dbh, $query);
525 525

  
526
  if (!$form->{l_include_direct_debit}) {
527
    $where .= qq| AND NOT COALESCE(a.direct_debit, FALSE) |;
528
  }
529

  
526 530
  $query =
527 531
    qq|SELECT
528 532
         a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, a.language_id,
529 533
         ct.name AS customername, a.customer_id, a.duedate,
530 534
         a.amount - a.paid AS open_amount,
535
         a.direct_debit,
531 536

  
532 537
         cfg.dunning_description, cfg.dunning_level,
533 538

  
css/common.css
66 66
.cursor-default { cursor: default }
67 67
.cursor-pointer { cursor: pointer }
68 68
.cursor-help { cursor: help }
69

  
70
/* dunning */
71
#dunning_invoice_list .direct_debit td,
72
#dunning_invoice_list .direct_debit a {
73
  color: #aaa;
74
}
locale/de/all
1377 1377
  'Include in Report'           => 'In Bericht aufnehmen',
1378 1378
  'Include in drop-down menus'  => 'In Aufklappmenü aufnehmen',
1379 1379
  'Include invalid warehouses ' => 'Ungültige Lager berücksichtigen',
1380
  'Include invoices with direct debit' => 'Inklusive Rechnungen mit Lastschrifteinzug',
1380 1381
  'Includeable in reports'      => 'In Berichten anzeigbar',
1381 1382
  'Included in reports by default' => 'In Berichten standardmäßig enthalten',
1382 1383
  'Including'                   => 'Enthaltene',
templates/webpages/dunning/add.html
70 70
   </tr>
71 71

  
72 72
   <tr>
73
    <th align="right" nowrap>[% 'Group Invoices' | $T8 %]</th>
74
    <td><input type="checkbox" value="1" name="groupinvoices" checked></td>
73
    <th align="right" nowrap><label for="groupinvoices">[% 'Group Invoices' | $T8 %]</label></th>
74
    <td><input type="checkbox" value="1" id="groupinvoices" name="groupinvoices" checked></td>
75
   </tr>
76

  
77
   <tr>
78
    <th align="right" nowrap><label for="l_include_direct_debit">[% 'Include invoices with direct debit' | $T8 %]</label></th>
79
    <td><input type="checkbox" value="1" id="l_include_direct_debit" name="l_include_direct_debit"></td>
75 80
   </tr>
76 81
  </table>
77 82

  
templates/webpages/dunning/show_invoices.html
1 1
[%- USE T8 %]
2 2
[% USE HTML %]
3
[% USE L %]
3
[% USE L %][%- USE LxERP -%]
4 4
<h1>[% title %]</h1>
5 5

  
6 6
[% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
......
12 12

  
13 13
 <form name="Form" method="post" action="dn.pl">
14 14

  
15
  <table width="100%">
15
  <table width="100%" id="dunning_invoice_list">
16 16
   <th class="listheading" colspan="2">[% 'Current / Next Level' | $T8 %]</th>
17 17

  
18 18
   <th class="listheading">
......
35 35
   <th class="listheading">[% 'Dunning Duedate' | $T8 %]</th>
36 36
   <th class="listheading">[% 'Total Fees' | $T8 %]</th>
37 37
   <th class="listheading">[% 'Interest' | $T8 %]</th>
38
   [% IF l_include_direct_debit %]
39
    <th class="listheading">[% 'direct debit' | $T8 %]</th>
40
   [% END %]
38 41

  
39 42
   <!-- Ausgabe der einzelnen Zeilen -->
40 43

  
41 44
   [% FOREACH row = DUNNINGS %]
42
    <tr class="listrow[% loop.count % 2 %]">
45
    <tr class="listrow[% loop.count % 2 %][% IF row.direct_debit %] direct_debit[% END %]">
43 46

  
44 47
     <td>
45 48
      <input type="hidden" name="inv_id_[% loop.count %]" size="2" value="[% HTML.escape(row.id) %]">
......
68 71
     <td>[% HTML.escape(row.next_duedate) %]</td>
69 72
     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
70 73
     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
74
     [% IF l_include_direct_debit %]
75
     <td>
76
      [% IF row.direct_debit %][% LxERP.t8("yes") %][% ELSE %][% LxERP.t8("no") %][% END %]
77
     </td>
78
     [% END %]
71 79
    </tr>
72 80
   [% END %]
73 81
  </table>

Auch abrufbar als: Unified diff