Revision 3906bb6a
Von Bernd Bleßmann vor fast 4 Jahren hinzugefügt
SL/OE.pm | ||
---|---|---|
123 | 123 |
qq| o.marge_total, o.marge_percent, | . |
124 | 124 |
qq| o.exchangerate, | . |
125 | 125 |
qq| o.itime::DATE AS insertdate, | . |
126 |
qq| o.intnotes, | . |
|
126 | 127 |
qq| department.description as department, | . |
127 | 128 |
qq| ex.$rate AS daily_exchangerate, | . |
128 | 129 |
qq| pt.description AS payment_terms, | . |
... | ... | |
296 | 297 |
push @values, conv_date($form->{expected_billing_date_to}); |
297 | 298 |
} |
298 | 299 |
|
300 |
if ($form->{intnotes}) { |
|
301 |
$query .= qq| AND o.intnotes ILIKE ?|; |
|
302 |
push(@values, like($form->{intnotes})); |
|
303 |
} |
|
304 |
|
|
299 | 305 |
if ($form->{parts_partnumber}) { |
300 | 306 |
$query .= <<SQL; |
301 | 307 |
AND EXISTS ( |
... | ... | |
363 | 369 |
"taxzone" => "tz.description", |
364 | 370 |
"payment_terms" => "pt.description", |
365 | 371 |
"department" => "department.description", |
372 |
"intnotes" => "o.intnotes", |
|
366 | 373 |
); |
367 | 374 |
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) { |
368 | 375 |
$sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}" . ", o.itime ${sortdir}"; |
bin/mozilla/oe.pl | ||
---|---|---|
1035 | 1035 |
"country", "shippingpoint", |
1036 | 1036 |
"taxzone", "insertdate", |
1037 | 1037 |
"order_probability", "expected_billing_date", "expected_netamount", |
1038 |
"payment_terms", |
|
1038 |
"payment_terms", "intnotes",
|
|
1039 | 1039 |
); |
1040 | 1040 |
|
1041 | 1041 |
# only show checkboxes if gotten here via sales_order form. |
... | ... | |
1084 | 1084 |
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive |
1085 | 1085 |
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto |
1086 | 1086 |
order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to |
1087 |
parts_partnumber parts_description all department_id); |
|
1087 |
parts_partnumber parts_description all department_id intnotes);
|
|
1088 | 1088 |
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; |
1089 | 1089 |
|
1090 | 1090 |
my @keys_for_url = grep { $form->{$_} } @hidden_variables; |
... | ... | |
1129 | 1129 |
'expected_billing_date' => { 'text' => $locale->text('Exp. bill. date'), }, |
1130 | 1130 |
'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), }, |
1131 | 1131 |
'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, |
1132 |
'intnotes' => { 'text' => $locale->text('Internal Notes'), }, |
|
1132 | 1133 |
%column_defs_cvars, |
1133 | 1134 |
); |
1134 | 1135 |
|
1135 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department)) { |
|
1136 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) {
|
|
1136 | 1137 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
1137 | 1138 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
1138 | 1139 |
} |
... | ... | |
1163 | 1164 |
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; |
1164 | 1165 |
push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber}; |
1165 | 1166 |
push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; |
1167 |
push @options, $locale->text('Internal Notes') . " : $form->{intnotes}" if $form->{intnotes}; |
|
1166 | 1168 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description}; |
1167 | 1169 |
push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all}; |
1168 | 1170 |
push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; |
templates/webpages/oe/search.html | ||
---|---|---|
76 | 76 |
</td> |
77 | 77 |
</tr> |
78 | 78 |
[%- END %] |
79 |
<tr> |
|
80 |
<th align="right">[% 'Internal Notes' | $T8 %]</th> |
|
81 |
<td>[% L.input_tag('intnotes', '', style=style) %]</td> |
|
82 |
</tr> |
|
79 | 83 |
<tr> |
80 | 84 |
<th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th> |
81 | 85 |
<td> |
... | ... | |
271 | 275 |
<input name="l_salesman" id="l_salesman" class="checkbox" type="checkbox" value="Y"> |
272 | 276 |
<label for="l_salesman">[% 'Salesman' | $T8 %]</label> |
273 | 277 |
</td> |
278 |
<td> |
|
279 |
<input name="l_intnotes" id="l_intnotes" class="checkbox" type="checkbox" value="Y"> |
|
280 |
<label for="l_intnotes">[% 'Internal Notes' | $T8 %]</label> |
|
281 |
</td> |
|
274 | 282 |
</tr> |
275 | 283 |
[% IF type == 'sales_quotation' %] |
276 | 284 |
<tr> |
Auch abrufbar als: Unified diff
Bericht Angebote/Aufträge: internen Bemerkungen filtern und anzeigen können