Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 408fae09

Von Bernd Bleßmann vor fast 2 Jahren hinzugefügt

  • ID 408fae09f3a6fbac95c230201bba77550d833535
  • Vorgänger 37642782
  • Nachfolger 599156c7

Design 4.0: Verknüpfte Belege: Verknüpfungen hinzufügen: Fixes

Übernahme der Anpssungen von "gerade eben".

Unterschiede anzeigen:

templates/design40_webpages/record_links/add_filter.html
10 10

  
11 11
<table class="tbl-horizontal">
12 12
  <caption>[% LxERP.t8("Add link: select records to link with") %]</caption>
13
  <colgroup> <col class="wi-normal"><col class="wi-verywide"> </colgroup> 
13
  <colgroup> <col class="wi-normal"><col class="wi-verywide"> </colgroup>
14 14
  <tbody>
15 15
    <tr>
16 16
      <th>[% LxERP.t8("Link to") %]</th>
......
23 23
                            [ 'to',   LxERP.t8("The existing record has been created from the link target to add."), ], ],
24 24
                            class='wi-verywide') %]</td>
25 25
    </tr>
26
    <tr>
26
    <tr class="record_links_add_filter_cv_row">
27 27
      <th>[% LxERP.t8("Customer/Vendor Number") %]</th>
28 28
      <td>[% L.input_tag('vc_number', is_sales ? SELF.object.customer.customernumber : SELF.object.vendor.vendornumber, class='wi-wide') %]</td>
29 29
    </tr>
30
    <tr>
30
    <tr class="record_links_add_filter_cv_row">
31 31
      <th>[% LxERP.t8("Customer/Vendor Name") %]</th>
32 32
      <td>[% L.input_tag('vc_name', is_sales ? SELF.object.customer.name : SELF.object.vendor.name, class='wi-wide') %]</td>
33 33
    </tr>
......
66 66
  $.ajax({
67 67
    url: url,
68 68
    success: function(new_data) {
69
      $("#record_list_filtered_list").html(new_data['html']);
70
      $('#add_selected_record_links_button').prop('disabled', new_data['count'] == 0);
69
      if (new_data['error']) {
70
        $("#record_list_filtered_list").html(kivi.t8('Error: #1', [ new_data['error'] ]));
71
        $('#add_selected_record_links_button').prop('disabled', true);
72
      } else {
73
        $("#record_list_filtered_list").html(new_data['html']);
74
        $('#add_selected_record_links_button').prop('disabled', new_data['count'] == 0);
75
      }
71 76
    }
72 77
  });
73 78
}
......
87 92
  var type  = $('#record_links_add_filter_link_type').val();
88 93
  var title = type == 'requirement_spec' ? kivi.t8('Title')
89 94
            : type == 'letter'           ? kivi.t8('Subject')
95
            : type == 'email_journal'    ? kivi.t8('Subject')
90 96
            :                              kivi.t8('Transaction description');
91 97

  
92
  if (type == 'letter') {
98
  if (type == 'letter' || type == 'email_journal' || type == 'gl_transaction') {
93 99
    $('#record_links_add_filter_project_row').hide();
94 100

  
95 101
  } else {
96 102
    $('#record_links_add_filter_project_row').show();
97 103
  }
98 104

  
105
  if (type == 'email_journal' || type == 'gl_transaction') {
106
    $('.record_links_add_filter_cv_row').hide();
107

  
108
  } else {
109
    $('.record_links_add_filter_cv_row').show();
110
  }
111

  
99 112
  $('#record_links_add_filter_title').html(title);
100 113
}
101 114
--></script>
templates/design40_webpages/record_links/add_list.html
14 14
    <thead>
15 15
      <tr>
16 16
        <th>[% L.checkbox_tag('record_links_check_all') %]</th>
17
        <th>[% IF vc == 'customer' %][% LxERP.t8("Customer") %][% ELSE %][% LxERP.t8("Vendor") %][% END %]</th>
17
        [% IF vc %]
18
          <th>[% IF vc == 'customer' %][% LxERP.t8("Customer") %][% ELSE %][% LxERP.t8("Vendor") %][% END %]</th>
19
        [% END %]
18 20
        <th>[% LxERP.t8("Number") %]</th>
19 21
        [% IF date_column %]
20 22
          <th>[% LxERP.t8("Date") %]</th>
......
29 31
      [% FOREACH object = OBJECTS %]
30 32
        <tr>
31 33
          <td>[% L.checkbox_tag('link_id[]', value=object.id) %]</td>
32
          <td>[% HTML.escape(object.$vc.name) %]</td>
34
          [% IF vc %]
35
            <td>[% HTML.escape(object.$vc.name) %]</td>
36
          [% END %]
33 37
          <td>[% HTML.escape(object.$number_column) %]</td>
34 38
          [% IF date_column %]
35 39
            <td>[% HTML.escape(object.$date_column.to_kivitendo) %]</td>

Auch abrufbar als: Unified diff