use List::MoreUtils qw(any none);
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) ],
);
-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);
+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;
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';
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";
$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";
$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/) {
+ } elsif ($type =~ /^(part|service|assembly|assortment)$/) {
$filters{trans_number} = "partnumber";
- $filters{numberfield} = $type eq 'service' ? 'servicenumber' : 'articlenumber';
- $filters{numberfield} = $type eq 'assembly' ? 'assemblynumber' : $filters{numberfield};
+ 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";
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 <> ?|;
my $form = $main::form;
my %filters = $self->_get_filters();
-
- $self->dbh->begin_work if $self->dbh->{AutoCommit};
-
- my $where = $filters{where} ? ' WHERE ' . $filters{where} : '';
- my $query = <<SQL;
- SELECT DISTINCT $filters{trans_number}, 1 AS in_use
- FROM $filters{table}
- $where
+ my $number;
+
+ SL::DB->client->with_transaction(sub {
+ my $where = $filters{where} ? ' WHERE ' . $filters{where} : '';
+ my $query = <<SQL;
+ SELECT DISTINCT $filters{trans_number}, 1 AS in_use
+ FROM $filters{table}
+ $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');
+ 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 $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;
- my $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;
- }
- $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);
+ 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;
}
- $self->dbh->commit if !$self->dbh_provided;
- }
+ $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);
+ }
+ }
+
+ 1;
+ }) or do { die SL::DB->client->error };
return $number;
}
projects / kivitendo-erp.git / blobdiff