Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d0ce6033

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

  • ID d0ce6033f26bbee4cc8b66523bca5d6dbe3a01ae
  • Vorgänger c22267b0
  • Nachfolger 5d4d2cde

design40: Übernahme von 38b1400715 SEPA: within_skonto_period direkt (..)

Unterschiede anzeigen:

templates/design40_webpages/sepa/bank_transfer_add.html
41 41 
      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
42 42 
      <th>[% 'Invoice' | $T8 %]</th>
43 43 
      <th>[% 'Amount' | $T8 %]</th>
44 
      <th>[% 'SEPA Transfer Amount' | $T8 %]</th>
44 45 
      <th>[% 'Open amount' | $T8 %]</th>
45 46 
      <th>[% 'Invoice Date' | $T8 %]</th>
46 47 
      <th>[% 'Due Date' | $T8 %]</th>
......
56 57 
        <td>
57 58 
          <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(invoice.id) %]">
58 59 
          <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]">
59 
          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.open_sepa_transfer_amount, 2) %]">
60 
          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %]">
60 61 
          <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.skonto_amount, 2) %]">
61 62 
          [% IF invoice.vc_bank_info_ok && !invoice.is_sepa_blocked %]
62 63 
            [% L.checkbox_tag("ids[]", value=invoice.id, checked=invoice.checked) %]
......
88 89 
          -%]
89 90 
         </a>
90 91 
        </td>
91 
        <td>[% LxERP.format_amount(invoice.invoice_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
92 
        <td>[% LxERP.format_amount(invoice.open_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
92 
        <td>[% LxERP.format_amount(invoice.invoice_amount, 2) %]</td>
93 
        <td>[% LxERP.format_amount(invoice.transfer_amount * -1, 2) %]</td>
94 
        <td>[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %] </td>
93 95 
        <td>[% invoice.transdate %]</td>
94 96 
        <td>[% invoice.duedate %]</td>
95 97 
        <td>
......
101 103 
         <input type="text" name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="30">
102 104 
        </td>
103 105 
        <td>
104 
          <input type="text" 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">
106 
          <input type="text" id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% IF invoice.within_skonto_period %] [% LxERP.format_amount(invoice.amount_less_skonto, 2) %] [% ELSE %] [% LxERP.format_amount(invoice.open_amount - invoice.transfer_amount, 2) %][% END %]" style="text-align: right" size="12">
105 107 
        </td>
106 108 
        <td>
107 109 
          [% 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' ) %]
......
165 167 
  // alert("found id " + id);
166 168 
  if ( $(this).val() == "without_skonto" ) {
167 169 
      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
168 
  } else if ( $(this).val() == "difference_as_skonto" ) {
169 
      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
170 170 
  } else if ( $(this).val() == "with_skonto_pt" ) {
171 171 
            $('#' + id).val( $('#amount_less_skonto_' + id).val() );
172 172 
  }

Auch abrufbar als: Unified diff