DeliveryOrder - Doku und Typos

[kivitendo-erp.git] / SL / TransNumber.pm

diff --git a/SL/TransNumber.pm b/SL/TransNumber.pm
index 9d6d299..1e62cfb 100644 (file)
--- a/SL/TransNumber.pm
+++ b/SL/TransNumber.pm
@@ -14,7 +14,7 @@ use Rose::Object::MakeMethods::Generic
  scalar => [ qw(type id number save dbh dbh_provided business_id) ],
 );
 
-my @SUPPORTED_TYPES = qw(invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order purchase_order sales_quotation request_quotation part service assembly);
+my @SUPPORTED_TYPES = qw(invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order purchase_order sales_quotation request_quotation part service assembly letter);
 
 sub new {
   my $class = shift;
@@ -71,6 +71,10 @@ sub _get_filters {
     $filters{numberfield}   = $type eq 'service' ? 'servicenumber' : 'articlenumber';
     $filters{numberfield}   = $type eq 'assembly' ? 'assemblynumber' : $filters{numberfield};
     $filters{table}         = "parts";
+  } elsif ($type =~ /letter/) {
+    $filters{trans_number}  = "letternumber";
+    $filters{numberfield}   = "letternumber";
+    $filters{table}         = "letter";
   }
 
   return %filters;
@@ -113,8 +117,6 @@ sub create_unique {
   my %filters = $self->_get_filters();
 
   $self->dbh->begin_work if $self->dbh->{AutoCommit};
-  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 = <<SQL;
@@ -123,15 +125,16 @@ sub create_unique {
     $where
 SQL
 
+  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');
 
   my $business_number;
-  ($business_number) = selectfirst_array_query($form, $self->dbh, qq|SELECT customernumberinit FROM business WHERE id = ?|, $self->business_id) if $self->business_id;
+  ($business_number) = selectfirst_array_query($form, $self->dbh, qq|SELECT customernumberinit FROM business WHERE id = ? FOR UPDATE|, $self->business_id) if $self->business_id;
   my $number         = $business_number;
-  ($number)          = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults|)                               if !$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|)                               if !$number;
+    ($number)        = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults FOR UPDATE|)                               if !$number;
   }
   $number          ||= '';
   my $sequence       = SL::PrefixedNumber->new(number => $number);