Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision eab8255b

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

  • ID eab8255b9e11258bad5ed19b55f01baa304b24f1
  • Vorgänger 389dc658
  • Nachfolger 86a638aa

Zahlungsbewegungen in Fremdwährungen, summieren und Quelle des Kurses anzeigen

Unterschiede anzeigen:

templates/webpages/ap/form_header.html
355 355
              <td align="center">
356 356
                [% temp = "exchangerate_"_ i %]
357 357
                [% temp_forex = "forex_"_ i %]
358
                [% SET fx_paid      = 'fx_paid_'      _ i %]
359
                [% SET record_forex = 'record_forex_' _ i %]
360

  
358 361

  
359 362
                [% IF( $temp_forex || !changeable ) %]
360
                  [% $temp | html %]
363
                  [% $temp | html %] = [% LxERP.format_amount($fx_paid,2) %] [% currency %] </br>
364
                [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
365

  
361 366
                  <input type="hidden" name="[% temp %]" value="[% $temp | html %]">
362 367
                [% ELSE %]
363 368
                  <input name="[% temp %]" size="11" value="[% $temp | html %]">
364 369
                [% END %]
365

  
366 370
                <input type=hidden name="[% temp_forex %]" value="[% $temp_forex | html %]">
367 371
              </td>
368 372
            [% END %]
......
396 400
          <td></td>
397 401
          <td align="center">[% 'Total' | $T8 %]</td>
398 402
          <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
403
        [% IF ( !defaultcurrency || (currency != defaultcurrency) ) %]
404
            <td></td>
405
            <td align="center">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
406
            <input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
407
        [% END %]
408

  
399 409
        </tr>
400 410
        <tr>
401 411
          <td></td>
templates/webpages/ir/_payments.html
80 80
     <td align="center">
81 81
  [% SET forex        = 'forex_'        _ i %]
82 82
  [% SET exchangerate = 'exchangerate_' _ i %]
83
  [% SET fx_paid      = 'fx_paid_'      _ i %]
84
  [% SET record_forex = 'record_forex_' _ i %]
83 85
  [% IF $forex %]
84 86
        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
85
        [% LxERP.format_amount($forex, 5) %]
87
        <input type="hidden" name="record_forex_[% i %]" value="[% $record_forex %]">
88
        <input type="hidden" name="forex_[% i %]"        value="[% $forex %]">
89
        <input type="hidden" name="fx_paid_[% i %]"      value="[% $fx_paid %]">
90
          [% LxERP.format_amount($forex, 5) %] = [% $fx_paid %] [% currency %] </br>
91
          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
86 92
  [% ELSE %]
87 93
     [% IF $changeable %]
88 94
        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
......
110 116
    <tr>
111 117
      <td></td>
112 118
      <td></td>
113
      <td align="center">[% 'Total' | $T8 %]</td>
114
      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
119
      <td align="center">[%- 'Total' | $T8 %]</td>
120
      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
121
      <td></td>
122
      [% IF show_exchangerate %]
123
        <td align="center">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
124
        <input type="hidden" name="fx_totalpaid" value="[% fx_totalpaid %]">
125
      [% END %]
115 126
    </tr>
127
[% UNLESS show_exchangerate %]
116 128
    <tr>
117 129
      <td></td>
118 130
      <td></td>
119
      <td align="center">[% 'Missing amount' | $T8 %]</td>
131
      <td align="center">[%- 'Missing amount' | $T8 %]</td>
120 132
      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
121 133
    </tr>
134
[% END %]
122 135

  
123 136
     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
124 137
     <input type="hidden" name="selectAP_paid" value="[% selectAP_paid %]">
templates/webpages/is/_payments.html
88 88
     <td align="center">
89 89
  [% SET forex        = 'forex_'        _ i %]
90 90
  [% SET exchangerate = 'exchangerate_' _ i %]
91
  [% SET fx_paid      = 'fx_paid_'      _ i %]
92
  [% SET record_forex = 'record_forex_' _ i %]
91 93
  [% IF $forex %]
92 94
        <input type="hidden" name="exchangerate_[% i %]" value="[% LxERP.format_amount($exchangerate, 5) %]">
93
        [% LxERP.format_amount($forex, 5) %]
95
          [% LxERP.format_amount($forex, 5) %] = [% $fx_paid %] [% currency %] </br>
96
          [% IF $record_forex %][% 'bank transaction exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
94 97
  [% ELSE %]
95 98
     [% IF $changeable %]
96 99
        <input name="exchangerate_[% i %]" size="10" value="[% LxERP.format_amount($exchangerate, 5, 1) %]">
......
118 121
      <td></td>
119 122
      <td></td>
120 123
      <td align="center">[%- 'Total' | $T8 %]</td>
121
      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %]</td>
124
      <td align="center">[% LxERP.format_amount(totalpaid, 2) | html %] [% defaultcurrency %]</td>
125
      <td></td>
126
      [% IF show_exchangerate %]
127
        <td align="center">[% LxERP.format_amount(fx_totalpaid, 2) | html %] [% currency %]</td>
128
      [% END %]
122 129
    </tr>
130
[% UNLESS show_exchangerate %]
123 131
    <tr>
124 132
      <td></td>
125 133
      <td></td>
126 134
      <td align="center">[%- 'Missing amount' | $T8 %]</td>
127 135
      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
128 136
    </tr>
137
[% END %]
129 138
    <tr style='display:none'>
130 139
     <td>
131 140
     <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">

Auch abrufbar als: Unified diff