Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7e252eb8

Von Cem Aydin vor fast 2 Jahren hinzugefügt

  • ID 7e252eb84d7a6f90f656e037523730d6d97c0598
  • Vorgänger 9dfe43d7
  • Nachfolger 3f0e31fd

design40: order/tabs/basic_data.html aktualisiert

- 6587b90 Auftrags-Controller: Kunde-/Lieferant in neuem Tab öffnen mit js
- 844a541 Zusätzliche Rechnungsadressen: in Verkaufsbelegmasken auswählbar
- 7968fc1 Angebot/Auftrag Status: Breite einheitlich mit Benutzer und Verkäufer-Feld
- 677f0dd Ein-/Verkauf: Belegnummern von uns erzeugter Belege nicht ändern können
- inline Styles durch Klassen ersetzt

Unterschiede anzeigen:

templates/design40_webpages/order/tabs/basic_data.html
29 29
                      title= LxERP.t8('Show details'),
30 30
                      onclick="kivi.Order.show_vc_details_dialog();",
31 31
                      class="button-image info") %]
32
          [% P.link_tag("javascript:void(0);", LxERP.t8('Edit'), title=LxERP.t8('Open in new window'), onclick="kivi.Order.open_customervendor_tab('#order_${SELF.cv}_id', '${SELF.cv}')") %]
32 33
        </td>
33 34
      </tr>
34 35
      <tr id='cp_row' [% IF !SELF.order.${SELF.cv}.contacts.size %]style='display:none'[% END %]>
......
55 56
                             title_key='displayable_id',
56 57
                             value_key='shipto_id',
57 58
                             with_empty=0,
58
                             style='width: 300px') %]
59
                             class='wi-lightwide') %]
59 60
          </span>
60 61
          [% L.button_tag("kivi.Order.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
61 62
        </td>
62 63
      </tr>
64
      [%- IF SELF.cv == "customer" %]
65
      <tr id="billing_address_row"[% IF !SELF.order.customer.additional_billing_addresses.as_list.size %]style="display:none"[% END %]>
66
        <th>[% 'Custom Billing Address' | $T8 %]</th>
67
        <td>
68
          [% L.select_tag('order.billing_address_id',
69
                           SELF.order.customer.additional_billing_addresses,
70
                           default=SELF.order.billing_address_id,
71
                           title_key='displayable_id',
72
                           value_key='id',
73
                           with_empty=1,
74
                           class='wi-lightwide') %]
75
        </td>
76
      </tr>
77
      [%- END %]
63 78
      [% PROCESS order/tabs/_business_info_row.html SELF=SELF %]
64 79
      <tr>
65 80
        <th>[% 'Steuersatz' | $T8 %]</th>
......
68 83
      [% SET currency_id = SELF.order.currency_id || INSTANCE_CONF.get_currency_id  # use default currency for new order %]
69 84
      <tr id="currency_settings">
70 85
        <th>[% 'Currency' | $T8 %]</th>
71
        <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name') %]</td>
86
        <td>[% L.select_tag('order.currency_id', SELF.all_currencies, default=currency_id, value_key='id', title_key='name', class='wi-lightwide') %]</td>
72 87
      </tr>
73 88
      <tr id="exchangerate_settings" [%- IF SELF.order.currency_id==INSTANCE_CONF.get_currency_id %]style='display:none'[%- END %]>
74 89
        <th>[% 'Exchangerate' | $T8 %]</th>
75 90
        <td> 1 <span id="currency_name">[% SELF.order.currency.name %]</span> =
76
          [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, size="15", class="reformat_number_as_null_number numeric") %]
91
          [% L.input_tag('order.exchangerate_as_null_number', SELF.order.exchangerate_as_null_number, class="reformat_number_as_null_number numeric wi-lightwide") %]
77 92
          [% INSTANCE_CONF.default_currency %]
78 93
          [% L.hidden_tag('old_currency_id', currency_id) %]
79 94
          [% L.hidden_tag('old_exchangerate', SELF.order.exchangerate_as_null_number) %]
......
83 98
        <tr>
84 99
          <th>[% 'Language' | $T8 %]</th>
85 100
          <td>
86
            [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, style='width:300px') %]
101
            [% L.select_tag('order.language_id', SELF.all_languages, default=SELF.order.language_id, title_key='description', with_empty=1, class='wi-lightwide') %]
87 102
          </td>
88 103
        </tr>
89 104
      [% END %]
......
205 220
      <td>[% L.select_tag('order.employee_id',
206 221
        SELF.all_employees,
207 222
        default=(SELF.order.employee_id ? SELF.order.employee_id : SELF.current_employee_id),
223
        class='wi-normal',
208 224
        title_key='safe_name') %]</td>
209 225
    </tr>
210 226
    [% IF SELF.cv == 'customer' %]
......
213 229
        <td>[% L.select_tag('order.salesman_id',
214 230
          SELF.all_salesmen,
215 231
          default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
232
          class='wi-normal',
216 233
          title_key='safe_name') %]</td>
217 234
      </tr>
218 235
    [% END %]
219 236
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
220 237
      <tr>
221 238
        <th>[% 'Order Number' | $T8 %]</th>
222
        <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11, onchange='kivi.Order.set_number_in_title(this)', class='wi-small numeric') %]</td>
239
        <td>
240
          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
241
            [% L.input_tag('order.ordnumber', SELF.order.ordnumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
242
          [%- ELSIF SELF.order.id %]
243
            [% HTML.escape(SELF.order.ordnumber) %]
244
            [% L.hidden_tag("order.ordnumber", SELF.order.ordnumber) %]
245
          [% ELSE %]
246
            [% LxERP.t8("will be set upon saving") %]
247
          [%- END %]
248
        </td>
223 249
      </tr>
224 250
    [% END %]
225 251
    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
......
229 255
    [% END %]
230 256
    <tr>
231 257
      <th>[% quo_nr_txt | $T8 %]</th>
232
      [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
233
        <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, size=5, class='wi-small') %]</td>
234
      [% ELSE %]
235
        <td>[% L.input_tag('order.quonumber', SELF.order.quonumber, class='wi-small numeric', size=5, class='wi-small', onchange='kivi.Order.set_number_in_title(this)') %]</td>
236
      [% END %]
258
      <td>
259
        [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
260
          [% L.input_tag('order.quonumber', SELF.order.quonumber, class='wi-normal') %]
261
        [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
262
          [% L.input_tag('order.quonumber', SELF.order.quonumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
263
        [%- ELSIF SELF.order.id %]
264
          [% HTML.escape(SELF.order.quonumber) %]
265
          [% L.hidden_tag("order.quonumber", SELF.order.quonumber) %]
266
        [% ELSE %]
267
          [% LxERP.t8("will be set upon saving") %]
268
        [%- END %]
269
      </td>
237 270
    </tr>
238 271
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
239 272
      <tr>
240 273
        <th>[% 'Customer Order Number' | $T8 %]</th>
241
        <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, size=5, class='wi-small numeric') %]</td>
274
        <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, class='wi-normal') %]</td>
242 275
      </tr>
243 276
    [% END %]
244 277
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]

Auch abrufbar als: Unified diff