Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision acbd9d0f

Von Jan Büren vor etwa 6 Jahren hinzugefügt

  • ID acbd9d0f24ae02d58ca34d480d84886b75ff7017
  • Vorgänger 5b69ef31
  • Nachfolger 9bfa364b

Einkaufsrechnung: Sinnfreie Weiche für Gutschrift entfernt (toter Code)

Da es keine Einkaufsrechnungen-Gutschriften gibt, sind die
entsprechend Weichen eher irritierend als hilfreich => entfernt.

Unterschiede anzeigen:

bin/mozilla/ir.pl
395 395
    $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
396 396
  }
397 397

  
398
  # TODO There is no credit_note for vendor invoices (remove template code)
399
  $TMPL_VAR{is_type_credit_note} = $form->{type}   eq "credit_note";
400 398
  $TMPL_VAR{is_format_html}      = $form->{format} eq 'html';
401 399
  $TMPL_VAR{dateformat}          = $myconfig{dateformat};
402 400
  $TMPL_VAR{numberformat}        = $myconfig{numberformat};
......
528 526
  $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
529 527

  
530 528
  print $form->parse_html_template('ir/form_footer', {
531
    is_type_credit_note => ($form->{type} eq "credit_note"),
532 529
    totalpaid           => $totalpaid,
533 530
    paid_missing        => $form->{invtotal} - $totalpaid,
534 531
    show_storno         => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && !$totalpaid,
templates/webpages/ir/_payments.html
6 6
   <td>
7 7
    <table width="100%">
8 8
     <tr class="listheading">
9
[% IF is_type_credit_note || vc == 'vendor' %]
10 9
      <th colspan="6" class="listheading">[% 'Payments' | $T8 %]</th>
11
[% ELSE %]
12
      <th colspan="6" class="listheading">[% 'Incoming Payments' | $T8 %]</th>
13
[%- END %]
14 10
     </tr>
15

  
16

  
17 11
     <tr>
18 12
      <th>[% 'Date' | $T8 %]</th>
19 13
      <th>[% 'Source' | $T8 %]</th>
templates/webpages/ir/form_header.html
139 139
          <th align="right">[% 'Employee' | $T8 %]</th>
140 140
          <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title_key = 'safe_name') %]</td>
141 141
        </tr>
142

  
143
[%- IF is_type_credit_note %]
144
        <tr>
145
          <th align="right" nowrap>[% 'Credit Note Number' | $T8 %]</th>
146
          <td colspan="3"><input size='11' name="invnumber" value="[% HTML.escape(invnumber) %]"></td>
147
        </tr>
148
        <tr>
149
          <th align="right">[% 'Credit Note Date' | $T8 %]</th>
150
          <td>[% L.date_tag('invdate', invdate) %]</td>
151
        </tr>
152
[%- ELSE %]
153 142
        <tr>
154 143
          <th align="right" nowrap>[% 'Invoice Number' | $T8 %]</th>
155 144
          <td colspan="3">[% L.input_tag("invnumber", invnumber, size="11") %]</td>
......
165 154
           <span id="duedate_fixed"[% IF !payment_terms_obj.auto_calculation %] style="display:none"[% END %]>[% HTML.escape(duedate) %]</span>
166 155
          </td>
167 156
        </tr>
168
[%- END %]
169

  
170 157
        <tr>
171 158
          <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
172 159
          <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>

Auch abrufbar als: Unified diff