Revision fa51a82e
Von Bernd Bleßmann vor etwa 2 Jahren hinzugefügt
SL/OE.pm | ||
---|---|---|
131 | 131 |
qq| o.marge_total, o.marge_percent, | . |
132 | 132 |
qq| o.exchangerate, | . |
133 | 133 |
qq| o.itime::DATE AS insertdate, | . |
134 |
qq| o.intnotes, | .
|
|
134 |
qq| o.intnotes,| . |
|
135 | 135 |
qq| department.description as department, | . |
136 | 136 |
qq| ex.$rate AS daily_exchangerate, | . |
137 | 137 |
qq| pt.description AS payment_terms, | . |
138 | 138 |
qq| pr.projectnumber AS globalprojectnumber, | . |
139 | 139 |
qq| e.name AS employee, s.name AS salesman, | . |
140 | 140 |
qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id, | . |
141 |
qq| tz.description AS taxzone | . |
|
141 |
qq| tz.description AS taxzone, | . |
|
142 |
qq| order_statuses.name AS order_status | . |
|
142 | 143 |
$periodic_invoices_columns . |
143 | 144 |
$phone_notes_columns . |
144 | 145 |
qq| , o.order_probability, o.expected_billing_date, (o.netamount * o.order_probability / 100) AS expected_netamount | . |
... | ... | |
153 | 154 |
qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| . |
154 | 155 |
qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | . |
155 | 156 |
qq|LEFT JOIN department ON (o.department_id = department.id) | . |
157 |
qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | . |
|
156 | 158 |
qq|$periodic_invoices_joins | . |
157 | 159 |
$phone_notes_join . |
158 | 160 |
qq|WHERE (o.quotation = ?) |; |
... | ... | |
313 | 315 |
push(@values, like($form->{intnotes})); |
314 | 316 |
} |
315 | 317 |
|
318 |
if ($form->{order_status_id}) { |
|
319 |
$query .= qq| AND o.order_status_id = ?|; |
|
320 |
push(@values, $form->{order_status_id}); |
|
321 |
} |
|
322 |
|
|
316 | 323 |
if ($form->{phone_notes}) { |
317 | 324 |
$query .= qq| AND (phone_notes.subject ILIKE ? OR regexp_replace(phone_notes.body, '<[^>]*>', '', 'g') ILIKE ?)|; |
318 | 325 |
push(@values, like($form->{phone_notes}), like($form->{phone_notes})); |
... | ... | |
429 | 436 |
"payment_terms" => "pt.description", |
430 | 437 |
"department" => "department.description", |
431 | 438 |
"intnotes" => "o.intnotes", |
439 |
"order_status" => "order_statuses.name", |
|
432 | 440 |
); |
433 | 441 |
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) { |
434 | 442 |
$sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}" . ", o.itime ${sortdir}"; |
bin/mozilla/oe.pl | ||
---|---|---|
970 | 970 |
$form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, |
971 | 971 |
"taxzones" => "ALL_TAXZONES", |
972 | 972 |
"business_types" => "ALL_BUSINESS_TYPES",); |
973 |
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]); |
|
974 |
$form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all; |
|
973 |
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]); |
|
974 |
$form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all; |
|
975 |
$form->{ALL_ORDER_STATUSES} = SL::DB::Manager::OrderStatus->get_all_sorted; |
|
975 | 976 |
|
976 | 977 |
$form->{CT_CUSTOM_VARIABLES} = CVar->get_configs('module' => 'CT'); |
977 | 978 |
($form->{CT_CUSTOM_VARIABLES_FILTER_CODE}, |
... | ... | |
1054 | 1055 |
"country", "shippingpoint", |
1055 | 1056 |
"taxzone", "insertdate", |
1056 | 1057 |
"order_probability", "expected_billing_date", "expected_netamount", |
1057 |
"payment_terms", "intnotes", |
|
1058 |
"payment_terms", "intnotes", "order_status",
|
|
1058 | 1059 |
); |
1059 | 1060 |
|
1060 | 1061 |
# only show checkboxes if gotten here via sales_order form. |
... | ... | |
1103 | 1104 |
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive |
1104 | 1105 |
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto |
1105 | 1106 |
order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to |
1106 |
parts_partnumber parts_description all department_id intnotes phone_notes fulltext); |
|
1107 |
parts_partnumber parts_description all department_id intnotes phone_notes fulltext order_status_id);
|
|
1107 | 1108 |
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables; |
1108 | 1109 |
|
1109 | 1110 |
my @keys_for_url = grep { $form->{$_} } @hidden_variables; |
... | ... | |
1149 | 1150 |
'expected_netamount' => { 'text' => $locale->text('Exp. netamount'), }, |
1150 | 1151 |
'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, |
1151 | 1152 |
'intnotes' => { 'text' => $locale->text('Internal Notes'), }, |
1153 |
'order_status' => { 'text' => $locale->text('Status'), }, |
|
1152 | 1154 |
%column_defs_cvars, |
1153 | 1155 |
); |
1154 | 1156 |
|
1155 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) { |
|
1157 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes order_status)) {
|
|
1156 | 1158 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
1157 | 1159 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
1158 | 1160 |
} |
... | ... | |
1235 | 1237 |
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{expected_billing_date_to}, 1) if $form->{expected_billing_date_to}; |
1236 | 1238 |
} |
1237 | 1239 |
|
1240 |
if ($form->{order_status_id}) { |
|
1241 |
push @options, $locale->text('Status') . " : " . SL::DB::OrderStatus->new(id => $form->{order_status_id})->load->name; |
|
1242 |
} |
|
1243 |
|
|
1238 | 1244 |
$report->set_options('top_info_text' => join("\n", @options), |
1239 | 1245 |
'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), |
1240 | 1246 |
'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'), |
templates/webpages/oe/search.html | ||
---|---|---|
33 | 33 |
<tr> |
34 | 34 |
<th align="right">[% HTML.escape(ordlabel) %]</th> |
35 | 35 |
<td>[% L.input_tag(ordnrname, "", style=style) %]</td> |
36 |
<th align="right">[% 'Status' | $T8 %]</th> |
|
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> |
|
36 | 38 |
</tr> |
39 |
|
|
37 | 40 |
[% IF is_order %] |
38 | 41 |
<tr> |
39 | 42 |
<th align="right">[% LxERP.t8("Customer Order Number") %]</th> |
... | ... | |
307 | 310 |
<input name="l_remaining_netamount" id="l_remaining_netamount" class="checkbox" type="checkbox" value="Y"> |
308 | 311 |
<label for="l_remaining_netamount">[% 'Remaining Net Amount' | $T8 %]</label> |
309 | 312 |
</td> |
313 |
<td> |
|
314 |
<input name="l_order_status" id="l_order_status" class="checkbox" type="checkbox" value="Y"> |
|
315 |
<label for="l_order_status">[% 'Status' | $T8 %]</label> |
|
316 |
</td> |
|
310 | 317 |
</tr> |
311 | 318 |
<tr> |
312 | 319 |
<td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</b></td> |
Auch abrufbar als: Unified diff
Angebot/Auftrag Status: Im Bericht anzeigen und danach filtern können.