Revision e059f9cf
Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt
- ID e059f9cf786f9c2a8a04d5e589e86775d6185f4d
- Vorgänger 65f7a07e
| SL/OE.pm | ||
|---|---|---|
| 148 | 148 |
qq| e.name AS employee, s.name AS salesman, | . |
| 149 | 149 |
qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id, | .
|
| 150 | 150 |
qq| tz.description AS taxzone, | . |
| 151 |
qq| shipto.shiptoname, shipto.shiptodepartment_1, shipto.shiptodepartment_2, | . |
|
| 152 |
qq| shipto.shiptostreet, shipto.shiptozipcode, shipto.shiptocity, shipto.shiptocountry, | . |
|
| 151 | 153 |
qq| order_statuses.name AS order_status | . |
| 152 | 154 |
$periodic_invoices_columns . |
| 153 | 155 |
$phone_notes_columns . |
| ... | ... | |
| 164 | 166 |
qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | . |
| 165 | 167 |
qq|LEFT JOIN department ON (o.department_id = department.id) | . |
| 166 | 168 |
qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | . |
| 169 |
qq|LEFT JOIN shipto ON ( |
|
| 170 |
(o.shipto_id = shipto.shipto_id) or |
|
| 171 |
(o.id = shipto.trans_id and shipto.module = 'OE') |
|
| 172 |
)| . |
|
| 167 | 173 |
qq|$periodic_invoices_joins | . |
| 168 | 174 |
$phone_notes_join . |
| 169 | 175 |
qq|WHERE (o.quotation = ?) | . |
| ... | ... | |
| 406 | 412 |
push @values, like($form->{parts_description});
|
| 407 | 413 |
} |
| 408 | 414 |
|
| 415 |
if ($form->{shiptoname}) {
|
|
| 416 |
$query .= " AND shipto.shiptoname ILIKE ?"; |
|
| 417 |
push(@values, like($form->{shiptoname}));
|
|
| 418 |
} |
|
| 419 |
if ($form->{shiptodepartment_1}) {
|
|
| 420 |
$query .= " AND shipto.shiptodepartment_1 ILIKE ?"; |
|
| 421 |
push(@values, like($form->{shiptodepartment_1}));
|
|
| 422 |
} |
|
| 423 |
if ($form->{shiptodepartment_2}) {
|
|
| 424 |
$query .= " AND shipto.shiptodepartment_2 ILIKE ?"; |
|
| 425 |
push(@values, like($form->{shiptodepartment_2}));
|
|
| 426 |
} |
|
| 427 |
if ($form->{shiptostreet}) {
|
|
| 428 |
$query .= " AND shipto.shiptostreet ILIKE ?"; |
|
| 429 |
push(@values, like($form->{shiptostreet}));
|
|
| 430 |
} |
|
| 431 |
if ($form->{shiptozipcode}) {
|
|
| 432 |
$query .= " AND shipto.shiptozipcode ILIKE ?"; |
|
| 433 |
push(@values, like($form->{shiptozipcode}));
|
|
| 434 |
} |
|
| 435 |
if ($form->{shiptocity}) {
|
|
| 436 |
$query .= " AND shipto.shiptocity ILIKE ?"; |
|
| 437 |
push(@values, like($form->{shiptocity}));
|
|
| 438 |
} |
|
| 439 |
if ($form->{shiptocountry}) {
|
|
| 440 |
$query .= " AND shipto.shiptocountry ILIKE ?"; |
|
| 441 |
push(@values, like($form->{shiptocountry}));
|
|
| 442 |
} |
|
| 443 |
|
|
| 409 | 444 |
if ($form->{all}) {
|
| 410 | 445 |
my @tokens = parse_line('\s+', 0, $form->{all});
|
| 411 | 446 |
# ordnumber quonumber customer.name vendor.name transaction_description |
| bin/mozilla/oe.pl | ||
|---|---|---|
| 1074 | 1074 |
"order_probability", "expected_billing_date", "expected_netamount", |
| 1075 | 1075 |
"payment_terms", "intnotes", "order_status", |
| 1076 | 1076 |
"items", |
| 1077 |
"shiptoname", "shiptodepartment_1", "shiptodepartment_2", "shiptostreet", |
|
| 1078 |
"shiptozipcode", "shiptocity", "shiptocountry", |
|
| 1077 | 1079 |
); |
| 1078 | 1080 |
|
| 1079 | 1081 |
# only show checkboxes if gotten here via sales_order form. |
| ... | ... | |
| 1123 | 1125 |
push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
|
| 1124 | 1126 |
|
| 1125 | 1127 |
my @hidden_variables = map { "l_${_}" } @columns;
|
| 1126 |
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
|
|
| 1127 |
transaction_description transdatefrom transdateto type vc employee_id salesman_id |
|
| 1128 |
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive |
|
| 1129 |
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto |
|
| 1130 |
order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to |
|
| 1131 |
parts_partnumber parts_description all department_id intnotes phone_notes fulltext order_status_id); |
|
| 1128 |
push @hidden_variables, "l_subtotal", $form->{vc}, qw(
|
|
| 1129 |
l_closed l_notdelivered open closed delivered notdelivered ordnumber |
|
| 1130 |
quonumber cusordnumber transaction_description transdatefrom transdateto |
|
| 1131 |
type vc employee_id salesman_id reqdatefrom reqdateto projectnumber |
|
| 1132 |
project_id periodic_invoices_active periodic_invoices_inactive |
|
| 1133 |
business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom |
|
| 1134 |
insertdateto order_probability_op order_probability_value |
|
| 1135 |
expected_billing_date_from expected_billing_date_to parts_partnumber |
|
| 1136 |
parts_description all department_id intnotes phone_notes fulltext |
|
| 1137 |
order_status_id shiptoname shiptodepartment_1 shiptodepartment_2 |
|
| 1138 |
shiptostreet shiptozipcode shiptocity shiptocountry |
|
| 1139 |
); |
|
| 1132 | 1140 |
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
|
| 1133 | 1141 |
|
| 1134 | 1142 |
my @keys_for_url = grep { $form->{$_} } @hidden_variables;
|
| ... | ... | |
| 1176 | 1184 |
'intnotes' => { 'text' => $locale->text('Internal Notes'), },
|
| 1177 | 1185 |
'order_status' => { 'text' => $locale->text('Status'), },
|
| 1178 | 1186 |
'items' => { 'text' => $locale->text('Positions'), },
|
| 1187 |
shiptoname => { 'text' => $locale->text('Name (Shipping)'), },
|
|
| 1188 |
shiptodepartment_1 => { 'text' => $locale->text('Department 1 (Shipping)'), },
|
|
| 1189 |
shiptodepartment_2 => { 'text' => $locale->text('Department 2 (Shipping)'), },
|
|
| 1190 |
shiptostreet => { 'text' => $locale->text('Street (Shipping)'), },
|
|
| 1191 |
shiptozipcode => { 'text' => $locale->text('Zipcode (Shipping)'), },
|
|
| 1192 |
shiptocity => { 'text' => $locale->text('City (Shipping)'), },
|
|
| 1193 |
shiptocountry => { 'text' => $locale->text('Country (Shipping)'), },
|
|
| 1179 | 1194 |
%column_defs_cvars, |
| 1180 | 1195 |
); |
| 1181 | 1196 |
|
| ... | ... | |
| 1222 | 1237 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description};
|
| 1223 | 1238 |
push @options, $locale->text('Quick Search') . " : $form->{all}" if $form->{all};
|
| 1224 | 1239 |
push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint};
|
| 1240 |
push @options, $locale->text('Name (Shipping)') . " : $form->{shiptoname}"
|
|
| 1241 |
if $form->{shiptoname};
|
|
| 1242 |
push @options, $locale->text('Department 1 (Shipping)') . " : $form->{shiptodepartment_1}"
|
|
| 1243 |
if $form->{shiptodepartment_1};
|
|
| 1244 |
push @options, $locale->text('Department 2 (Shipping)') . " : $form->{shiptodepartment_2}"
|
|
| 1245 |
if $form->{shiptodepartment_2};
|
|
| 1246 |
push @options, $locale->text('Street (Shipping)') . " : $form->{shiptostreet}"
|
|
| 1247 |
if $form->{shiptostreet};
|
|
| 1248 |
push @options, $locale->text('Zipcode (Shipping)') . " : $form->{shiptozipcode}"
|
|
| 1249 |
if $form->{shiptozipcode};
|
|
| 1250 |
push @options, $locale->text('City (Shipping)') . " : $form->{shiptocity}"
|
|
| 1251 |
if $form->{shiptocity};
|
|
| 1252 |
push @options, $locale->text('Country (Shipping)') . " : $form->{shiptocountry}"
|
|
| 1253 |
if $form->{shiptocountry};
|
|
| 1225 | 1254 |
push @options, $locale->text('Part Description') . " : $form->{parts_description}" if $form->{parts_description};
|
| 1226 | 1255 |
push @options, $locale->text('Part Number') . " : $form->{parts_partnumber}" if $form->{parts_partnumber};
|
| 1227 | 1256 |
push @options, $locale->text('Phone Notes') . " : $form->{phone_notes}" if $form->{phone_notes};
|
| templates/design40_webpages/oe/search.html | ||
|---|---|---|
| 144 | 144 |
</tbody> |
| 145 | 145 |
</table> |
| 146 | 146 |
|
| 147 |
<table class="tbl-horizontal"> |
|
| 148 |
<caption>[% 'Shipping Address' | $T8 %]</caption> |
|
| 149 |
<colgroup> <col class="wi-small"><col class="wi-wide"> </colgroup> |
|
| 150 |
<tbody> |
|
| 151 |
<tr> |
|
| 152 |
<th>[% 'Name' | $T8 %]</th> |
|
| 153 |
<td>[% L.input_tag("shiptoname", "", class="wi-normal") %]</td>
|
|
| 154 |
</tr> |
|
| 155 |
<tr> |
|
| 156 |
<th>[% 'Department 1' | $T8 %]</th> |
|
| 157 |
<td>[% L.input_tag("shiptodepartment_1", "", class="wi-normal") %]</td>
|
|
| 158 |
</tr> |
|
| 159 |
<tr> |
|
| 160 |
<th>[% 'Department 2' | $T8 %]</th> |
|
| 161 |
<td>[% L.input_tag("shiptodepartment_2", "", class="wi-normal") %]</td>
|
|
| 162 |
</tr> |
|
| 163 |
<tr> |
|
| 164 |
<th>[% 'Street' | $T8 %]</th> |
|
| 165 |
<td>[% L.input_tag("shiptostreet", "", class="wi-normal") %]</td>
|
|
| 166 |
</tr> |
|
| 167 |
<tr> |
|
| 168 |
<th>[% 'Zipcode' | $T8 %]</th> |
|
| 169 |
<td>[% L.input_tag("shiptozipcode", "", class="wi-normal") %]</td>
|
|
| 170 |
</tr> |
|
| 171 |
<tr> |
|
| 172 |
<th>[% 'City' | $T8 %]</th> |
|
| 173 |
<td>[% L.input_tag("shiptocity", "", class="wi-normal") %]</td>
|
|
| 174 |
</tr> |
|
| 175 |
<tr> |
|
| 176 |
<th>[% 'Country' | $T8 %]</th> |
|
| 177 |
<td>[% L.input_tag("shiptocountry", "", class="wi-normal") %]</td>
|
|
| 178 |
</tr> |
|
| 179 |
</tbody> |
|
| 180 |
</table> |
|
| 181 |
|
|
| 147 | 182 |
<table class="tbl-horizontal"> |
| 148 | 183 |
<caption>[% 'Status' | $T8 %]</caption> |
| 149 | 184 |
<tbody> |
| ... | ... | |
| 278 | 313 |
<label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label> |
| 279 | 314 |
</div> |
| 280 | 315 |
</div> |
| 316 |
<div class="list col"> |
|
| 317 |
<h4>[% 'Shipping Address' | $T8 %]</h4> |
|
| 318 |
<div> |
|
| 319 |
<input name="l_shiptoname" id="l_shiptoname" type="checkbox"><label for="l_shiptoname">[% 'Name' | $T8 %]</label> |
|
| 320 |
</div> |
|
| 321 |
<div> |
|
| 322 |
<input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox"><label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label> |
|
| 323 |
</div> |
|
| 324 |
<div> |
|
| 325 |
<input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox"><label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label> |
|
| 326 |
</div> |
|
| 327 |
<div> |
|
| 328 |
<input name="l_shiptostreet" id="l_shiptostreet" type="checkbox"><label for="l_shiptostreet">[% 'Street' | $T8 %]</label> |
|
| 329 |
</div> |
|
| 330 |
<div> |
|
| 331 |
<input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox"><label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label> |
|
| 332 |
</div> |
|
| 333 |
<div> |
|
| 334 |
<input name="l_shiptocity" id="l_shiptocity" type="checkbox"><label for="l_shiptocity">[% 'City' | $T8 %]</label> |
|
| 335 |
</div> |
|
| 336 |
<div> |
|
| 337 |
<input name="l_shiptocountry" id="l_shiptocountry" type="checkbox"><label for="l_shiptocountry">[% 'Country' | $T8 %]</label> |
|
| 338 |
</div> |
|
| 339 |
</div> |
|
| 281 | 340 |
<div class="list col"> |
| 282 | 341 |
<h4>[% 'Taxes' | $T8 %]</h4> |
| 283 | 342 |
<div> |
| templates/webpages/oe/search.html | ||
|---|---|---|
| 59 | 59 |
<th align="right">[% 'Shipping Point' | $T8 %]</th> |
| 60 | 60 |
<td>[% L.input_tag('shippingpoint', '', style=style) %]</td>
|
| 61 | 61 |
</tr> |
| 62 |
<tr> |
|
| 63 |
<th align=right nowarp>[% 'Name (Shipping)' | $T8 %]</th> |
|
| 64 |
<td>[% L.input_tag("shiptoname", "", style=style) %]</td>
|
|
| 65 |
</tr> |
|
| 66 |
<tr> |
|
| 67 |
<th align=right nowarp>[% 'Department 1 (Shipping)' | $T8 %]</th> |
|
| 68 |
<td>[% L.input_tag("shiptodepartment_1", "", style=style) %]</td>
|
|
| 69 |
</tr> |
|
| 70 |
<tr> |
|
| 71 |
<th align=right nowarp>[% 'Department 2 (Shipping)' | $T8 %]</th> |
|
| 72 |
<td>[% L.input_tag("shiptodepartment_2", "", style=style) %]</td>
|
|
| 73 |
</tr> |
|
| 74 |
<tr> |
|
| 75 |
<th align=right nowarp>[% 'Street (Shipping)' | $T8 %]</th> |
|
| 76 |
<td>[% L.input_tag("shiptostreet", "", style=style) %]</td>
|
|
| 77 |
</tr> |
|
| 78 |
<tr> |
|
| 79 |
<th align=right nowarp>[% 'Zipcode (Shipping)' | $T8 %]</th> |
|
| 80 |
<td>[% L.input_tag("shiptozipcode", "", style=style) %]</td>
|
|
| 81 |
</tr> |
|
| 82 |
<tr> |
|
| 83 |
<th align=right nowarp>[% 'City (Shipping)' | $T8 %]</th> |
|
| 84 |
<td>[% L.input_tag("shiptocity", "", style=style) %]</td>
|
|
| 85 |
</tr> |
|
| 86 |
<tr> |
|
| 87 |
<th align=right nowarp>[% 'Country (Shipping)' | $T8 %]</th> |
|
| 88 |
<td>[% L.input_tag("shiptocountry", "", style=style) %]</td>
|
|
| 89 |
</tr> |
|
| 62 | 90 |
<tr> |
| 63 | 91 |
<th align="right">[% 'Transaction description' | $T8 %]</th> |
| 64 | 92 |
<td>[% L.input_tag("transaction_description", "", style=style) %]</td>
|
| ... | ... | |
| 338 | 366 |
<label for="l_ustid">[% 'USt-IdNr.' | $T8 %]</label> |
| 339 | 367 |
</td> |
| 340 | 368 |
</tr> |
| 369 |
<tr> |
|
| 370 |
<td colspan=4 align=left><b>[% 'Shipping Address' | $T8 %]</b></td> |
|
| 371 |
</tr> |
|
| 372 |
<tr> |
|
| 373 |
<td> |
|
| 374 |
<input name="l_shiptoname" id="l_shiptoname" type="checkbox" value="Y"> |
|
| 375 |
<label for="l_shiptoname">[% 'Name' | $T8 %]</label> |
|
| 376 |
</td> |
|
| 377 |
<td> |
|
| 378 |
<input name="l_shiptodepartment_1" id="l_shiptodepartment_1" type="checkbox" value="Y"> |
|
| 379 |
<label for="l_shiptodepartment_1">[% 'Department 1' | $T8 %]</label> |
|
| 380 |
</td> |
|
| 381 |
<td> |
|
| 382 |
<input name="l_shiptodepartment_2" id="l_shiptodepartment_2" type="checkbox" value="Y"> |
|
| 383 |
<label for="l_shiptodepartment_2">[% 'Department 2' | $T8 %]</label> |
|
| 384 |
</td> |
|
| 385 |
</tr> |
|
| 386 |
<tr> |
|
| 387 |
<td> |
|
| 388 |
<input name="l_shiptostreet" id="l_shiptostreet" type="checkbox" value="Y"> |
|
| 389 |
<label for="l_shiptostreet">[% 'Street' | $T8 %]</label> |
|
| 390 |
</td> |
|
| 391 |
<td> |
|
| 392 |
<input name="l_shiptozipcode" id="l_shiptozipcode" type="checkbox" value="Y"> |
|
| 393 |
<label for="l_shiptozipcode">[% 'Zipcode' | $T8 %]</label> |
|
| 394 |
</td> |
|
| 395 |
<td> |
|
| 396 |
<input name="l_shiptocity" id="l_shiptocity" type="checkbox" value="Y"> |
|
| 397 |
<label for="l_shiptocity">[% 'City' | $T8 %]</label> |
|
| 398 |
</td> |
|
| 399 |
</tr> |
|
| 400 |
<tr> |
|
| 401 |
<td> |
|
| 402 |
<input name="l_shiptocountry" id="l_shiptocountry" type="checkbox" value="Y"> |
|
| 403 |
<label for="l_shiptocountry">[% 'Country' | $T8 %]</label> |
|
| 404 |
</td> |
|
| 405 |
</tr> |
|
| 341 | 406 |
|
| 342 | 407 |
[% CT_CUSTOM_VARIABLES_INCLUSION_CODE %] |
| 343 | 408 |
|
Auch abrufbar als: Unified diff
Angebots-/Auftragsbericht: Lieferadresse anzeigen und filtern