Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b944c64c

Von Andreas Rudin vor mehr als 1 Jahr hinzugefügt

  • ID b944c64c118c72ad2e9e54223f7ef75bce67e4d5
  • Vorgänger bf081e7d
  • Nachfolger 65f0bba8

Design40 Korrektur bei der Darstellung des Umrechnungskurses

- Angebot und Auftrag: Input Feld verkleinert, damit alles auf einer
Zeile Platz findet
- Rechnung: Umrechnungskurs direkt unter der Waehrung plaziert

Unterschiede anzeigen:

templates/design40_webpages/is/form_header.html
149 149
        <input type="hidden" name="selectAR" value="[% selectAR | html %]">
150 150
      </td>
151 151
    </tr>
152
  [% IF currencies %]
153
    <tr>
154
      <th>[% 'Currency' | $T8 %]</th>
155
      <td>
156
       [%- IF readonly  %]
157
         [% HTML.escape(currency) %]
158
         [% L.hidden_tag("currency", currency) %]
159
       [%- ELSE %]
160
         [% currencies %]
161
       [%- END %]
162
      </td>
163
    </tr>
164
  [% END %]
165
  <!--PENDENT: Hardcoded! Ist das korrekt? hps-->
152
    [% IF currencies %]
153
      <tr>
154
        <th>[% 'Currency' | $T8 %]</th>
155
        <td>
156
         [%- IF readonly  %]
157
           [% HTML.escape(currency) %]
158
           [% L.hidden_tag("currency", currency) %]
159
         [%- ELSE %]
160
           [% currencies %]
161
         [%- END %]
162
        </td>
163
      </tr>
164
    [% END %]
165
    [% IF show_exchangerate %]
166
      <tr>
167
        <th>[% 'Exchangerate' | $T8 %]</th>
168
        <td>
169
          [%- IF readonly  %]
170
            [% LxERP.format_amount(exchangerate, 5) %]
171
            [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
172
          [% ELSE %]
173
            <input type="text" name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
174
          [% END %]
175
          [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
176
        </td>
177
      </tr>
178
    [% END %]
166 179
    <tr>
167 180
      <th>[% 'Steuersatz' | $T8 %]</th>
168 181
      <td>
......
203 216
        <input type="hidden" name="rndloss_accno" value="[% rndloss_accno %]">
204 217
      </td>
205 218
    </tr>
206
    [% IF show_exchangerate %]
207
      <tr>
208
        <th>[% 'Exchangerate' | $T8 %]</th>
209
        <td>
210
          [%- IF readonly  %]
211
            [% LxERP.format_amount(exchangerate, 5) %]
212
            [% L.hidden_tag("exchangerate", LxERP.format_amount(exchangerate, 5)) %]
213
          [% ELSE %]
214
            <input type="text" name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
215
          [% END %]
216
          [% IF record_forex %][% 'record exchange rate' | $T8 %][%- ELSE %][% 'default exchange rate' | $T8 %][%- END %]
217
        </td>
218
      </tr>
219
    [% END %]
220 219
    <tr>
221 220
      <th>[% 'Shipping Point' | $T8 %]</th>
222 221
      <td><input type="text" class="wi-wide" name="shippingpoint" value="[% HTML.escape(shippingpoint) %]"></td>
templates/design40_webpages/order/tabs/basic_data.html
90 90
      <tr id="exchangerate_settings" [%- IF SELF.order.currency_id==INSTANCE_CONF.get_currency_id %]style='display:none'[%- END %]>
91 91
        <th>[% 'Exchangerate' | $T8 %]</th>
92 92
        <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
93
          [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, class="reformat_number_as_null_number numeric wi-lightwide") %]
93
          [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, class="reformat_number_as_null_number numeric wi-small") %]
94 94
          [% INSTANCE_CONF.default_currency %]
95 95
          [% L.hidden_tag('old_currency_id', currency_id) %]
96 96
          [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]

Auch abrufbar als: Unified diff