Revision fecfef3b
Von Bernd Bleßmann vor etwa 1 Jahr hinzugefügt
SL/DO.pm | ||
---|---|---|
75 | 75 |
my $query = |
76 | 76 |
qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.cusordnumber, |
77 | 77 |
dord.transdate, dord.reqdate, |
78 |
dord.vendor_confirmation_number, |
|
78 | 79 |
ct.${vc}number, ct.name, ct.business_id, |
79 | 80 |
dord.${vc}_id, dord.globalproject_id, |
80 | 81 |
dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia, |
... | ... | |
141 | 142 |
push @values, $::myconfig{login}; |
142 | 143 |
} |
143 | 144 |
|
144 |
foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) { |
|
145 |
foreach my $item (qw(donumber ordnumber cusordnumber transaction_description vendor_confirmation_number)) {
|
|
145 | 146 |
next unless ($form->{$item}); |
146 | 147 |
push @where, qq|dord.$item ILIKE ?|; |
147 | 148 |
push @values, like($form->{$item}); |
... | ... | |
203 | 204 |
dord.ordnumber |
204 | 205 |
dord.cusordnumber |
205 | 206 |
dord.oreqnumber |
207 |
dord.vendor_confirmation_number |
|
206 | 208 |
); |
207 | 209 |
my $tmp_where = ''; |
208 | 210 |
$tmp_where .= join ' OR ', map {"$_ ILIKE ?"} @fulltext_fields; |
... | ... | |
289 | 291 |
"transaction_description" => "dord.transaction_description", |
290 | 292 |
"department" => "lower(dep.description)", |
291 | 293 |
"insertdate" => "dord.itime", |
294 |
"vendor_confirmation_number" => "dord.vendor_confirmation_number", |
|
292 | 295 |
); |
293 | 296 |
|
294 | 297 |
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; |
bin/mozilla/do.pl | ||
---|---|---|
778 | 778 |
my @columns = qw( |
779 | 779 |
ids transdate reqdate |
780 | 780 |
id donumber |
781 |
ordnumber customernumber cusordnumber |
|
781 |
ordnumber customernumber vendor_confirmation_number |
|
782 |
cusordnumber |
|
782 | 783 |
name employee salesman |
783 | 784 |
shipvia globalprojectnumber |
784 | 785 |
transaction_description department |
... | ... | |
799 | 800 |
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber |
800 | 801 |
transaction_description transdatefrom transdateto reqdatefrom reqdateto |
801 | 802 |
type vc employee_id salesman_id project_id parts_partnumber parts_description |
802 |
insertdatefrom insertdateto business_id all department_id chargenumber full_text); |
|
803 |
insertdatefrom insertdateto business_id all department_id chargenumber full_text |
|
804 |
vendor_confirmation_number); |
|
803 | 805 |
|
804 | 806 |
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables); |
805 | 807 |
|
... | ... | |
823 | 825 |
'department' => { 'text' => $locale->text('Department'), }, |
824 | 826 |
'insertdate' => { 'text' => $locale->text('Insert Date'), }, |
825 | 827 |
'items' => { 'text' => $locale->text('Positions'), }, |
828 |
'vendor_confirmation_number' => { 'text' => $locale->text('Vendor Confirmation Number'), }, |
|
826 | 829 |
); |
827 | 830 |
|
828 |
foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department insertdate)) { |
|
831 |
foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department insertdate vendor_confirmation_number)) {
|
|
829 | 832 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
830 | 833 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
831 | 834 |
} |
... | ... | |
861 | 864 |
if ($form->{ordnumber}) { |
862 | 865 |
push @options, $locale->text('Order Number') . " : $form->{ordnumber}"; |
863 | 866 |
} |
867 |
if ($form->{vendor_confirmation_number}) { |
|
868 |
push @options, $locale->text('Vendor Confirmation Number') . " : $form->{vendor_confirmation_number}"; |
|
869 |
} |
|
864 | 870 |
push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber}; |
865 | 871 |
if ($form->{business_id}) { |
866 | 872 |
my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type'); |
templates/design40_webpages/do/search.html | ||
---|---|---|
82 | 82 |
<td> <input type="text" name="ordnumber" class="fixed_width wi-mediumsmall"> |
83 | 83 |
</td> |
84 | 84 |
</tr> |
85 |
[%- IF type == "purchase_delivery_order" %] |
|
86 |
<tr> |
|
87 |
<th>[% 'Vendor Confirmation Number' | $T8 %]</th> |
|
88 |
<td> <input type="text" name="vendor_confirmation_number" class="fixed_width wi-mediumsmall"> |
|
89 |
</td> |
|
90 |
</tr> |
|
91 |
[%- END %] |
|
85 | 92 |
<tr> |
86 | 93 |
<th>[% 'Customer Order Number' | $T8 %]</th> |
87 | 94 |
<td> <input type="text" name="cusordnumber" class="fixed_width wi-mediumsmall"> |
... | ... | |
171 | 178 |
<input name="l_ordnumber" id="l_ordnumber" type="checkbox" value="Y" checked> |
172 | 179 |
<label for="l_ordnumber">[% 'Order Number' | $T8 %]</label> |
173 | 180 |
</div> |
181 |
[%- IF type == "purchase_delivery_order" %] |
|
182 |
<div> |
|
183 |
<input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" type="checkbox" value="Y" checked> |
|
184 |
<label for="l_vendor_confirmation_number">[% 'Vendor Confirmation Number' | $T8 %]</label> |
|
185 |
</div> |
|
186 |
[% END %] |
|
174 | 187 |
<div> |
175 | 188 |
<input name="l_cusordnumber" id="l_cusordnumber" type="checkbox" value="Y" checked> |
176 | 189 |
<label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label> |
templates/webpages/do/search.html | ||
---|---|---|
41 | 41 |
<td colspan="3"><input name="ordnumber" class="fixed_width"></td> |
42 | 42 |
</tr> |
43 | 43 |
|
44 |
[%- IF type == "purchase_delivery_order" %] |
|
45 |
<tr> |
|
46 |
<th align="right">[% 'Vendor Confirmation Number' | $T8 %]</th> |
|
47 |
<td colspan="3"><input name="cusordnumber" class="fixed_width"></td> |
|
48 |
</tr> |
|
49 |
[%- END %] |
|
50 |
|
|
44 | 51 |
<tr> |
45 | 52 |
<th align="right">[% 'Customer Order Number' | $T8 %]</th> |
46 | 53 |
<td colspan="3"><input name="cusordnumber" class="fixed_width"></td> |
... | ... | |
177 | 184 |
<label for="l_ordnumber">[% 'Order Number' | $T8 %]</label> |
178 | 185 |
</td> |
179 | 186 |
|
187 |
[%- IF type == "purchase_delivery_order" %] |
|
188 |
<td> |
|
189 |
<input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" class="checkbox" type="checkbox" value="Y" checked> |
|
190 |
<label for="l_vendor_confirmation_number">[% 'Vendor Confirmation Number' | $T8 %]</label> |
|
191 |
</td> |
|
192 |
[%- END %] |
|
193 |
|
|
180 | 194 |
<td> |
181 | 195 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked> |
182 | 196 |
<label for="l_cusordnumber">[% 'Customer Order Number' | $T8 %]</label> |
Auch abrufbar als: Unified diff
EK-Lieferschein-Bericht: Bestätigungsnummer des Lieferanten …
… filtern und anzeigen können