Revision 63c36f48
Von Bernd Bleßmann vor 12 Monaten hinzugefügt
SL/OE.pm | ||
---|---|---|
136 | 136 |
qq| o.exchangerate, | . |
137 | 137 |
qq| o.itime::DATE AS insertdate, | . |
138 | 138 |
qq| o.intnotes,| . |
139 |
qq| o.vendor_confirmation_number,| . |
|
139 | 140 |
qq| department.description as department, | . |
140 | 141 |
qq| ex.$rate AS daily_exchangerate, | . |
141 | 142 |
qq| pt.description AS payment_terms, | . |
... | ... | |
250 | 251 |
push(@values, like($form->{cusordnumber})); |
251 | 252 |
} |
252 | 253 |
|
254 |
if ($form->{vendor_confirmation_number}) { |
|
255 |
$query .= qq| AND o.vendor_confirmation_number ILIKE ?|; |
|
256 |
push(@values, like($form->{vendor_confirmation_number})); |
|
257 |
} |
|
258 |
|
|
253 | 259 |
if($form->{transdatefrom}) { |
254 | 260 |
$query .= qq| AND o.transdate >= ?|; |
255 | 261 |
push(@values, conv_date($form->{transdatefrom})); |
... | ... | |
344 | 350 |
o.transaction_description |
345 | 351 |
o.quonumber |
346 | 352 |
o.ordnumber |
347 |
o.cusordnumber); |
|
353 |
o.cusordnumber |
|
354 |
o.vendor_confirmation_number); |
|
348 | 355 |
$query .= ' AND ('; |
349 | 356 |
$query .= join ' ILIKE ? OR ', @fulltext_fields; |
350 | 357 |
$query .= ' ILIKE ?'; |
... | ... | |
476 | 483 |
"department" => "department.description", |
477 | 484 |
"intnotes" => "o.intnotes", |
478 | 485 |
"order_status" => "order_statuses.name", |
486 |
"vendor_confirmation_number" => "o.vendor_confirmation_number", |
|
479 | 487 |
); |
480 | 488 |
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) { |
481 | 489 |
$sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}" . ", o.itime ${sortdir}"; |
bin/mozilla/oe.pl | ||
---|---|---|
1066 | 1066 |
my @columns = ( |
1067 | 1067 |
"transdate", "reqdate", |
1068 | 1068 |
"id", $ordnumber, |
1069 |
"cusordnumber", "customernumber", |
|
1069 |
"cusordnumber", "vendor_confirmation_number", |
|
1070 |
"customernumber", |
|
1070 | 1071 |
"name", "netamount", |
1071 | 1072 |
"tax", "amount", |
1072 | 1073 |
"remaining_netamount", "remaining_amount", |
... | ... | |
1147 | 1148 |
parts_description all department_id intnotes phone_notes fulltext |
1148 | 1149 |
order_status_id shiptoname shiptodepartment_1 shiptodepartment_2 |
1149 | 1150 |
shiptostreet shiptozipcode shiptocity shiptocountry |
1151 |
vendor_confirmation_number |
|
1150 | 1152 |
); |
1151 | 1153 |
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; |
1152 | 1154 |
|
... | ... | |
1202 | 1204 |
shiptozipcode => { 'text' => $locale->text('Zipcode (Shipping)'), }, |
1203 | 1205 |
shiptocity => { 'text' => $locale->text('City (Shipping)'), }, |
1204 | 1206 |
shiptocountry => { 'text' => $locale->text('Country (Shipping)'), }, |
1207 |
vendor_confirmation_number => { 'text' => $locale->text('Vendor Confirmation Number'), }, |
|
1205 | 1208 |
%column_defs_cvars, |
1206 | 1209 |
); |
1207 | 1210 |
|
1208 | 1211 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber |
1209 | 1212 |
name employee salesman shipvia transaction_description |
1210 | 1213 |
shippingpoint taxzone insertdate payment_terms department |
1211 |
intnotes order_status)) { |
|
1214 |
intnotes order_status vendor_confirmation_number)) {
|
|
1212 | 1215 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
1213 | 1216 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
1214 | 1217 |
} |
... | ... | |
1242 | 1245 |
push @options, $locale->text('Contact Person') . " : $form->{cp_name}" if $form->{cp_name}; |
1243 | 1246 |
push @options, $locale->text('Department') . " : $form->{department}" if $form->{department}; |
1244 | 1247 |
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; |
1248 |
push @options, $locale->text('Vendor Confirmation Number') . " : $form->{vendor_confirmation_number}" if $form->{vendor_confirmation_number}; |
|
1245 | 1249 |
push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber}; |
1246 | 1250 |
push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; |
1247 | 1251 |
push @options, $locale->text('Internal Notes') . " : $form->{intnotes}" if $form->{intnotes}; |
templates/design40_webpages/oe/search.html | ||
---|---|---|
43 | 43 |
<th>[% HTML.escape(ordlabel) %]</th> |
44 | 44 |
<td>[% L.input_tag(ordnrname, "", class="wi-lightwide") %]</td> |
45 | 45 |
</tr> |
46 |
[% IF type == "purchase_order_confirmation" %] |
|
47 |
<tr> |
|
48 |
<th>[% LxERP.t8("Vendor Confirmation Number") %]</th> |
|
49 |
<td>[% L.input_tag("vendor_confirmation_number", '', class="wi-lightwide") %]</td> |
|
50 |
</tr> |
|
51 |
[% END %] |
|
46 | 52 |
[% IF is_order %] |
47 | 53 |
<tr> |
48 | 54 |
<th>[% LxERP.t8("Customer Order Number") %]</th> |
... | ... | |
236 | 242 |
<input name="l_globalprojectnumber" id="l_globalprojectnumber" type="checkbox" value="Y"> |
237 | 243 |
<label for="l_globalprojectnumber">[% 'Project Number' | $T8 %]</label> |
238 | 244 |
</div> |
245 |
[% IF type == "purchase_order_confirmation" %] |
|
246 |
<div> |
|
247 |
<input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" type="checkbox" value="Y" checked> |
|
248 |
<label for="l_vendor_confirmation_number">[% LxERP.t8("Vendor Confirmation Number") %]</label> |
|
249 |
</div> |
|
250 |
[% END %] |
|
239 | 251 |
[% IF is_order %] |
240 | 252 |
<div> |
241 | 253 |
<input name="l_cusordnumber" id="l_cusordnumber" type="checkbox" value="Y" checked> |
templates/webpages/oe/search.html | ||
---|---|---|
37 | 37 |
<td colspan=3>[% L.select_tag('order_status_id', ALL_ORDER_STATUSES, default = order_status_id, title_key = 'name', with_empty = 1, style=style) %]</td> |
38 | 38 |
</tr> |
39 | 39 |
|
40 |
[% IF type == "purchase_order_confirmation" %] |
|
41 |
<tr> |
|
42 |
<th align="right">[% LxERP.t8("Vendor Confirmation Number") %]</th> |
|
43 |
<td>[% L.input_tag("vendor_confirmation_number", '', style=style) %]</td> |
|
44 |
</tr> |
|
45 |
[% END %] |
|
40 | 46 |
[% IF is_order %] |
41 | 47 |
<tr> |
42 | 48 |
<th align="right">[% LxERP.t8("Customer Order Number") %]</th> |
... | ... | |
220 | 226 |
<input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked> |
221 | 227 |
<label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label> |
222 | 228 |
</td> |
223 |
[% IF is_order %] |
|
224 |
<td> |
|
225 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked> |
|
226 |
<label for="l_cusordnumber">[% LxERP.t8("Customer Order Number") %]</label> |
|
227 |
</td> |
|
228 |
[% END %] |
|
229 | 229 |
[% IF is_order %] |
230 | 230 |
<td> |
231 | 231 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked> |
... | ... | |
248 | 248 |
<label for="l_insertdate">[% 'Insert Date' | $T8 %]</label> |
249 | 249 |
</td> |
250 | 250 |
[%- END %] |
251 |
[% IF type == "purchase_order_confirmation" %] |
|
252 |
<td> |
|
253 |
<input name="l_vendor_confirmation_number" id="l_vendor_confirmation_number" class="checkbox" type="checkbox" value="Y" checked> |
|
254 |
<label for="l_vendor_confirmation_number">[% LxERP.t8("Vendor Confirmation Number") %]</label> |
|
255 |
</td> |
|
256 |
[% END %] |
|
251 | 257 |
</tr> |
252 | 258 |
<tr> |
253 | 259 |
<td> |
Auch abrufbar als: Unified diff
Lieferantenauftragsbestätigung: Bericht: Bestätigungsnummer des Lieferanten …
… filtern und anzeigen können