Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 80198348

Von Sven Schöling vor etwa 1 Jahr hinzugefügt

  • ID 8019834863ae15850ba01757ddab888e724334be
  • Vorgänger 394c3e69
  • Nachfolger 4a8d6c36

DeliveryOrder: direct delivery check entfernt

Direct Delivery war als feature nie in Lieferscheinen vorhanden, die
Funktion war ungenutzt.

Unterschiede anzeigen:

SL/Controller/DeliveryOrder.pm
1669 1669
  # always save
1670 1670
  $self->save();
1671 1671

  
1672
  # check for direct delivery
1673
  # copy shipto in custom shipto (custom shipto will be copied by new_from() in case)
1674
  my $custom_shipto;
1675
  if ($self->type_data->workflow("to_order_copy_shipto") && $::form->{use_shipto} && $self->order->shipto) {
1676
    $custom_shipto = $self->order->shipto->clone('SL::DB::DeliveryOrder');
1677
  }
1678

  
1679 1672
  my $delivery_order = SL::Model::Record->new_from_workflow($self->order, $destination_type, {});
1680 1673
  $self->order($delivery_order);
1681 1674
  $self->{converted_from_oe_id} = delete $::form->{id};
......
1685 1678
    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
1686 1679
  }
1687 1680

  
1688
  if ($self->type_data->workflow("to_order_copy_shipto")) {
1689
    if ($::form->{use_shipto}) {
1690
      $self->order->custom_shipto($custom_shipto) if $custom_shipto;
1691
    } else {
1692
      # remove any custom shipto if not wanted
1693
      $self->order->custom_shipto(SL::DB::Shipto->new(module => 'OE', custom_variables => []));
1694
    }
1695
  }
1696

  
1697 1681
  # change form type
1698 1682
  $::form->{type} = $destination_type;
1699 1683
  $self->type($self->init_type);

Auch abrufbar als: Unified diff