Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7130d91e

Von Sven Schöling vor fast 15 Jahren hinzugefügt

  • ID 7130d91ec4941cad5aba49bdd39911a2d5fa9a89
  • Vorgänger b8916e5c
  • Nachfolger cb0dfa9a

form_footer 2. Version

Unterschiede anzeigen:

SL/Template/Plugin/LxERP.pm
23 23
  return '';
24 24
}
25 25

  
26
sub round_amount {
27
  my ($self, $var, $places, $skip_zero) = @_;
28

  
29
  return $main::form->round_amount($var * 1, $places) unless $skip_zero && $var == 0;
30
  return '';
31
}
32

  
26 33
sub format_amount_units {
27 34
  my ($self, $amount, $amount_unit, $part_unit) = @_;
28 35

  
bin/mozilla/is.pl
397 397
  $form->{rows} = ($rows > $introws) ? $rows : $introws;
398 398

  
399 399
  my ($tax, $subtotal);
400
  if (!$form->{taxincluded}) {
400
  $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
401 401

  
402
    foreach my $item (split / /, $form->{taxaccounts}) {
403
      if ($form->{"${item}_base"}) {
402
  foreach my $item (@{ $form->{taxaccounts_array} }) {
403
    if ($form->{"${item}_base"}) {
404
      if ($form->{taxincluded}) {
405
        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"}
406
                                                                                 / (1 + $form->{"${item}_rate"})), 2);
407
        $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
408
      } else {
404 409
        $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2);
405 410
        $form->{invtotal} += $form->{"${item}_total"};
406
        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
407

  
408
        $tax .= qq|
409
	      <tr>
410
                <th align="right">$form->{"${item}_description"}&nbsp;| . $form->{"${item}_rate"} * 100 .qq|%</th>
411
                <td align="right">$form->{"${item}_total"}</td>
412
	      </tr> |;
413 411
      }
414 412
    }
415

  
416
#    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
417

  
418
    $subtotal = qq|
419
	      <tr>
420
		<th align="right">| . $locale->text('Subtotal') . qq|</th>
421
		<td align="right">$form->{invsubtotal}</td>
422
	      </tr>
423
|;
424

  
425
  }
426

  
427
  if ($form->{taxincluded}) {
428
    $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
429
    foreach my $item (split / /, $form->{taxaccounts}) {
430
      if ($form->{"${item}_base"}) {
431
        $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2);
432
        $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2);
433
        $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2);
434
        $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2);
435

  
436
#        $tax .= qq|
437
#	      <tr>
438
#		<th align="right">Enthaltene $form->{"${item}_description"}&nbsp;|
439
#		                    . $form->{"${item}_rate"} * 100 .qq|%</th>
440
#		<td align="right">$form->{"${item}_total"}</td>
441
#	      </tr>
442
#	      <tr>
443
#	        <th align="right">Nettobetrag</th>
444
#		<td align="right">$form->{"${item}_netto"}</td>
445
#	      </tr>
446
#|;
447
      }
448
    }
449

  
450 413
  }
451 414

  
452 415
  $form->{oldinvtotal} = $form->{invtotal};
453
#  $form->{invtotal}    = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
454 416

  
455 417
  # unfortunately locales doesn't support extended syntax
456 418
  if ($form->{id}) {
457 419
    my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
458 420
    if (@{ $follow_ups} ) {
459
      $form->{follow_ups_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.",
460
                                               scalar @{ $follow_ups },
421
      $form->{follow_up_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.",
422
                                               scalar(@{ $follow_ups }),
461 423
                                               sum map { $_->{due} * 1 } @{ $follow_ups });
462 424
    }
463 425
  }
464 426

  
465 427

  
428
# payments
429
  my $totalpaid = 0;
430

  
431
  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
432
  $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ];
433

  
434
  for my $i (1 .. $form->{paidaccounts}) {
435
    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
436
    $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
437

  
438
    # format amounts
439
    $totalpaid += $form->{"paid_$i"};
440
    if ($form->{"paid_$i"}) {
441
      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
442
    }
443
    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
444
    $form->{"exchangerate_$i"} ||= "";
445
  }
446

  
447

  
448
  $form->{print_options} = print_options(inline => 1);
449

  
466 450
  print $form->parse_html_template('is/form_footer');
451
# print $form->parse_html_template('is/_payments'); # parser
452

  
453

  
467 454

  
468 455
#  print qq|
469 456
#  <tr>
templates/webpages/is/_payments_de.html
1
[%- USE LxERP %]
2
  <tr>
