Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision cc5bb640

Von Frank Messerschmidt vor fast 8 Jahren hinzugefügt

  • ID cc5bb6402ff4a8d4fc849c8f3f90450507a2e588
  • Vorgänger e1b64393
  • Nachfolger b3835437

SEPA-Überweisungen / Bankeinzüge : GUI-Verbesserung #1

- Neusortierung umbenennen der Spalten:
Fälligkeitsdatum, Lieferant, Rechnung, Rechnungsbetrag, offener Betrag, Rechnungsdatum, Zahlungsbedingungen, Skonto Information, Zahlungsart Überweisungsbetrag, Verwendungszweck
- Umbenennung der Spalten (zusätzlich mit Zeilenumbruch zur reduzierung der Spaltenbreite)
- Rechnungs-<br>betrag: vorher Betrag
- Rechnungs-<br>datum : vorher Rechnungsdatum
- Fälligkeits-<br>datum: vorher Fälligkeitsdatum
- Überweisungs-<br>betrag: vorher Überweisungsbetrag
- Deaktivierung der automatischen Auswahl der Checkboxen beim Laden der Rechnungen

implementiert TICKET #4263

Unterschiede anzeigen:

bin/mozilla/sepa.pl
49 49
  # has been selected. For purchase invoices it's the other way
50 50
  # around: if direct debit is active then the vendor will collect
51 51
  # from us automatically and we don't have to send money manually.
52
  $_->{checked} = ($vc eq 'customer' ? $_->{direct_debit} : !$_->{direct_debit}) for @{ $invoices };
52
  #$_->{checked} = ($vc eq 'customer' ? $_->{direct_debit} : !$_->{direct_debit}) for @{ $invoices };
53 53

  
54 54
  my $translation_list = GenericTranslations->list(translation_type => 'sepa_remittance_info_pfx');
55 55
  my %translations     = map { ( ($_->{language_id} || 'default') => $_->{translation} ) } @{ $translation_list };
locale/de/all
390 390
  'Bank transfer amount'        => 'Überweisungssumme',
391 391
  'Bank transfer payment list for export #1' => 'Überweisungszahlungsliste für SEPA-Export #1',
392 392
  'Bank transfer via SEPA'      => 'Überweisung via SEPA',
393
  'Bank transfer<br>amount'     => 'Überweisungs-<br>betrag',
393 394
  'Bank transfers via SEPA'     => 'Überweisungen via SEPA',
394 395
  'Base unit'                   => 'Basiseinheit',
395 396
  'Basic Data'                  => 'Basisdaten',
......
1023 1024
  'Drawing'                     => 'Zeichnung',
1024 1025
  'Due'                         => 'Fällig',
1025 1026
  'Due Date'                    => 'Fälligkeitsdatum',
1027
  'Due<br>Date'                 => 'Fälligkeits-<br>datum',
1026 1028
  'Due Date missing!'           => 'Fälligkeitsdatum fehlt!',
1027 1029
  'Due to security concerns these files have to be deleted or moved after the migration before you can continue using kivitendo.' => 'Aus Sicherheitsgründen müssen diese Dateien nach erfolgter Migration gelöscht oder verschoben werden, bevor kivitendo weiter genutzt werden kann.',
1028 1030
  'Duedate +Days'               => 'Fälligkeitsdatum +Tage',
......
1579 1581
  'Invoice total'               => 'Die Rechnungssumme',
1580 1582
  'Invoice total less discount' => 'Rechnungssumme abzüglich Skonto',
1581 1583
  'Invoice with Storno (abbreviation)' => 'R(S)',
1584
  'Invoice<br>Amount'           => 'Rechnungs-<br>betrag',
1585
  'Invoice<br>Date'             => 'Rechnungs-<br>datum',
1582 1586
  'Invoices'                    => 'Rechnungen',
1583 1587
  'Invoices, Credit Notes & AR Transactions' => 'Rechnungen, Gutschriften & Debitorenbuchungen',
