Revision ce3ce404
Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt
SL/OE.pm | ||
---|---|---|
66 | 66 |
qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | . |
67 | 67 |
qq| o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | . |
68 | 68 |
qq| o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | . |
69 |
qq| o.transaction_description, | . |
|
69 | 70 |
qq| ex.$rate AS exchangerate, | . |
70 | 71 |
qq| pr.projectnumber AS globalprojectnumber, | . |
71 | 72 |
qq| e.name AS employee | . |
... | ... | |
128 | 129 |
push(@values, conv_date($form->{transdateto})); |
129 | 130 |
} |
130 | 131 |
|
132 |
if ($form->{transaction_description}) { |
|
133 |
$query .= qq| AND o.transaction_description ILIKE ?|; |
|
134 |
push(@values, '%' . $form->{transaction_description} . '%'); |
|
135 |
} |
|
136 |
|
|
131 | 137 |
my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name"))); |
132 | 138 |
my %allowed_sort_columns = |
133 | 139 |
("transdate" => "o.transdate", |
... | ... | |
137 | 143 |
"quonumber" => "o.quonumber", |
138 | 144 |
"name" => "ct.name", |
139 | 145 |
"employee" => "e.name", |
140 |
"shipvia" => "o.shipvia"); |
|
146 |
"shipvia" => "o.shipvia", |
|
147 |
"transaction_description" => "o.transaction_description"); |
|
141 | 148 |
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) { |
142 | 149 |
$sortorder = $allowed_sort_columns{$form->{sort}}; |
143 | 150 |
} |
... | ... | |
407 | 414 |
qq|shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?, | . |
408 | 415 |
qq|delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?, | . |
409 | 416 |
qq|taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?, | . |
410 |
qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ? | . |
|
417 |
qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ? | .
|
|
411 | 418 |
qq|WHERE id = ?|; |
412 | 419 |
|
413 | 420 |
@values = ($form->{ordnumber}, $form->{quonumber}, |
... | ... | |
425 | 432 |
conv_i($form->{delivery_customer_id}), |
426 | 433 |
conv_i($form->{globalproject_id}), conv_i($form->{employee_id}), |
427 | 434 |
conv_i($form->{salesman_id}), conv_i($form->{cp_id}), |
435 |
$form->{transaction_description}, |
|
428 | 436 |
conv_i($form->{id})); |
429 | 437 |
do_query($form, $dbh, $query, @values); |
430 | 438 |
|
... | ... | |
669 | 677 |
qq| o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, | . |
670 | 678 |
qq| d.description AS department, o.payment_id, o.language_id, o.taxzone_id, | . |
671 | 679 |
qq| o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, | . |
672 |
qq| o.globalproject_id, o.delivered | . |
|
680 |
qq| o.globalproject_id, o.delivered, o.transaction_description | .
|
|
673 | 681 |
qq|FROM oe o | . |
674 | 682 |
qq|JOIN ${vc} cv ON (o.${vc}_id = cv.id) | . |
675 | 683 |
qq|LEFT JOIN employee e ON (o.employee_id = e.id) | . |
Auch abrufbar als: Unified diff
Bei Kundenangeboten, Kundenaufträgen, Lieferantenbestellungen und Lieferantenanfragen ein Feld "Vorgangsbezeichnung" implementiert.