X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTransNumber.pm;h=47cdcd0969d4b28b0d8b6cc5865a0ef0a897500a;hb=83542c806dc5c249bf640e344eaf3831cdf2f2ea;hp=0ba13a8ab4f3e2ce8908487729b998b8bb50cdde;hpb=e055700faea1906bea6c03184ba4516b57cac887;p=kivitendo-erp.git

diff --git a/SL/TransNumber.pm b/SL/TransNumber.pm
index 0ba13a8ab..47cdcd096 100644
--- a/SL/TransNumber.pm
+++ b/SL/TransNumber.pm
@@ -13,7 +13,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);
+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);
 
 sub new {
   my $class = shift;
@@ -58,12 +58,18 @@ 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/) {
+    $filters{trans_number}  = "partnumber";
+    $filters{numberfield}   = $type eq 'service' ? 'servicenumber' : 'articlenumber';
+    $filters{table}         = "parts";
+    $filters{where}         = 'COALESCE(inventory_accno_id, 0) ' . ($type eq 'service' ? '=' : '<>') . ' 0';
   }
 
   return %filters;
@@ -86,7 +92,7 @@ sub is_unique {
     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     = <<SQL;
     SELECT $filters{trans_number}
     FROM $filters{table}
@@ -105,7 +111,7 @@ sub create_unique {
   my $form    = $main::form;
   my %filters = $self->_get_filters();
 
-  $self->dbh->begin_work;
+  $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;