1584 1588
  'Is Searchable'               => 'Durchsuchbar',
templates/webpages/sepa/bank_transfer_add.html
33 33
   <table border="0">
34 34
    <tr>
35 35
     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
36
     <th class="listheading" align="right">[% 'Due<br>Date' | $T8 %]</th>
36 37
     <th class="listheading">[% IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
37 38
     <th class="listheading">[% 'Invoice' | $T8 %]</th>
38
     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
39
     <th class="listheading" align="right">[% 'Invoice<br>Amount' | $T8 %]</th>
39 40
     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
40
     <th class="listheading" align="right">[% 'Invoice Date' | $T8 %]</th>
41
     <th class="listheading" align="right">[% 'Due Date' | $T8 %]</th>
41
     <th class="listheading" align="right">[% 'Invoice<br>Date' | $T8 %]</th>
42 42
     <th class="listheading">[% 'Payment Terms' | $T8 %]</th>
43
     <th class="listheading">[% 'Purpose' | $T8 %]</th>
44
     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
45
     <th class="listheading" align="right">[% 'Payment type' | $T8 %]</th>
46 43
     <th class="listheading" align="right">[% 'Skonto information' | $T8 %]</th>
44
     <th class="listheading" align="right">[% 'Payment type' | $T8 %]</th>
45
     <th class="listheading" align="right">[% 'Bank transfer<br>amount' | $T8 %]</th>
46
     <th class="listheading">[% 'Purpose' | $T8 %]</th>
47 47
    </tr>
48 48

  
49 49
    [%- FOREACH invoice = INVOICES %]
......
59 59
        <input type="checkbox" name="bank_transfers[].selected" value="1"[% IF invoice.checked %] checked[% END %]>
60 60
       [%- END %]
61 61
      </td>
62
      <td align="right">[% invoice.duedate %]</td>
62 63
      <td>
63 64
       [%- IF loop.first || (previous_vcname != invoice.vcname) %]
64 65
        <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(invoice.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
......
84 85
      <td align="right">[% LxERP.format_amount(invoice.invoice_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
85 86
      <td align="right">[% LxERP.format_amount(invoice.open_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
86 87
      <td align="right">[% invoice.transdate %]</td>
87
      <td align="right">[% invoice.duedate %]</td>
88 88
      <td align="left">[% HTML.escape(invoice.pt_description) %]</td>
89
      <td align="left" [%- IF invoice.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF invoice.skonto_amount %] [% LxERP.format_amount(invoice.percent_skonto, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount, 2) %] € bis [% invoice.skonto_date %] [%- END %]</td>
89 90
      <td>
90 91
    [% IF INSTANCE_CONF.get_sepa_reference_add_vc_vc_id %]
91 92
       [%- SET reference = invoice.reference_prefix _ invoice.invnumber _ invoice.reference_prefix_vc _ invoice.vc_vc_id %]
......
93 94
       [%- SET reference = invoice.reference_prefix _ invoice.invnumber %]
94 95
    [% END %]
95 96
       <input name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="60">
97
      [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
96 98
      </td>
97 99
      <td align="right">
98
       <input id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.invoice_amount_suggestion, 2) %]" style="text-align: right" size="12">
100
        <input id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.invoice_amount_suggestion, 2) %]" style="text-align: right" size="12">
99 101
      </td>
100 102
      <td>
101
      [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
103
      [%- SET reference = invoice.reference_prefix _ invoice.invnumber _ invoice.substitution _ invoice.vc_prefix _ invoice.vc_number %]
104
      <input name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="60">
102 105
      </td>
103
      <td align="left" [%- IF invoice.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF invoice.skonto_amount %] [% LxERP.format_amount(invoice.percent_skonto, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount, 2) %] € bis [% invoice.skonto_date %] [%- END %]</td>
104 106
     </tr>
105 107
    [%- END %]
106 108
   </table>

Auch abrufbar als: Unified diff