Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 60c55297

Von Cem Aydin vor etwa 2 Jahren hinzugefügt

  • ID 60c55297cb80e10f615b0568aab62c5a042b4273
  • Vorgänger 4b0fcc90
  • Nachfolger abb23347

Design 4.0: invoice Templates aktualisieren

Behebt u.a. #518.

Unterschiede anzeigen:

templates/design40_webpages/is/_payments.html
130 130
</table>
131 131

  
132 132
<script type='text/javascript'>
133
  $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val('[% LxERP.format_amount(paid_missing, 2) %]') });
133
  $('#is_set_to_paid_missing').click(function(){ $('input[name^="paid_"]:last').val("[% LxERP.format_amount(paid_missing, 2) %]") });
134 134
</script>
templates/design40_webpages/is/form_footer.html
86 86
  </div>
87 87
[% END %]
88 88

  
89
[% PROCESS 'is/_payments.html' %]
89
[% IF is_type_normal_invoice OR  is_type_credit_note %]
90
  [% PROCESS 'is/_payments.html' %]
91
[% END %]
90 92

  
91 93
</div><!--  /.ui-tabs-panel /#ui-tabs-basic-data -->
92 94

  
......
107 109
<input type="hidden" name="customer_discount" value="[% customer_discount %]">
108 110
<input type="hidden" name="gldate" value="[% gldate %]">
109 111

  
112
[%- IF INSTANCE_CONF.get_create_qrbill_invoices <= 0 %]
113
 <input type="hidden" name="qrbill_without_amount" value="[% qrbill_without_amount %]">
114
[%- END %]
115

  
110 116
<div id="shipto_inputs" class="hidden">[% PROCESS 'common/_ship_to_dialog.html' cvars=shipto_cvars %]</div>
111 117
<div id="email_inputs" style="display: none"></div>
112 118
<div id="print_options" style="display: none">[% print_options %]</div>
templates/design40_webpages/is/form_header.html
21 21
<input type="hidden" name="follow_up_trans_info_1" id="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
22 22
<input type="hidden" name="follow_up_rowcount" id="follow_up_rowcount" value="1">
23 23
<input type="hidden" name="lastmtime" id="lastmtime" value="[% HTML.escape(lastmtime) %]">
24

  
24
<input type="hidden" name="already_printed_flag" id="already_printed_flag" value="0">
25
<input type="hidden" name="has_qr_reference" id="has_qr_reference" value="[% has_qr_reference %]">
26
[%- IF qr_reference %]
27
[%   L.hidden_tag("qr_reference", qr_reference) %]
28
[%- END %]
29
[% IF !id %]
30
[%   L.hidden_tag('form_validity_token', form_validity_token) %]
31
[% END %]
25 32

  
26 33
[% IF saved_message != '' %]<p>[% saved_message %]</p>[% END %]
27 34

  
......
36 43
    [% END %]
37 44
    [% IF id %]
38 45
      [% IF INSTANCE_CONF.get_doc_storage %]
39
        <li><a href="controller.pl?action=File/list&file_type=document&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
40
        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=invoice&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
46
        <li><a href="controller.pl?action=File/list&file_type=document&object_type=[% type %]&object_id=[% HTML.url(id) %]">[% 'Documents' | $T8 %]</a></li>
47
        <li><a href="controller.pl?action=File/list&file_type=attachment&object_type=[% type %]&object_id=[% HTML.url(id) %]">[% 'Attachments' | $T8 %]</a></li>
41 48
      [% END %]
42 49
      [% IF AUTH.assert('record_links', 1) %]
43 50
        <li><a href="controller.pl?action=RecordLinks/ajax_list&object_model=Invoice&object_id=[% HTML.url(id) %]">[% 'Linked Records' | $T8 %]</a></li>
......
63 70
        [% P.customer_vendor.picker("customer_id", customer_id, type="customer", class="wi-wide initial_focus", size=36, onchange="\$('#update_button').click()") %]
