X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f50ddd66b0b90f206c762c95770da530cb0b7d69..e5e91dc691c234f08e68b5d4eceb01ba54c57fdd:/SL/DB/Helper/TransNumberGenerator.pm

diff --git a/SL/DB/Helper/TransNumberGenerator.pm b/SL/DB/Helper/TransNumberGenerator.pm
index 41dba2cd7..6cdc281a8 100644
--- a/SL/DB/Helper/TransNumberGenerator.pm
+++ b/SL/DB/Helper/TransNumberGenerator.pm
@@ -8,7 +8,6 @@ our @EXPORT = qw(get_next_trans_number create_trans_number);
 use Carp;
 use List::Util qw(max);
 
-use SL::DB::Default;
 use SL::PrefixedNumber;
 
 sub oe_scoping {
@@ -34,7 +33,7 @@ my %specs = ( ar                      => { number_column => 'invnumber',
               vendor                  => { number_column => 'vendornumber',   number_range_column => 'vendornumber',                                                     },
               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 => 'articlenumber',  scoping => \&parts_scoping                        },
+              assembly                => { number_column => 'partnumber',     number_range_column => 'assemblynumber', scoping => \&parts_scoping                        },
             );
 
 sub get_next_trans_number {
@@ -51,20 +50,40 @@ sub get_next_trans_number {
 
   return $number if $self->id && $number;
 
-  my %conditions     = $scoping_conditions ? ( query => [ $scoping_conditions->($spec_type) ] ) : ();
+  require SL::DB::Default;
+  require SL::DB::Business;
+
+  my %conditions = ( query => [ $scoping_conditions ? $scoping_conditions->($spec_type) : () ] );
+
+  my $business;
+  if ($spec_type =~ m{^(?:customer|vendor)$}) {
+    $business = $self->business_id ? SL::DB::Business->new(id => $self->business_id)->load : $self->business;
+    if ($business && (($business->customernumberinit // '') ne '')) {
+      $number_range_column = 'customernumberinit';
+      push @{ $conditions{query} }, ( business_id => $business->id );
+
+    } else {
+      undef $business;
+      push @{ $conditions{query} }, ( business_id => undef );
+
+    }
+  }
+
   my @numbers        = map { $_->$number_column } @{ $self->_get_manager_class->get_all(%conditions) };
   my %numbers_in_use = map { ( $_ => 1 )        } @numbers;
 
-  my $defaults       = SL::DB::Default->get;
-  my $sequence       = SL::PrefixedNumber->new(number => $defaults->$number_range_column);
+  my $range_table    = $business ? $business : SL::DB::Default->get;
+  my $start_number   = $range_table->$number_range_column;
+  $start_number      = $range_table->articlenumber if ($number_range_column eq 'assemblynumber') && (length($start_number) < 1);
+  my $sequence       = SL::PrefixedNumber->new(number => $start_number);
 
   $sequence->set_to_max(@numbers) if !$fill_holes_in_range;
 
   my $new_number = $sequence->get_next;
   $new_number    = $sequence->get_next while $numbers_in_use{$new_number};
 
-  $defaults->update_attributes($number_range_column => $new_number) if $params{update_defaults};
-  $self->$number_column($new_number)                                if $params{update_record};
+  $range_table->update_attributes($number_range_column => $new_number) if $params{update_defaults};
+  $self->$number_column($new_number)                                   if $params{update_record};
 
   return $new_number;
 }