Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision c22e188b

Von Jan Büren vor fast 3 Jahren hinzugefügt

  • ID c22e188b4d7aabdf062a1d83909760f4252966b3
  • Vorgänger 6daa0eca
  • Nachfolger cb53cdd0

ShippedQty: Optionale OrderItems nicht für Status Order->delivered auswerten

S.a.: Testfall und Changelog

Unterschiede anzeigen:

SL/Helper/ShippedQty.pm
26 26
  ORDER BY oi.trans_id, oi.position
27 27

  
28 28
# oi not item linked. takes about 250ms for 100k hits
29
# obsolete since 3.5.6
29 30
my $fill_up_oi_query = <<'';
30 31
  SELECT oi.id, oi.trans_id, oi.position, oi.parts_id, oi.description, oi.reqdate, oi.serialnumber, oi.qty, oi.unit
31 32
  FROM orderitems oi
......
33 34
  ORDER BY oi.trans_id, oi.position
34 35

  
35 36
# doi linked by record, but not by items; 250ms for 100k hits
37
# obsolete since 3.5.6
36 38
my $no_stock_fill_up_doi_query = <<'';
37 39
  SELECT doi.id, doi.delivery_order_id, doi.position, doi.parts_id, doi.description, doi.reqdate, doi.serialnumber, doi.qty, doi.unit
38 40
  FROM delivery_order_items doi
......
219 221
    } elsif ('SL::DB::Order' eq ref $obj) {
220 222
      if (defined $obj->{orderitems}) {
221 223
        $self->write_to($obj->{orderitems});
222
        $obj->{delivered} = all { $_->{delivered} } @{ $obj->{orderitems} };
224
        $obj->{delivered} = all { $_->{delivered} } grep { !$_->{optional} || $_->{optional} == 0 } @{ $obj->{orderitems} };
223 225
      } else {
224 226
        # don't force a load on items. just compute by oe_id directly
225 227
        $obj->{delivered} = $self->delivered->{$obj->id};

Auch abrufbar als: Unified diff