'to_id' => $form->{id},
);
delete $form->{convert_from_oe_ids};
-
- $self->mark_orders_if_delivered('do_id' => $form->{id},
- 'type' => $form->{type} eq 'sales_delivery_order' ? 'sales' : 'purchase',
- 'dbh' => $dbh,);
+ unless ($::instance_conf->get_shipped_qty_require_stock_out) {
+ $self->mark_orders_if_delivered('do_id' => $form->{id},
+ 'type' => $form->{type} eq 'sales_delivery_order' ? 'sales' : 'purchase');
+ }
$form->{saved_donumber} = $form->{donumber};
$form->{saved_ordnumber} = $form->{ordnumber};
die "No valid delivery order found" unless ref $do eq 'SL::DB::DeliveryOrder';
my $dt = DateTime->today->subtract(days => $::instance_conf->get_undo_transfer_interval);
- croak "Wrong call. Please check undoing interval" unless DateTime->compare($do->itime, $dt) == 1;
+ croak "Wrong call. Please check undoing interval" unless $do->itime > $dt;
foreach my $doi (@{ $do->orderitems }) {
foreach my $dois (@{ $doi->delivery_order_stock_entries}) {
WH->transfer(@transfers);
+ if ($::instance_conf->get_shipped_qty_require_stock_out) {
+ $self->mark_orders_if_delivered('do_id' => $form->{id},
+ 'type' => $form->{type} eq 'sales_delivery_order' ? 'sales' : 'purchase');
+ }
+
$main::lxdebug->leave_sub();
}