X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTransNumber.pm;h=b6fa365e83984ed6de58b40c4037f69cf4b266c8;hb=1268bf670c06f5a66ad78a75e41ad6c15061d9bc;hp=9aed126551ceb6551548d3c774d55de251a301bf;hpb=cf889668782d1ffbb76b9f28e1d36848544fa3b3;p=kivitendo-erp.git diff --git a/SL/TransNumber.pm b/SL/TransNumber.pm index 9aed12655..b6fa365e8 100644 --- a/SL/TransNumber.pm +++ b/SL/TransNumber.pm @@ -6,15 +6,20 @@ use parent qw(Rose::Object); use Carp; use List::MoreUtils qw(any none); -use Readonly; use SL::DBUtils; +use SL::PrefixedNumber; +use SL::DB; +use SL::DB::DeliveryOrder::TypeData; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(type id number save dbh dbh_provided business_id) ], ); -Readonly my @SUPPORTED_TYPES => qw(invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order purchase_order sales_quotation request_quotation); +my @SUPPORTED_TYPES = ( + qw(invoice invoice_for_advance_payment final_invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order purchase_order sales_quotation request_quotation part service assembly assortment letter), + @{ SL::DB::DeliveryOrder::TypeData::valid_types() }, +); sub new { my $class = shift; @@ -23,7 +28,7 @@ sub new { croak "Invalid type " . $self->type if none { $_ eq $self->type } @SUPPORTED_TYPES; $self->dbh_provided($self->dbh); - $self->dbh($::form->get_standard_dbh) if !$self->dbh; + $self->dbh(SL::DB->client->dbh) if !$self->dbh; $self->save(1) unless defined $self->save; $self->business_id(undef) if $self->type ne 'customer'; @@ -36,7 +41,7 @@ sub _get_filters { my $type = $self->type; my %filters = ( where => '' ); - if (any { $_ eq $type } qw(invoice credit_note)) { + if (any { $_ eq $type } qw(invoice invoice_for_advance_payment final_invoice credit_note)) { $filters{trans_number} = "invnumber"; $filters{numberfield} = $type eq 'credit_note' ? "cnnumber" : "invnumber"; $filters{table} = "ar"; @@ -46,11 +51,12 @@ sub _get_filters { $filters{numberfield} = "${type}number"; $filters{table} = $type; - } elsif ($type =~ /_delivery_order$/) { - $filters{trans_number} = "donumber"; - $filters{numberfield} = $type eq 'sales_delivery_order' ? "sdonumber" : "pdonumber"; + } elsif ($type =~ /_delivery_order$/ && SL::DB::DeliveryOrder::TypeData::is_valid_type($type)) { + $filters{trans_number} = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'nr_key'), + $filters{numberfield} = SL::DB::DeliveryOrder::TypeData::get3($type, 'properties', 'transnumber'), $filters{table} = "delivery_orders"; - $filters{where} = $type =~ /^sales/ ? '(customer_id IS NOT NULL)' : '(vendor_id IS NOT NULL)'; + $filters{where} = "order_type = ?"; + $filters{values} = [ $::form->{type} ]; } elsif ($type =~ /_order$/) { $filters{trans_number} = "ordnumber"; @@ -59,12 +65,26 @@ sub _get_filters { $filters{where} = 'NOT COALESCE(quotation, FALSE)'; $filters{where} .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)'; - } else { + } elsif ($type =~ /_quotation$/) { $filters{trans_number} = "quonumber"; $filters{numberfield} = $type eq 'sales_quotation' ? "sqnumber" : "rfqnumber"; $filters{table} = "oe"; $filters{where} = 'COALESCE(quotation, FALSE)'; $filters{where} .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)'; + + } elsif ($type =~ /^(part|service|assembly|assortment)$/) { + $filters{trans_number} = "partnumber"; + my %numberfield_hash = ( service => 'servicenumber', + assembly => 'assemblynumber', + assortment => 'assortmentnumber', + part => 'articlenumber' + ); + $filters{numberfield} = $numberfield_hash{$type}; + $filters{table} = "parts"; + } elsif ($type =~ /letter/) { + $filters{trans_number} = "letternumber"; + $filters{numberfield} = "letternumber"; + $filters{table} = "letter"; } return %filters; @@ -81,13 +101,14 @@ sub is_unique { my @values = ($self->number); push @where, $filters{where} if $filters{where}; + push @values, @{ $filters{values} } if $filters{values}; if ($self->id) { push @where, qq|id <> ?|; push @values, conv_i($self->id); } - my $where_str = @where ? join(' AND ', map { "($_)" } @where) : ''; + my $where_str = @where ? ' AND ' . join(' AND ', map { "($_)" } @where) : ''; my $query = <_get_filters(); + my $number; - $self->dbh->begin_work; - do_query($form, $self->dbh, qq|LOCK TABLE defaults|); - do_query($form, $self->dbh, qq|LOCK TABLE business|) if $self->business_id; - - my $where = $filters{where} ? ' WHERE ' . $filters{where} : ''; - my $query = <client->with_transaction(sub { + my $where = $filters{where} ? ' WHERE ' . $filters{where} : ''; + my $query = <dbh, $query, $filters{trans_number}, 'in_use'); + do_query($form, $self->dbh, "LOCK TABLE " . $filters{table}) || die $self->dbh->errstr; + my %numbers_in_use = selectall_as_map($form, $self->dbh, $query, $filters{trans_number}, 'in_use', @{ $filters{values} // [] }); - my $number; - ($number) = selectfirst_array_query($form, $self->dbh, qq|SELECT customernumberinit FROM business WHERE id = ?|, $self->business_id) if $self->business_id; - ($number) = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults|) if !$number; - $number ||= ''; - - do { - if ($number =~ m/\d+$/) { - my $new_number = substr($number, $-[0]) * 1 + 1; - my $len_diff = length($number) - $-[0] - length($new_number); - $number = substr($number, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_number; - - } else { - $number = $number . '1'; + my $business_number; + ($business_number) = selectfirst_array_query($form, $self->dbh, qq|SELECT customernumberinit FROM business WHERE id = ? FOR UPDATE|, $self->business_id) if $self->business_id; + $number = $business_number; + ($number) = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults FOR UPDATE|) if !$number; + if ($filters{numberfield} eq 'assemblynumber' and length($number) < 1) { + $filters{numberfield} = 'articlenumber'; + ($number) = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults FOR UPDATE|) if !$number; } - } while ($numbers_in_use{$number}); - - if ($self->save) { - if ($self->business_id) { - do_query($form, $self->dbh, qq|UPDATE business SET customernumberinit = ? WHERE id = ?|, $number, $self->business_id); - } else { - do_query($form, $self->dbh, qq|UPDATE defaults SET $filters{numberfield} = ?|, $number); + $number ||= ''; + my $sequence = SL::PrefixedNumber->new(number => $number); + + do { + $number = $sequence->get_next; + } while ($numbers_in_use{$number}); + + if ($self->save) { + if ($self->business_id && $business_number) { + do_query($form, $self->dbh, qq|UPDATE business SET customernumberinit = ? WHERE id = ?|, $number, $self->business_id); + } else { + do_query($form, $self->dbh, qq|UPDATE defaults SET $filters{numberfield} = ?|, $number); + } } - $self->dbh->commit if !$self->dbh_provided; - } + + 1; + }) or do { die SL::DB->client->error }; return $number; }