64 71
        [% #L.button_tag("show_vc_details('customer')", LxERP.t8('Details (one letter abbreviation)'), class='wi-tiny neutral') %]
65 72
        <a href="javascript:show_vc_details('customer')" class="button-image info tooltipster-html" title="[% 'Detailed information about this customer' | $T8 %]"><img src="image/detail.png"></a>
73
        [% P.link_tag('controller.pl?action=CustomerVendor/edit&db=customer&id=' _ customer_id, LxERP.t8('Edit'), target="_blank", title=LxERP.t8('Open in new window')) %]
66 74
        [% L.hidden_tag("previous_customer_id", customer_id) %]
67 75
        [% L.hidden_tag("customer_pricegroup_id", customer_pricegroup_id) %]
68 76
      </td>
......
85 93
       [% L.button_tag("kivi.SalesPurchase.edit_custom_shipto()", LxERP.t8("Custom shipto"), class="wi-wide neutral below") %]
86 94
      </td>
87 95
    </tr>
96
    [% IF customer_obj.additional_billing_addresses.as_list.size %]
97
    <tr>
98
      <th>[% 'Custom Billing Address' | $T8 %]</th>
99
      <td>
100
        [% L.select_tag('billing_address_id', customer_obj.additional_billing_addresses,
101
                        with_empty=1, default=billing_address_id, value_key='id', title_key='displayable_id', class="wi-wide") %]
102
      </td>
103
    </tr>
104
    [% END %]
88 105
    <tr>
89 106
      <th>[% 'Credit Limit' | $T8 %]</th>
90 107
      <td>
......
224 241
      </th>
225 242
    </tr>
226 243
    <tr>
227
      <th>[% 'direct debit' | $T8 %] [% L.checkbox_tag('direct_debit', 'checked', direct_debit) %]</th>
244
      <th>[% L.checkbox_tag('direct_debit', 'checked', direct_debit, label=LxERP.t8('direct debit')) %]</th>
245
    </tr>
246
    [%- IF INSTANCE_CONF.get_create_qrbill_invoices > 0 %]
247
    <tr>
248
      <th>[% L.checkbox_tag('qrbill_without_amount', 'checked', qrbill_without_amount, label=LxERP.t8('QR bill without amount')) %]</th>
249
    </tr>
250
    <tr>
251
      <th>[% 'QR bill unstructured message' | $T8 %]</th>
252
    </tr>
253
    <tr>
254
      <th>[% L.input_tag('qr_unstructured_message', qr_unstructured_message, class="wi-wide") %]</th>
228 255
    </tr>
256
    [%- END %]
229 257
    <tr>
230 258
      <th class="caption">[% 'Notes (will appear on hard copy)' | $T8 %]</th>
231 259
    </tr>
......
271 299
        <th>[% 'Credit Note' | $T8 %]</th>
272 300
        <!-- <th>[% 'Credit Note Number' | $T8 %]</th> -->
273 301
        <td>[% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")', class='wi-date') %]</td>
274
        <td><input type="text" name="invnumber" id="invnumber" value="[% HTML.escape(invnumber) %]" class="wi-small"></td>
302
        <td>
303
          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
304
            [% L.input_tag("invnumber", invnumber, size="11", class="wi-small") %]
305
          [%- ELSIF id %]
306
            [% L.hidden_tag("invnumber", invnumber) %]
307
            [% HTML.escape(invnumber) %]
308
          [%- ELSE %]
309
            [% LxERP.t8("will be set upon posting") %]
310
          [%- END %]
311
        </td>
275 312
      </tr>
276 313
      <tr>
277 314
        <th>[% 'Invoice' | $T8 %]</th>
......
284 321
      <tr>
285 322
        <th>[% 'Invoice' | $T8 %]</th>
286 323
        <td>[% L.date_tag('invdate', invdate, onchange='kivi.SalesPurchase.set_duedate_on_reference_date_change("invdate")', class='wi-date') %]</td>
287
        <td><input type="text" name="invnumber" id="invnumber" value="[% HTML.escape(invnumber) %]" class="wi-small"></td>
324
        <td>
325
          [%- IF INSTANCE_CONF.get_sales_purchase_record_numbers_changeable %]
326
            [% L.input_tag("invnumber", invnumber, size="11", class="wi-small") %]
327
          [%- ELSIF id %]
328
            [% L.hidden_tag("invnumber", invnumber) %]
329
            [% HTML.escape(invnumber) %]
330
          [%- ELSE %]
331
            [% LxERP.t8("will be set upon posting") %]
332
          [%- END %]
333
        </td>
288 334
      </tr>
289 335
      <tr>
290 336
        <th>[% 'Due Date' | $T8 %]</th>
......
333 379
      <td></td>
334 380
      <td>[% L.select_tag('globalproject_id', ALL_PROJECTS, title_key = 'projectnumber', default = globalproject_id, with_empty = '1', onChange = "document.getElementById('update_button').click();", class="wi-small") %]</td>
335 381
    </tr>
382
    [%- IF has_qr_reference %]
383
    <tr>
384
      <th>[% 'QR reference' | $T8 %]</th>
385
      <td>
386
        [%- IF qr_reference %]
387
          [% HTML.escape(qr_reference_formatted) %]
388
        [%- ELSE %]
389
          [% LxERP.t8("will be set upon posting") %]
390
        [%- END %]
391
      </td>
392
    </tr>
393
    [%- END %]
336 394
    </tbody>
337 395
  </table>
338 396

  
......
346 404
[% IF (resubmit && is_format_html) || resubmit || creditwarning != '' %]
347 405
  <script type="text/javascript"><!--
348 406
    $('document').ready(function(){
407
      [% IF INSTANCE_CONF.get_invoice_prevent_browser_back %]
408
       function disableBack() { window.history.forward() };
409
       window.onload = disableBack();
410
       window.onpageshow = function(evt) { if (evt.persisted) disableBack() };
411
      [% END %]
412

  
349 413
      [% IF resubmit && is_format_html %]
350 414
        window.open('about:blank','Beleg');
351 415
        document.invoice.target = 'Beleg';
352 416
        kivi.SalesPurchase.show_print_dialog();
353 417
        kivi.SalesPurchase.print_record();
354 418
      [% ELSIF resubmit %]
355
        kivi.SalesPurchase.show_print_dialog();
356
        kivi.SalesPurchase.print_record();
419
        if ($('#already_printed_flag').val() === "0") {
420
          kivi.SalesPurchase.show_print_dialog();
421
          kivi.SalesPurchase.print_record();
422
          $('#already_printed_flag').val("1");
423
        }
357 424
      [% ELSIF creditwarning != '' %]
358 425
        alert('[% 'Credit Limit exceeded!!!' | $T8 %]');
359 426
      [% ELSE %]

Auch abrufbar als: Unified diff