Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / SL / DB / Manager / DeliveryOrder.pm

diff --git a/SL/DB/Manager/DeliveryOrder.pm b/SL/DB/Manager/DeliveryOrder.pm
index 156ca7b2d06cd6b4ae1d98b42f3629990bee1637..e9c1ee7f27fcdfeec0b12d3d827e41eba9e739db 100644 (file)
--- a/SL/DB/Manager/DeliveryOrder.pm
+++ b/SL/DB/Manager/DeliveryOrder.pm
@@ -8,6 +8,8 @@ use SL::DB::Helper::Paginated;
 use SL::DB::Helper::Sorted;
 use SL::DB::Helper::Filtered;
 
+use SL::DB::DeliveryOrder::TypeData qw(validate_type);
+
 sub object_class { 'SL::DB::DeliveryOrder' }
 
 __PACKAGE__->make_manager_methods;
@@ -26,11 +28,9 @@ __PACKAGE__->add_filter_specs(
 sub type_filter {
   my $class = shift;
   my $type  = lc(shift || '');
+  my $prefix = shift // '';
 
-  return ('!customer_id' => undef) if $type eq 'sales_delivery_order';
-  return ('!vendor_id'   => undef) if $type eq 'purchase_delivery_order';
-
-  die "Unknown type $type";
+  return "${prefix}order_type" => validate_type($type);
 }
 
 sub _sort_spec {