Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1ced201d

Von Bernd Bleßmann vor mehr als 1 Jahr hinzugefügt

  • ID 1ced201db2d8fc0eeb80c0d4ea9cc48b7133fa85
  • Vorgänger 47b2bb2b
  • Nachfolger ef5a7368

Auftrags-Eingang: design40: Maske

Unterschiede anzeigen:

templates/design40_webpages/order/tabs/_item_input.html
36 36
        </td>
37 37
        [%- SET price = '' %]
38 38
        [%- IF SELF.created_part %]
39
          [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
39
          [%- SET price = LxERP.format_amount(((SELF.type == 'sales_quotation' || SELF.type == 'sales_order_intake' || SELF.type == 'sales_order') ? SELF.created_part.sellprice : SELF.created_part.lastcost), -2) -%]
40 40
        [%- END %]
41 41
        <td>
42 42
          <span class="label above">[% 'Price' | $T8 %]</span>
templates/design40_webpages/order/tabs/_price_sources_dialog.html
5 5
[% SET best_price = price_source.best_price %]
6 6
[% SET best_discount = price_source.best_discount %]
7 7
[% SET price_editable = 0 %]
8
[% IF (FORM.type == "sales_order" || FORM.type == "sales_quotation") %]
8
[% IF (FORM.type == "sales_order" || FORM.type == "sales_order_intake" || FORM.type == "sales_quotation") %]
9 9
  [% SET price_editable = AUTH.assert('sales_edit_prices', 1) %]
10 10
[% END %]
11 11
[% IF (FORM.type == "purchase_order" || FORM.type == "request_quotation") %]
templates/design40_webpages/order/tabs/_row.html
54 54
      [% L.hidden_tag("order.orderitems[].longdescription", ITEM.longdescription) %]
55 55
      [% L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L"), class="wi-tiny neutral") %]
56 56
    </td>
57
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
57
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
58 58
    <td>
59 59
      [%- L.div_tag(LxERP.format_amount(ITEM.shipped_qty, 2, 0) _ ' ' _ ITEM.unit, name="shipped_qty", class="numeric") %]
60 60
    </td>
......
92 92
                       class = "neutral") %]
93 93
    </td>
94 94
    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
95
    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
95
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
96 96
      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
97 97
    [% END %]
98 98
    [% IF (SELF.type == "purchase_order" || SELF.type == "request_quotation") %]
templates/design40_webpages/order/tabs/_second_row.html
7 7
<table>
8 8
  <tr>
9 9
    <td>
10
      [% IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
10
      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order") %]
11 11
        <b>[% 'Serial No.' | $T8 %]</b> [% L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15, "data-validate"="trimmed_whitespaces") %]
12 12
      [% END %]
13 13
      <b>[% 'Project' | $T8 %]</b> [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]
14
      [% IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
14
      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "purchase_order") %]
15 15
        <b>[% 'Reqdate' | $T8 %]</b> [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]
16 16
      [% END %]
17 17
      <b>[% 'Subtotal' | $T8 %]</b> [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]
......
19 19
        <b>[% 'Recurring billing' | $T8 %]</b>
20 20
        [% L.select_tag("order.orderitems[].recurring_billing_mode", [[ 'always', LxERP.t8('always') ], [ 'once',   LxERP.t8('once')   ], [ 'never',  LxERP.t8('never')  ]], default=ITEM.recurring_billing_mode) %]
21 21
      [% END %]
22
      [% IF (TYPE == "sales_order" || TYPE == "sales_quotation") %]
22
      [% IF (TYPE == "sales_order_intake" || TYPE == "sales_order" || TYPE == "sales_quotation") %]
23 23
        <b>[% 'Ertrag' | $T8 %]</b>
24 24
          <span name="linemargin">
25 25
            <span[% IF ITEM.marge_total < 0 %] class="plus0"[% END %]>
templates/design40_webpages/order/tabs/basic_data.html
235 235
          title_key='safe_name') %]</td>
236 236
      </tr>
237 237
    [% END %]
238
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
238
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
239 239
      <tr>
240 240
        <th>[% 'Order Number' | $T8 %]</th>
241 241
        <td>
......
250 250
        </td>
251 251
      </tr>
252 252
    [% END %]
253
    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
253
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
254 254
      [% SET quo_nr_txt = 'Quotation Number' %]
255 255
    [% ELSE %]
256 256
      [% SET quo_nr_txt = 'RFQ Number' %]
......
258 258
    <tr>
259 259
      <th>[% quo_nr_txt | $T8 %]</th>
260 260
      <td>
261
        [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
261
        [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
262 262
          [% L.input_tag('order.quonumber', SELF.order.quonumber, class='wi-normal') %]
263 263
        [%- ELSIF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
264 264
          [% L.input_tag('order.quonumber', SELF.order.quonumber, onchange='kivi.Order.set_number_in_title(this)', class='wi-normal') %]
......
270 270
        [%- END %]
271 271
      </td>
272 272
    </tr>
273
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
273
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
274 274
      <tr>
275 275
        <th>[% 'Customer Order Number' | $T8 %]</th>
276 276
        <td>[% L.input_tag('order.cusordnumber', SELF.order.cusordnumber, class='wi-normal') %]</td>
277 277
      </tr>
278 278
    [% END %]
279
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
279
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
280 280
      [% SET transdate_txt = 'Order Date' %]
281 281
    [% ELSIF SELF.type == "sales_quotation" %]
282 282
      [% SET transdate_txt = 'Quotation Date' %]
......
291 291
      <th>[% 'Tax point' | $T8 %]</th>
292 292
      <td>[% L.date_tag('order.tax_point_as_date', SELF.order.tax_point_as_date, class='wi-date recalc') %]</td>
293 293
    </tr>
294
    [% IF (SELF.type == "sales_order" || SELF.type == "purchase_order") %]
294
    [% IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") %]
295 295
      [% SET reqdate_txt = 'Reqdate'; SET reqdate_class = 'recalc' %]
296 296
    [% ELSIF SELF.type == "sales_quotation" %]
297 297
      [% SET reqdate_txt = 'Valid until'; SET reqdate_class = '' %]
......
360 360
      [%- END -%]
361 361
      <th id="partclass_header_id">[% 'Type'  | $T8 %]</th>
362 362
      <th id="description_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("description")'>[% 'Description' | $T8 %]</a></th>
363
      [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
363
      [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
364 364
      <th id="shipped_qty_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("shipped_qty")'>[% 'Delivered' | $T8 %]</a></th>
365 365
      [%- END -%]
366 366
      <th id="qty_header_id"><a href='#' onClick='javascript:kivi.Order.reorder_items("qty")'>        [% 'Qty'         | $T8 %]</a></th>
......
396 396
      [% PROCESS order/tabs/_tax_row.html TAX=tax TAXINCLUDED=SELF.order.taxincluded QUOTATION=SELF.order.quotation %]
397 397
    [% END %]
398 398
    <tr id="amount_row_id">
399
      [%- IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
399
      [%- IF (SELF.type == "sales_order_intake" || SELF.type == "sales_order" || SELF.type == "sales_quotation") -%]
400 400
      [%- SET marge_class = (SELF.order.marge_total < 0) ? 'plus0' : '' -%]
401 401
      <th colspan="2">[% 'Ertrag' | $T8 %]</th>
402 402
      <td colspan="2" class="numeric">[%- L.div_tag(SELF.order.marge_total_as_number, id='marge_total_id', class=marge_class) %]</td>

Auch abrufbar als: Unified diff