X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FTransNumberGenerator.pm;h=a28f11f71687e7eb9ca152d04939eeb40849ceb8;hb=53e988b8907baa17f684ee66c6b7aa90fe7c27fb;hp=9c657293bc9b36150584cf5f35e4658ae50f4a51;hpb=0aef653a321d8387d164dbc6092d8721711b22f2;p=kivitendo-erp.git diff --git a/SL/DB/Helper/TransNumberGenerator.pm b/SL/DB/Helper/TransNumberGenerator.pm index 9c657293b..a28f11f71 100644 --- a/SL/DB/Helper/TransNumberGenerator.pm +++ b/SL/DB/Helper/TransNumberGenerator.pm @@ -20,7 +20,7 @@ sub do_scoping { } sub parts_scoping { - SL::DB::Manager::Part->type_filter($_[0]); + # SL::DB::Manager::Part->type_filter($_[0]); } my %specs = ( ar => { number_column => 'invnumber', }, @@ -35,6 +35,7 @@ my %specs = ( ar => { number_column => 'invnumber', part => { number_column => 'partnumber', number_range_column => 'articlenumber', scoping => \&parts_scoping, }, service => { number_column => 'partnumber', number_range_column => 'servicenumber', scoping => \&parts_scoping, }, assembly => { number_column => 'partnumber', number_range_column => 'assemblynumber', scoping => \&parts_scoping, }, + assortment => { number_column => 'partnumber', number_range_column => 'assortmentnumber', scoping => \&parts_scoping, }, ); sub get_next_trans_number { @@ -97,7 +98,7 @@ sub get_next_trans_number { my $range_table = ($business ? $business : SL::DB::Default->get)->load(for_update => 1); my $start_number = $range_table->$number_range_column; - $start_number = $range_table->articlenumber if ($number_range_column eq 'assemblynumber') && (length($start_number) < 1); + $start_number = $range_table->articlenumber if ($number_range_column =~ /^(assemblynumber|assortmentnumber)$/) && (length($start_number) < 1); my $sequence = SL::PrefixedNumber->new(number => $start_number // 0); if (!$fill_holes_in_range) {