Revision 222c7e21
Von Moritz Bunkus vor fast 18 Jahren hinzugefügt
| SL/OE.pm | ||
|---|---|---|
| 65 | 65 |
my $query = qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, |
| 66 | 66 |
o.amount, ct.name, o.netamount, o.$form->{vc}_id,
|
| 67 | 67 |
ex.$rate AS exchangerate, |
| 68 |
o.closed, o.quonumber, o.shippingpoint, o.shipvia, |
|
| 68 |
o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia,
|
|
| 69 | 69 |
e.name AS employee |
| 70 | 70 |
FROM oe o |
| 71 | 71 |
JOIN $form->{vc} ct ON (o.$form->{vc}_id = ct.id)
|
| ... | ... | |
| 126 | 126 |
$query .= ($form->{open}) ? " AND o.closed = '0'" : " AND o.closed = '1'";
|
| 127 | 127 |
} |
| 128 | 128 |
|
| 129 |
if (($form->{"notdelivered"} || $form->{"delivered"}) &&
|
|
| 130 |
($form->{"notdelivered"} ne $form->{"delivered"})) {
|
|
| 131 |
$query .= $form->{"delivered"} ?
|
|
| 132 |
" AND o.delivered " : " AND NOT o.delivered"; |
|
| 133 |
} |
|
| 134 |
|
|
| 129 | 135 |
my $sortorder = join ', ', |
| 130 | 136 |
("o.id", $form->sort_columns(transdate, $ordnumber, name));
|
| 131 | 137 |
$sortorder = $form->{sort} if $form->{sort};
|
| ... | ... | |
| 460 | 466 |
intnotes = '$form->{intnotes}',
|
| 461 | 467 |
curr = '$form->{currency}',
|
| 462 | 468 |
closed = '$form->{closed}',
|
| 469 |
delivered = '| . ($form->{delivered} ? "t" : "f") . qq|',
|
|
| 463 | 470 |
proforma = '$form->{proforma}',
|
| 464 | 471 |
quotation = '$quotation', |
| 465 | 472 |
department_id = $form->{department_id},
|
| ... | ... | |
| 724 | 731 |
o.curr AS currency, e.name AS employee, o.employee_id, |
| 725 | 732 |
o.$form->{vc}_id, cv.name AS $form->{vc}, o.amount AS invtotal,
|
| 726 | 733 |
o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, |
| 727 |
d.description AS department, o.payment_id, o.language_id, o.taxzone_id, o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id |
|
| 734 |
d.description AS department, o.payment_id, o.language_id, o.taxzone_id, |
|
| 735 |
o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, |
|
| 736 |
o.delivered |
|
| 728 | 737 |
FROM oe o |
| 729 | 738 |
JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
|
| 730 | 739 |
LEFT JOIN employee e ON (o.employee_id = e.id) |
Auch abrufbar als: Unified diff
Bei Auftragsbestätigungen und Lieferantenaufträgen ein Feld "Geliefert" eingeführt, das komplett manuell zu setzen ist.