Revision 30645d2c
Von Bernd Bleßmann vor etwa 11 Jahren hinzugefügt
| SL/DO.pm | ||
|---|---|---|
| 145 | 145 |
push @values, conv_date($form->{transdateto});
|
| 146 | 146 |
} |
| 147 | 147 |
|
| 148 |
if($form->{reqdatefrom}) {
|
|
| 149 |
push @where, qq|dord.reqdate >= ?|; |
|
| 150 |
push @values, conv_date($form->{reqdatefrom});
|
|
| 151 |
} |
|
| 152 |
|
|
| 153 |
if($form->{reqdateto}) {
|
|
| 154 |
push @where, qq|dord.reqdate <= ?|; |
|
| 155 |
push @values, conv_date($form->{reqdateto});
|
|
| 156 |
} |
|
| 157 |
|
|
| 148 | 158 |
if (@where) {
|
| 149 | 159 |
$query .= " WHERE " . join(" AND ", map { "($_)" } @where);
|
| 150 | 160 |
} |
| bin/mozilla/do.pl | ||
|---|---|---|
| 508 | 508 |
|
| 509 | 509 |
my @hidden_variables = map { "l_${_}" } @columns;
|
| 510 | 510 |
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber
|
| 511 |
transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id); |
|
| 511 |
transaction_description transdatefrom transdateto reqdatefrom reqdateto |
|
| 512 |
type vc employee_id salesman_id project_id); |
|
| 512 | 513 |
|
| 513 | 514 |
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
|
| 514 | 515 |
|
| 515 | 516 |
my %column_defs = ( |
| 516 | 517 |
'ids' => { 'text' => '', },
|
| 517 |
'transdate' => { 'text' => $locale->text('Date'), },
|
|
| 518 |
'transdate' => { 'text' => $locale->text('Delivery Order Date'), },
|
|
| 518 | 519 |
'reqdate' => { 'text' => $locale->text('Reqdate'), },
|
| 519 | 520 |
'id' => { 'text' => $locale->text('ID'), },
|
| 520 | 521 |
'donumber' => { 'text' => $locale->text('Delivery Order'), },
|
| ... | ... | |
| 569 | 570 |
if ($form->{transaction_description}) {
|
| 570 | 571 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
|
| 571 | 572 |
} |
| 572 |
if ($form->{transdatefrom}) {
|
|
| 573 |
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
|
|
| 574 |
} |
|
| 575 |
if ($form->{transdateto}) {
|
|
| 576 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
|
|
| 577 |
} |
|
| 573 |
if ( $form->{transdatefrom} or $form->{transdateto} ) {
|
|
| 574 |
push @options, $locale->text('Delivery Order Date');
|
|
| 575 |
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
|
|
| 576 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto};
|
|
| 577 |
}; |
|
| 578 |
if ( $form->{reqdatefrom} or $form->{reqdateto} ) {
|
|
| 579 |
push @options, $locale->text('Reqdate');
|
|
| 580 |
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom};
|
|
| 581 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto};
|
|
| 582 |
}; |
|
| 578 | 583 |
if ($form->{open}) {
|
| 579 | 584 |
push @options, $locale->text('Open');
|
| 580 | 585 |
} |
| templates/webpages/do/search.html | ||
|---|---|---|
| 104 | 104 |
</tr> |
| 105 | 105 |
|
| 106 | 106 |
<tr> |
| 107 |
<th align="right">[% 'From' | $T8 %]</th> |
|
| 107 |
<th align="right">[% 'Delivery Order Date' | $T8 %] [% 'From' | $T8 %]</th>
|
|
| 108 | 108 |
<td> |
| 109 | 109 |
[% L.date_tag('transdatefrom') %]
|
| 110 | 110 |
</td> |
| ... | ... | |
| 114 | 114 |
</td> |
| 115 | 115 |
</tr> |
| 116 | 116 |
|
| 117 |
<tr> |
|
| 118 |
<th align="right">[% 'Reqdate' | $T8 %] [% 'From' | $T8 %]</th> |
|
| 119 |
<td> |
|
| 120 |
[% L.date_tag('reqdatefrom') %]
|
|
| 121 |
</td> |
|
| 122 |
<th align="right">[% 'Bis' | $T8 %]</th> |
|
| 123 |
<td> |
|
| 124 |
[% L.date_tag('reqdateto') %]
|
|
| 125 |
</td> |
|
| 126 |
</tr> |
|
| 127 |
|
|
| 117 | 128 |
<tr> |
| 118 | 129 |
<th align="right">[% 'Include in Report' | $T8 %]</th> |
| 119 | 130 |
<td colspan="5"> |
| ... | ... | |
| 166 | 177 |
<tr> |
| 167 | 178 |
<td> |
| 168 | 179 |
<input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked> |
| 169 |
<label for="l_transdate">[% 'Date' | $T8 %]</label> |
|
| 180 |
<label for="l_transdate">[% 'Delivery Order Date' | $T8 %]</label>
|
|
| 170 | 181 |
</td> |
| 171 | 182 |
<td> |
| 172 | 183 |
<input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked> |
Auch abrufbar als: Unified diff
Liefertermin im Lieferscheinbericht filterbar gemacht ...
... und Datum in Lieferscheindatum umbenannt.