use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
+use SL::TransNumber;
use strict;
($form->{id}) = selectrow_query($form, $dbh, $query);
$query = qq|INSERT INTO ar (id, invnumber, employee_id, currency_id) VALUES (?, 'dummy', ?, (SELECT id FROM currencies WHERE name=?))|;
do_query($form, $dbh, $query, $form->{id}, $form->{employee_id}, $form->{currency});
- $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh) unless $form->{invnumber};
+ if (!$form->{invnumber}) {
+ my $trans_number = SL::TransNumber->new(type => 'invoice', dbh => $dbh, number => $form->{partnumber}, id => $form->{id});
+ $form->{invnumber} = $trans_number->create_unique;
+ }
}
}
1;
-
my $buysell = $form->{vc} eq 'customer' ? "buy" : "sell";
my $arap = $form->{arap} eq "ar" ? "ar" : "ap";
+ my $invnumber = $form->{invnumber};
+ $invnumber =~ s/^\s+//m;
+ $invnumber =~ s/\s+$//m;
- my $whereinvoice = $form->{invnumber} ? qq| AND a.invnumber = '| . $form->{invnumber} . qq|' | : undef;
+ my $whereinvoice = $invnumber ? qq| AND a.invnumber LIKE '| . $invnumber . qq|' | : undef;
my $query =
qq|SELECT a.id, a.invnumber, a.transdate, a.amount, a.paid, cu.name AS curr | .
SL::DB::Manager::Part->type_filter($_[0]);
}
-my %specs = ( ar => { number_column => 'invnumber', fill_holes_in_range => 1 },
- sales_quotation => { number_column => 'quonumber', number_range_column => 'sqnumber', scoping => \&oe_scoping, },
- sales_order => { number_column => 'ordnumber', number_range_column => 'sonumber', scoping => \&oe_scoping, },
- request_quotation => { number_column => 'quonumber', number_range_column => 'rfqnumber', scoping => \&oe_scoping, },
- purchase_order => { number_column => 'ordnumber', number_range_column => 'ponumber', scoping => \&oe_scoping, },
- sales_delivery_order => { number_column => 'donumber', number_range_column => 'sdonumber', scoping => \&do_scoping, fill_holes_in_range => 1 },
- purchase_delivery_order => { number_column => 'donumber', number_range_column => 'pdonumber', scoping => \&do_scoping, fill_holes_in_range => 1 },
- customer => { number_column => 'customernumber', number_range_column => 'customernumber', },
- 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 => 'assemblynumber', scoping => \&parts_scoping },
+my %specs = ( ar => { number_column => 'invnumber', },
+ sales_quotation => { number_column => 'quonumber', number_range_column => 'sqnumber', scoping => \&oe_scoping, },
+ sales_order => { number_column => 'ordnumber', number_range_column => 'sonumber', scoping => \&oe_scoping, },
+ request_quotation => { number_column => 'quonumber', number_range_column => 'rfqnumber', scoping => \&oe_scoping, },
+ purchase_order => { number_column => 'ordnumber', number_range_column => 'ponumber', scoping => \&oe_scoping, },
+ sales_delivery_order => { number_column => 'donumber', number_range_column => 'sdonumber', scoping => \&do_scoping, },
+ purchase_delivery_order => { number_column => 'donumber', number_range_column => 'pdonumber', scoping => \&do_scoping, },
+ customer => { number_column => 'customernumber', number_range_column => 'customernumber', },
+ 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 => 'assemblynumber', scoping => \&parts_scoping, },
);
sub get_next_trans_number {
my $number = $self->$number_column;
my $number_range_column = $spec->{number_range_column} || $number_column;
my $scoping_conditions = $spec->{scoping};
- my $fill_holes_in_range = $spec->{fill_holes_in_range};
+ my $fill_holes_in_range = !$spec->{keep_holes_in_range};
return $number if $self->id && $number;
Now the number itself is increased as often as neccessary to create a
unique one by comparing the generated numbers with the existing ones
retrieved in the first step. In this step gaps in the assigned numbers
-are filled for some tables (e.g. invoices) but not for others
-(e.g. sales orders).
+are filled for all currently supported tables.
After creating the unique record number this function can update
C<$self> and the C<defaults> table if requested. This is controlled
use SL::Template;
use SL::DB::Printer;
use SL::DB::Language;
+use SL::TransNumber;
use strict;
my ($ar_id) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
my $curr = $form->get_default_currency($myconfig);
+ my $trans_number = SL::TransNumber->new(type => 'invoice', dbh => $dbh);
$query =
qq|INSERT INTO ar (id, invnumber, transdate, gldate, customer_id,
(SELECT id FROM employee WHERE login = ?)
)|;
@values = ($ar_id, # id
- $form->update_defaults($myconfig, 'invnumber', $dbh), # invnumber
+ $trans_number->create_unique, # invnumber
$dunning_id, # customer_id
$amount,
$amount,
use SL::DBUtils;
use SL::RecordLinks;
use SL::IC;
+use SL::TransNumber;
use strict;
my $ic_cvar_configs = CVar->get_configs(module => 'IC',
dbh => $dbh);
- $form->{donumber} = $form->update_defaults($myconfig, $form->{type} eq 'sales_delivery_order' ? 'sdonumber' : 'pdonumber', $dbh) unless $form->{donumber};
+ my $trans_number = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{donumber}, id => $form->{id});
+ $form->{donumber} ||= $trans_number->create_unique;
$form->{employee_id} = (split /--/, $form->{employee})[1] if !$form->{employee_id};
$form->get_employee($dbh) unless ($form->{employee_id});
return 0;
}
-sub update_defaults {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $fld, $provided_dbh) = @_;
-
- my $dbh;
- if ($provided_dbh) {
- $dbh = $provided_dbh;
- } else {
- $dbh = $self->dbconnect_noauto($myconfig);
- }
- my $query = qq|SELECT $fld FROM defaults FOR UPDATE|;
- my $sth = $dbh->prepare($query);
-
- $sth->execute || $self->dberror($query);
- my ($var) = $sth->fetchrow_array;
- $sth->finish;
-
- $var = 0 if !defined($var) || ($var eq '');
- $var = SL::PrefixedNumber->new(number => $var)->get_next;
- $query = qq|UPDATE defaults SET $fld = ?|;
- do_query($self, $dbh, $query, $var);
-
- if (!$provided_dbh) {
- $dbh->commit;
- $dbh->disconnect;
- }
-
- $main::lxdebug->leave_sub();
-
- return $var;
-}
-
-sub update_business {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $business_id, $provided_dbh) = @_;
-
- my $dbh;
- if ($provided_dbh) {
- $dbh = $provided_dbh;
- } else {
- $dbh = $self->dbconnect_noauto($myconfig);
- }
- my $query =
- qq|SELECT customernumberinit FROM business
- WHERE id = ? FOR UPDATE|;
- my ($var) = selectrow_query($self, $dbh, $query, $business_id);
-
- return undef unless $var;
-
- if ($var =~ m/\d+$/) {
- my $new_var = (substr $var, $-[0]) * 1 + 1;
- my $len_diff = length($var) - $-[0] - length($new_var);
- $var = substr($var, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_var;
-
- } else {
- $var = $var . '1';
- }
-
- $query = qq|UPDATE business
- SET customernumberinit = ?
- WHERE id = ?|;
- do_query($self, $dbh, $query, $var, $business_id);
-
- if (!$provided_dbh) {
- $dbh->commit;
- $dbh->disconnect;
- }
-
- $main::lxdebug->leave_sub();
-
- return $var;
-}
-
sub get_partsgroup {
$main::lxdebug->enter_sub();
=head1 SPECIAL FUNCTIONS
-=head2 C<update_business> PARAMS
-
-PARAMS (not named):
- \%config, - config hashref
- $business_id, - business id
- $dbh - optional database handle
-
-handles business (thats customer/vendor types) sequences.
-
-special behaviour for empty strings in customerinitnumber field:
-will in this case not increase the value, and return undef.
-
=head2 C<redirect_header> $url
Generates a HTTP redirection header for the new C<$url>. Constructs an
use SL::TransNumber;
use SL::DB::Default;
use SL::DB::Tax;
+use SL::TransNumber;
use Data::Dumper;
use strict;
do_query($form, $dbh, $query, $form->{"id"}, $form->{"id"}, $form->{currency});
if (!$form->{invnumber}) {
- $form->{invnumber} =
- $form->update_defaults($myconfig, $form->{type} eq "credit_note" ?
- "cnnumber" : "invnumber", $dbh);
+ my $trans_number = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{invnumber}, id => $form->{id});
+ $form->{invnumber} = $trans_number->create_unique;
}
}
}
use SL::DB::Tax;
use SL::DBUtils;
use SL::IC;
+use SL::TransNumber;
use strict;
my $ml = ($form->{type} eq 'sales_order') ? 1 : -1;
+ my $number_field = $form->{type} =~ m{order} ? 'ordnumber' : 'quonumber';
+ my $trans_number = SL::TransNumber->new(type => $form->{type}, dbh => $dbh, number => $form->{$number_field}, id => $form->{id});
+ $form->{$number_field} ||= $trans_number->create_unique;
+
if ($form->{id}) {
$query = qq|DELETE FROM custom_variables
WHERE (config_id IN (SELECT id FROM custom_variable_configs WHERE module = 'IC'))
# $locale->text('Quotation Number missing!')
# $locale->text('Quotation Date missing!')
- # assign number
$form->{what_done} = $form->{formname};
- if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
- $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
- if ($form->{media} ne 'email') {
-
- # get pricegroups for parts
- IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-
- # build up html code for prices_$i
- set_pricegroup($form->{rowcount});
-
- $form->{rowcount}--;
-
- call_sub($display_form);
- # saving the history
- if(!exists $form->{addition}) {
- $form->{snumbers} = "${inv}number" . "_" . $form->{"${inv}number"};
- $form->{addition} = "PRINTED";
- $form->save_history;
- }
- # /saving the history
- ::end_of_request();
- }
- }
&validate_items;
}
- # get new number in sequence if no number is given or if saveasnew was requested
- if (!$form->{$ordnumber} || $form->{saveasnew}) {
- $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld);
- }
+ # get new number in sequence if saveasnew was requested
+ delete $form->{$ordnumber} if $form->{saveasnew};
relink_accounts();
}
- # value of $ordnumber is ordnumber or quonumber
- $form->{$ordnumber} = $form->update_defaults(\%myconfig, $numberfld)
- unless $form->{$ordnumber};
-
relink_accounts();
OE->save(\%myconfig, \%$form);
projects / kivitendo-erp.git / commitdiff