restart apache2 in postinst

[mfinanz.git] / SL / BackgroundJob / ConvertTimeRecordings.pm

diff --git a/SL/BackgroundJob/ConvertTimeRecordings.pm b/SL/BackgroundJob/ConvertTimeRecordings.pm
index 45ded55e83da02c432df22973feae9e5c03368b9..8f90d40b9d03c5ef1767d4cc8b550eb12c598301 100644 (file)
--- a/SL/BackgroundJob/ConvertTimeRecordings.pm
+++ b/SL/BackgroundJob/ConvertTimeRecordings.pm
@@ -235,24 +235,6 @@ sub convert_with_linking {
         $do->save;
         $_->update_attributes(booked => 1) for @{$time_recordings_by_order_id->{$related_order_id}};
 
-        $related_order->link_to_record($do);
-
-        # TODO extend link_to_record for items, otherwise long-term no d.r.y.
-        foreach my $item (@{ $do->items }) {
-          foreach (qw(orderitems)) {
-            if ($item->{"converted_from_${_}_id"}) {
-              die unless $item->{id};
-              RecordLinks->create_links('mode'       => 'ids',
-                                        'from_table' => $_,
-                                        'from_ids'   => $item->{"converted_from_${_}_id"},
-                                        'to_table'   => 'delivery_order_items',
-                                        'to_id'      => $item->{id},
-              ) || die;
-              delete $item->{"converted_from_${_}_id"};
-            }
-          }
-        }
-
         # update delivered and item's ship for related order
         my $helper = SL::Helper::ShippedQty->new->calculate($related_order)->write_to_objects;
         $related_order->delivered($related_order->{delivered});
@@ -305,7 +287,7 @@ sub get_order_for_time_recording {
     }
 
     $orders = SL::DB::Manager::Order->get_all(where        => [customer_id      => $tr->customer_id,
-                                                               or               => [quotation => undef, quotation => 0],
+                                                               record_type      => 'sales_order',
                                                                globalproject_id => $project_id, ],
                                               with_objects => ['orderitems']);