3
   <td>
4
    <table width="100%">
5
     <tr class="listheading">
6
[% IF is_credit_note %]
7
      <th colspan="6" class="listheading">Zahlungsausg?nge</th>
8
[% ELSE %]
9
      <th colspan="6" class="listheading">Zahlungseing?nge</th>
10
[%- END %]
11
     </tr>
12

  
13

  
14
     <tr>
15
      <th>Datum</th>
16
      <th>Beleg</th>
17
      <th>Memo</th>
18
      <th>Betrag</th>
19
[% IF show_exchangerate %]
20
      <th>Wechselkurs.</th>
21
[% END %]
22
      <th>Konto</th>
23
     </tr>
24

  
25

  
26
[% paidaccounts %]
27

  
28
[% FOREACH i = paid_indices %]
29
[% SET row = {} %]
30
  [% SET row.datepaid    = 'datepaid_'    _ i %]
31
  [% SET row.source      = 'source_'      _ i %]
32
  [% SET row.memo        = 'memo_'        _ i %]
33
  [% SET row.paid        = 'paid_'        _ i %]
34

  
35
     <tr>
36

  
37
    <td align="center">
38
      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="$myconfig{dateformat}" value="[% row.datepaid %]" onBlur=\"check_right_date_format(this)\">
39
      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
40
     </td>
41
     <td align=center><input name="source_[% i %]" size="11" value="[% row.source %]"></td>|;
42
     <td align="center"><input name="memo_[% i %]" size="11" value="[% row.memo %]"></td>|;
43
     <td align="center"><input name="paid_[% i %]" size="11" value="[% row.paid %]" onBlur=\"check_right_number_format(this)\"></td>|;
44
     <td align="center">
45
[% IF show_exchangerate %]
46
  [% SET row.forex        = 'forex_'        _ i %]
47
  [% SET row.exchangerate = 'exchangerate_' _ i %]
48
  [% IF row.forex %]
49
        <input type="hidden" name="exchangerate_[% i %]" value="[% row.exchangerate %]">
50
        [% row.exchangerate | html %]
51
  [% ELSE %]
52
        <input name="exchangerate_[% i %]" size="10" value="[% row.exchangerate %]">
53
  [% END %]
54
        <input type="hidden" name="forex_[% i %]" value="[% row.forex %]">;
55
[% END %]
56
     </td>
57
     <td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
58

  
59
    </tr>
60
[%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
61

  
62
[% END # foreach %]
63

  
64
    <tr>
65
      <td></td>
66
      <td></td>
67
      <td align="center">Summe</td>
68
      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
69
    </tr>
70
    <tr>
71
      <td></td>
72
      <td></td>
73
      <td align="center">Fehlbetrag</td>
74
      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
75
    </tr>
76

  
77
  <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
78
  <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
79
  <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
80

  
81
  <input type="hidden" name="oldtotalpaid" value="$totalpaid">
82
    </table>
83

  
84
    </td>
85
  </tr>
templates/webpages/is/_payments_master.html
1
[%- USE LxERP %]
2
  <tr>
3
   <td>
4
    <table width="100%">
5
     <tr class="listheading">
6
[% IF is_credit_note %]
7
      <th colspan="6" class="listheading"><translate>Payments</translate></th>
8
[% ELSE %]
9
      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
10
[%- END %]
11
     </tr>
12

  
13

  
14
     <tr>
15
      <th><translate>Date</translate></th>
16
      <th><translate>Source</translate></th>
17
      <th><translate>Memo</translate></th>
18
      <th><translate>Amount</translate></th>
19
[% IF show_exchangerate %]
20
      <th><translate>Exch</translate></th>
21
[% END %]
22
      <th><translate>Account</translate></th>
23
     </tr>
24

  
25

  
26
[% paidaccounts %]
27

  
28
[% FOREACH i = paid_indices %]
29
[% SET row = {} %]
30
  [% SET row.datepaid    = 'datepaid_'    _ i %]
31
  [% SET row.source      = 'source_'      _ i %]
32
  [% SET row.memo        = 'memo_'        _ i %]
33
  [% SET row.paid        = 'paid_'        _ i %]
34

  
35
     <tr>
36

  
37
    <td align="center">
38
      <input id="datepaid_[% i %]" name="datepaid_[% i %]" size="11" title="$myconfig{dateformat}" value="[% row.datepaid %]" onBlur=\"check_right_date_format(this)\">
39
      <input type="button" name="datepaid_[% i %]" id="trigger_datepaid_[% i %]" value="?">
40
     </td>
41
     <td align=center><input name="source_[% i %]" size="11" value="[% row.source %]"></td>|;
42
     <td align="center"><input name="memo_[% i %]" size="11" value="[% row.memo %]"></td>|;
43
     <td align="center"><input name="paid_[% i %]" size="11" value="[% row.paid %]" onBlur=\"check_right_number_format(this)\"></td>|;
44
     <td align="center">
45
[% IF show_exchangerate %]
46
  [% SET row.forex        = 'forex_'        _ i %]
47
  [% SET row.exchangerate = 'exchangerate_' _ i %]
48
  [% IF row.forex %]
49
        <input type="hidden" name="exchangerate_[% i %]" value="[% row.exchangerate %]">
50
        [% row.exchangerate | html %]
51
  [% ELSE %]
52
        <input name="exchangerate_[% i %]" size="10" value="[% row.exchangerate %]">
53
  [% END %]
54
        <input type="hidden" name="forex_[% i %]" value="[% row.forex %]">;
55
[% END %]
56
     </td>
57
     <td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
1 58

  
59
    </tr>
60
[%#     push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); %]
2 61

  
3

  
4

  
5

  
6

  
7
  my @column_index;
8
  if ($form->{currency} eq $form->{defaultcurrency}) {
9
    @column_index = qw(datepaid source memo paid AR_paid);
10
  } else {
11
    @column_index = qw(datepaid source memo paid exchangerate AR_paid);
12
  }
13

  
14
  my %column_data;
15
  $column_data{datepaid}     = "<th>" . $locale->text('Date') . "</th>";
16
  $column_data{paid}         = "<th>" . $locale->text('Amount') . "</th>";
17
  $column_data{exchangerate} = "<th>" . $locale->text('Exch') . "</th>";
18
  $column_data{AR_paid}      = "<th>" . $locale->text('Account') . "</th>";
19
  $column_data{source}       = "<th>" . $locale->text('Source') . "</th>";
20
  $column_data{memo}         = "<th>" . $locale->text('Memo') . "</th>";
21

  
22
    <tr>
23

  
24
  map { print "$column_data{$_}\n" } @column_index;
25

  
26
        </tr>
27

  
28
  my @triggers  = ();
29
  my $totalpaid = 0;
30

  
31
  $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
32

  
33

  
34

  
35
  [% FOREACH i = 1 .. paidaccounts %]
36

  
37
        <tr>
38

  
39

  
40
    $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
41
    $form->{"selectAR_paid_$i"} =~
42
      s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
43

  
44
    # format amounts
45
    $totalpaid += $form->{"paid_$i"};
46
    if ($form->{"paid_$i"}) {
47
      $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2);
48
    }
49
    $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"});
50

  
51
    if ($form->{"exchangerate_$i"} == 0) {
52
      $form->{"exchangerate_$i"} = "";
53
    }
54
    my $exchangerate = qq|&nbsp;|;
55
    if ($form->{currency} ne $form->{defaultcurrency}) {
56
      if ($form->{"forex_$i"}) {
57
        $exchangerate = qq|<input type="hidden" name="exchangerate_$i" value="$form->{"exchangerate_$i"}">$form->{"exchangerate_$i"}|;
58
      } else {
59
        $exchangerate = qq|<input name="exchangerate_$i" size="10" value="$form->{"exchangerate_$i"}">|;
60
      }
61
    }
62

  
63
    $exchangerate .= qq|<input type="hidden" name="forex_$i" value="$form->{"forex_$i"}">|;
64

  
65
    $column_data{"paid_$i"} =
66
      qq|<td align="center"><input name="paid_$i" size="11" value="$form->{"paid_$i"}" onBlur=\"check_right_number_format(this)\"></td>|;
67
    $column_data{"exchangerate_$i"} = qq|<td align="center">$exchangerate</td>|;
68
    $column_data{"AR_paid_$i"}      =
69
      qq|<td align="center"><select name="AR_paid_$i">$form->{"selectAR_paid_$i"}</select></td>|;
70
    $column_data{"datepaid_$i"} =
71
      qq|<td align="center"><input id="datepaid_$i" name="datepaid_$i"  size="11" title="$myconfig{dateformat}" value="$form->{"datepaid_$i"}" onBlur=\"check_right_date_format(this)\">
72
         <input type="button" name="datepaid_$i" id="trigger_datepaid_$i" value="?"></td>|;
73
    $column_data{"source_$i"} =
74
      qq|<td align=center><input name="source_$i" size="11" value="$form->{"source_$i"}"></td>|;
75
    $column_data{"memo_$i"} =
76
      qq|<td align="center"><input name="memo_$i" size="11" value="$form->{"memo_$i"}"></td>|;
77

  
78
    map { print qq|$column_data{"${_}_$i"}\n| } @column_index;
79
    print "
80
        </tr>\n";
81
    push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
82
  }
62
[% END # foreach %]
83 63

  
84 64
    <tr>
85 65
      <td></td>
86 66
      <td></td>
87
      <td align="center">| . $locale->text('Total') . qq|</td>
88
      <td align="center">| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|</td>
67
      <td align="center"><translate>Total</translate></td>
68
      <td align="center">[% LxERP.foramt_amount(totalpaid, 2) | html %]</td>
89 69
    </tr>
90 70
    <tr>
91 71
      <td></td>
92 72
      <td></td>
93
      <td align="center">| . $locale->text('Missing amount') . qq|</td>
94
      <td align="center">| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|</td>
73
      <td align="center"><translate>Missing amount</translate></td>
74
      <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
95 75
    </tr>
96 76

  
97
  map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
77
  <input type="hidden" name="paidaccounts" value="[% paidaccounts %]">
78
  <input type="hidden" name="selectAR_paid" value="[% selectAR_paid %]">
79
  <input type="hidden" name="oldinvtotal" value="[% rowcount %]">
98 80

  
99 81
  <input type="hidden" name="oldtotalpaid" value="$totalpaid">
100 82
    </table>
83

  
84
    </td>
85
  </tr>
templates/webpages/is/form_footer_de.html
58 58
  [%- END %]
59 59
       <table>
60 60

  
61
        $subtotal
61
[%#- subtotal %]
62
[%- UNLESS taxincluded %]
63
        <tr>
64
         <th align="right">Zwischensumme</th>
65
         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
66
       </tr>
67
[%- END %]
62 68

  
63 69
[%# tax %]
64 70
[% FOREACH item = taxaccounts_array %]
65
[% SET description_ref = item _ 'description' %]
66
[% SET rate_ref        = item _ 'rate' %]
67
[% SET total_ref       = item _ 'total' %]
68
[% SET netto_ref       = item _ 'netto' %]
71
[% SET description_ref = item _ '_description' %]
72
[% SET rate_ref        = item _ '_rate' %]
73
[% SET total_ref       = item _ '_total' %]
74
[% SET netto_ref       = item _ '_netto' %]
69 75
       <tr>
70
        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
71
        <td align="right">[% $total_ref %]</td>
76
        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
77
        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
72 78
       </tr>
79
  [%- IF taxincluded %]
73 80
       <tr>
74 81
        <th align="right">Nettobetrag</th>
75
        <td align="right">[% $netto_ref %]</td>
82
        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
76 83
       </tr>
84
  [%- END %]
77 85
[%- END %]
78 86

  
79 87
        <tr>
......
87 95
   </td>
88 96
  </tr>
89 97

  
98
[%#--------------------------- WEB DAV BLOCK %]
90 99
[%- IF webdav %]
91 100
  <tr>
92 101
   <td><hr size="3" noshade></td>
......
108 117
   </table>
109 118
  </tr>
110 119
[% END %]
120
[%#--------------------------- WEB DAV BLOCK %]
111 121

  
112 122

  
113
  <tr>
114
   <td>
115
    <table width="100%">
116
     <tr class="listheading">
117
[% IF is_credit_note %]
118
      <th colspan="6" class="listheading">Zahlungsausg?nge</th>
119
[% ELSE %]
120
      <th colspan="6" class="listheading">Zahlungseing?nge</th>
121
[%- END %]
122
     </tr>
123

  
123
[% PROCESS 'is/_payments_de.html' %]
124 124

  
125
[%# INCLUDE _payments %]
126 125

  
127 126

  
128
    </td>
129
  </tr>
130 127
  <tr>
131 128
    <td><hr size="3" noshade></td>
132 129
  </tr>
133 130
  <tr>
134 131
    <td>
135
  [% print_options %]
132
[% print_options %]
136 133
    </td>
137 134
  </tr>
138
</table>
135
 </table>
136

  
137

  
139 138

  
140 139
  [% IF id %]
141 140

  
......
156 155
    <input class="submit" type="submit" name="action" value="L?schen">
157 156
[% END %]
158 157

  
159
  [%- IF invdate > closedto %]
158
  [%- UNLESS locked %]
160 159
       <input class="submit" type="submit" name="action" value="Auftrag">
161 160
  [%- END %]
162 161

  
163 162
    <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
164 163

  
165 164
 [% ELSE # no id %]
166
   [% IF invdate > closedto %]
165
   [% UNLESS locked %]
167 166
      <input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
168 167
      <input class="submit" type="submit" name="action" value="Lieferadresse">
169 168
      <input class="submit" type="submit" name="action" value="Druckvorschau">
templates/webpages/is/form_footer_master.html
58 58
  [%- END %]
59 59
       <table>
60 60

  
61
        $subtotal
61
[%#- subtotal %]
62
[%- UNLESS taxincluded %]
63
        <tr>
64
         <th align="right"><translate>Subtotal</translate></th>
65
         <td align="right">[% LxERP.format_amount(invsubtotal, 2) %]</td>
66
       </tr>
67
[%- END %]
62 68

  
63 69
[%# tax %]
64 70
[% FOREACH item = taxaccounts_array %]
65
[% SET description_ref = item _ 'description' %]
66
[% SET rate_ref        = item _ 'rate' %]
67
[% SET total_ref       = item _ 'total' %]
68
[% SET netto_ref       = item _ 'netto' %]
71
[% SET description_ref = item _ '_description' %]
72
[% SET rate_ref        = item _ '_rate' %]
73
[% SET total_ref       = item _ '_total' %]
74
[% SET netto_ref       = item _ '_netto' %]
69 75
       <tr>
70
        <th align="right">Enthaltene [% $description_ref %]&nbsp;[% $rate_ref * 100 %]%</th>
71
        <td align="right">[% $total_ref %]</td>
76
        <th align="right">Enthaltene [% $description_ref | html %]&nbsp;[% $rate_ref * 100 %]%</th>
77
        <td align="right">[% LxERP.format_amount($total_ref, 2) %]</td>
72 78
       </tr>
79
  [%- IF taxincluded %]
73 80
       <tr>
74 81
        <th align="right">Nettobetrag</th>
75
        <td align="right">[% $netto_ref %]</td>
82
        <td align="right">[% LxERP.format_amount($netto_ref, 2) %]</td>
76 83
       </tr>
84
  [%- END %]
77 85
[%- END %]
78 86

  
79 87
        <tr>
......
87 95
   </td>
88 96
  </tr>
89 97

  
98
[%#--------------------------- WEB DAV BLOCK %]
90 99
[%- IF webdav %]
91 100
  <tr>
92 101
   <td><hr size="3" noshade></td>
......
108 117
   </table>
109 118
  </tr>
110 119
[% END %]
120
[%#--------------------------- WEB DAV BLOCK %]
111 121

  
112 122

  
113
  <tr>
114
   <td>
115
    <table width="100%">
116
     <tr class="listheading">
117
[% IF is_credit_note %]
118
      <th colspan="6" class="listheading"><translate>Payments</translate></th>
119
[% ELSE %]
120
      <th colspan="6" class="listheading"><translate>Incoming Payments</translate></th>
121
[%- END %]
122
     </tr>
123

  
123
[% PROCESS 'is/_payments_<translate>master</translate>.html' %]
124 124

  
125
[%# INCLUDE _payments %]
126 125

  
127 126

  
128
    </td>
129
  </tr>
130 127
  <tr>
131 128
    <td><hr size="3" noshade></td>
132 129
  </tr>
133 130
  <tr>
134 131
    <td>
135
  [% print_options %]
132
[% print_options %]
136 133
    </td>
137 134
  </tr>
138
</table>
135
 </table>
136

  
137

  
139 138

  
140 139
  [% IF id %]
141 140

  
......
156 155
    <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
157 156
[% END %]
158 157

  
159
  [%- IF invdate > closedto %]
158
  [%- UNLESS locked %]
160 159
       <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
161 160
  [%- END %]
162 161

  
163 162
    <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
164 163

  
165 164
 [% ELSE # no id %]
166
   [% IF invdate > closedto %]
165
   [% UNLESS locked %]
167 166
      <input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
168 167
      <input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
169 168
      <input class="submit" type="submit" name="action" value="<translate>Preview</translate>">

Auch abrufbar als: Unified diff