# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
# Utilities for parsing forms
# and supporting routines for linking account numbers
use strict;
-my $standard_dbh;
-
-END {
- disconnect_standard_dbh();
-}
-
-sub disconnect_standard_dbh {
- return unless $standard_dbh;
-
- $standard_dbh->rollback();
- undef $standard_dbh;
-}
-
sub read_version {
my ($self) = @_;
}
# Database routines used throughout
+# DB Handling got moved to SL::DB, these are only shims for compatibility
sub dbconnect {
- $main::lxdebug->enter_sub(2);
-
- my ($self, $myconfig) = @_;
-
- # connect to database
- my $dbh = SL::DBConnect->connect or $self->dberror;
-
- # set db options
- if ($myconfig->{dboptions}) {
- $dbh->do($myconfig->{dboptions}) || $self->dberror($myconfig->{dboptions});
- }
-
- $main::lxdebug->leave_sub(2);
-
- return $dbh;
-}
-
-sub dbconnect_noauto {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig) = @_;
-
- # connect to database
- my $dbh = SL::DBConnect->connect(SL::DBConnect->get_connect_args(AutoCommit => 0)) or $self->dberror;
-
- # set db options
- if ($myconfig->{dboptions}) {
- $dbh->do($myconfig->{dboptions}) || $self->dberror($myconfig->{dboptions});
- }
-
- $main::lxdebug->leave_sub();
-
- return $dbh;
+ SL::DB->client->dbh;
}
sub get_standard_dbh {
- $main::lxdebug->enter_sub(2);
+ my $dbh = SL::DB->client->dbh;
- my $self = shift;
- my $myconfig = shift || \%::myconfig;
-
- if ($standard_dbh && !$standard_dbh->{Active}) {
- $main::lxdebug->message(LXDebug->INFO(), "get_standard_dbh: \$standard_dbh is defined but not Active anymore");
- undef $standard_dbh;
+ if ($dbh && !$dbh->{Active}) {
+ $main::lxdebug->message(LXDebug->INFO(), "get_standard_dbh: \$dbh is defined but not Active anymore");
+ SL::DB->client->dbh(undef);
}
- $standard_dbh ||= $self->dbconnect_noauto($myconfig);
-
- $main::lxdebug->leave_sub(2);
-
- return $standard_dbh;
+ SL::DB->client->dbh;
}
-sub set_standard_dbh {
- my ($self, $dbh) = @_;
- my $old_dbh = $standard_dbh;
- $standard_dbh = $dbh;
-
- return $old_dbh;
+sub disconnect_standard_dbh {
+ SL::DB->client->dbh->rollback;
}
+# /database
+
sub date_closed {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $currency, $transdate, $rate, $fld) = @_;
- my $dbh = $self->dbconnect($myconfig);
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my ($buy, $sell);
+ my ($buy, $sell);
- $buy = $rate if $fld eq 'buy';
- $sell = $rate if $fld eq 'sell';
+ $buy = $rate if $fld eq 'buy';
+ $sell = $rate if $fld eq 'sell';
- $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
-
-
- $dbh->disconnect;
+ $self->update_exchangerate($dbh, $currency, $transdate, $buy, $sell);
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
}
}
sub set_payment_options {
- my ($self, $myconfig, $transdate) = @_;
+ my ($self, $myconfig, $transdate, $type) = @_;
my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id})->load : undef;
return if !$terms;
+ my $is_invoice = $type =~ m{invoice}i;
+
$transdate ||= $self->{invdate} || $self->{transdate};
my $due_date = $self->{duedate} || $self->{reqdate};
$self->{$_} = $terms->$_ for qw(terms_netto terms_skonto percent_skonto);
- $self->{payment_terms} = $terms->description_long;
$self->{payment_description} = $terms->description;
$self->{netto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'net')->to_kivitendo;
$self->{skonto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'discount')->to_kivitendo;
}
if ($self->{"language_id"}) {
- my $dbh = $self->get_standard_dbh($myconfig);
- my $query =
- qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
- qq|FROM generic_translations t | .
- qq|LEFT JOIN language l ON t.language_id = l.id | .
- qq|WHERE (t.language_id = ?)
- AND (t.translation_id = ?)
- AND (t.translation_type = 'SL::DB::PaymentTerm/description_long')|;
- my ($description_long, $output_numberformat, $output_dateformat,
- $output_longdates) =
- selectrow_query($self, $dbh, $query,
- $self->{"language_id"}, $self->{"payment_id"});
-
- $self->{payment_terms} = $description_long if ($description_long);
-
- if ($output_dateformat) {
+ my $language = SL::DB::Language->new(id => $self->{language_id})->load;
+
+ $self->{payment_terms} = $type =~ m{invoice}i ? $terms->translated_attribute('description_long_invoice', $language->id) : undef;
+ $self->{payment_terms} ||= $terms->translated_attribute('description_long', $language->id);
+
+ if ($language->output_dateformat) {
foreach my $key (qw(netto_date skonto_date)) {
- $self->{$key} =
- $main::locale->reformat_date($myconfig, $self->{$key},
- $output_dateformat,
- $output_longdates);
+ $self->{$key} = $::locale->reformat_date($myconfig, $self->{$key}, $language->output_dateformat, $language->output_longdates);
}
}
- if ($output_numberformat &&
- ($output_numberformat ne $myconfig->{"numberformat"})) {
- my $saved_numberformat = $myconfig->{"numberformat"};
- $myconfig->{"numberformat"} = $output_numberformat;
- map { $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}) } keys %amounts;
- $myconfig->{"numberformat"} = $saved_numberformat;
+ if ($language->output_numberformat && ($language->output_numberformat ne $myconfig->{numberformat})) {
+ local $myconfig->{numberformat};
+ $myconfig->{"numberformat"} = $language->output_numberformat;
+ $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}) for keys %amounts;
}
}
+ $self->{payment_terms} = $self->{payment_terms} || ($is_invoice ? $terms->description_long_invoice : undef) || $terms->description_long;
+
$self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
$self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
$self->{payment_terms} =~ s/<%currency%>/$self->{currency}/g;
}
sub new_lastmtime {
- my ($self, $table, $option) = @_;
+ $main::lxdebug->enter_sub();
+
+ my ($self, $table, $provided_dbh) = @_;
+ my $dbh = $provided_dbh ? $provided_dbh : $self->get_standard_dbh;
return unless $self->{id};
croak ("wrong call, no valid table defined") unless $table =~ /^(oe|ar|ap|delivery_orders|parts)$/;
my $query = "SELECT mtime, itime FROM " . $table . " WHERE id = ?";
- my $ref = selectfirst_hashref_query($self, $self->get_standard_dbh, $query, $self->{id});
+ my $ref = selectfirst_hashref_query($self, $dbh, $query, $self->{id});
$ref->{mtime} ||= $ref->{itime};
$self->{lastmtime} = $ref->{mtime};
$main::lxdebug->message(LXDebug->DEBUG2(),"new lastmtime=".$self->{lastmtime});
+
+ $main::lxdebug->leave_sub();
}
sub mtime_ischanged {
d.closedto, d.revtrans,
(SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
(SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
- (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
+ (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
+ (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
+ (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno
FROM defaults d|;
$ref = selectfirst_hashref_query($self, $dbh, $query);
map { $self->{$_} = $ref->{$_} } keys %$ref;
current_date AS transdate, d.closedto, d.revtrans,
(SELECT cu.name FROM currencies cu WHERE cu.id=d.currency_id) AS defaultcurrency,
(SELECT c.accno FROM chart c WHERE d.fxgain_accno_id = c.id) AS fxgain_accno,
- (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno
+ (SELECT c.accno FROM chart c WHERE d.fxloss_accno_id = c.id) AS fxloss_accno,
+ (SELECT c.accno FROM chart c WHERE d.rndgain_accno_id = c.id) AS rndgain_accno,
+ (SELECT c.accno FROM chart c WHERE d.rndloss_accno_id = c.id) AS rndloss_accno
FROM defaults d|;
$ref = selectfirst_hashref_query($self, $dbh, $query);
map { $self->{$_} = $ref->{$_} } keys %$ref;
my ($i, $id);
- my $dbh = $self->dbconnect_noauto($myconfig);
+ SL::DB->client->with_transaction(sub {
+ my $dbh = SL::DB->client->dbh;
- my $query = qq|DELETE FROM status
- WHERE (formname = ?) AND (trans_id = ?)|;
- my $sth = prepare_query($self, $dbh, $query);
+ my $query = qq|DELETE FROM status
+ WHERE (formname = ?) AND (trans_id = ?)|;
+ my $sth = prepare_query($self, $dbh, $query);
- if ($self->{formname} =~ /(check|receipt)/) {
- for $i (1 .. $self->{rowcount}) {
- do_statement($self, $sth, $query, $self->{formname}, $self->{"id_$i"} * 1);
+ if ($self->{formname} =~ /(check|receipt)/) {
+ for $i (1 .. $self->{rowcount}) {
+ do_statement($self, $sth, $query, $self->{formname}, $self->{"id_$i"} * 1);
+ }
+ } else {
+ do_statement($self, $sth, $query, $self->{formname}, $self->{id});
}
- } else {
- do_statement($self, $sth, $query, $self->{formname}, $self->{id});
- }
- $sth->finish();
+ $sth->finish();
- my $printed = ($self->{printed} =~ /\Q$self->{formname}\E/) ? "1" : "0";
- my $emailed = ($self->{emailed} =~ /\Q$self->{formname}\E/) ? "1" : "0";
+ my $printed = ($self->{printed} =~ /\Q$self->{formname}\E/) ? "1" : "0";
+ my $emailed = ($self->{emailed} =~ /\Q$self->{formname}\E/) ? "1" : "0";
- my %queued = split / /, $self->{queued};
- my @values;
+ my %queued = split / /, $self->{queued};
+ my @values;
- if ($self->{formname} =~ /(check|receipt)/) {
+ if ($self->{formname} =~ /(check|receipt)/) {
- # this is a check or receipt, add one entry for each lineitem
- my ($accno) = split /--/, $self->{account};
- $query = qq|INSERT INTO status (trans_id, printed, spoolfile, formname, chart_id)
- VALUES (?, ?, ?, ?, (SELECT c.id FROM chart c WHERE c.accno = ?))|;
- @values = ($printed, $queued{$self->{formname}}, $self->{prinform}, $accno);
- $sth = prepare_query($self, $dbh, $query);
+ # this is a check or receipt, add one entry for each lineitem
+ my ($accno) = split /--/, $self->{account};
+ $query = qq|INSERT INTO status (trans_id, printed, spoolfile, formname, chart_id)
+ VALUES (?, ?, ?, ?, (SELECT c.id FROM chart c WHERE c.accno = ?))|;
+ @values = ($printed, $queued{$self->{formname}}, $self->{prinform}, $accno);
+ $sth = prepare_query($self, $dbh, $query);
- for $i (1 .. $self->{rowcount}) {
- if ($self->{"checked_$i"}) {
- do_statement($self, $sth, $query, $self->{"id_$i"}, @values);
+ for $i (1 .. $self->{rowcount}) {
+ if ($self->{"checked_$i"}) {
+ do_statement($self, $sth, $query, $self->{"id_$i"}, @values);
+ }
}
- }
- $sth->finish();
+ $sth->finish();
- } else {
- $query = qq|INSERT INTO status (trans_id, printed, emailed, spoolfile, formname)
- VALUES (?, ?, ?, ?, ?)|;
- do_query($self, $dbh, $query, $self->{id}, $printed, $emailed,
- $queued{$self->{formname}}, $self->{formname});
- }
-
- $dbh->commit;
- $dbh->disconnect;
+ } else {
+ $query = qq|INSERT INTO status (trans_id, printed, emailed, spoolfile, formname)
+ VALUES (?, ?, ?, ?, ?)|;
+ do_query($self, $dbh, $query, $self->{id}, $printed, $emailed,
+ $queued{$self->{formname}}, $self->{formname});
+ }
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
}
$main::lxdebug->enter_sub();
my $self = shift;
- my $dbh = shift || $self->get_standard_dbh;
+ my $dbh = shift || SL::DB->client->dbh;
+ SL::DB->client->with_transaction(sub {
- if(!exists $self->{employee_id}) {
- &get_employee($self, $dbh);
- }
-
- my $query =
- qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | .
- qq|VALUES (?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?)|;
- my @values = (conv_i($self->{id}), $self->{login},
- $self->{addition}, $self->{what_done}, "$self->{snumbers}");
- do_query($self, $dbh, $query, @values);
+ if(!exists $self->{employee_id}) {
+ &get_employee($self, $dbh);
+ }
- $dbh->commit;
+ my $query =
+ qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | .
+ qq|VALUES (?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?)|;
+ my @values = (conv_i($self->{id}), $self->{login},
+ $self->{addition}, $self->{what_done}, "$self->{snumbers}");
+ do_query($self, $dbh, $query, @values);
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
}
my @values;
if ($p->{searchitems} eq 'part') {
- $query .= qq|WHERE p.inventory_accno_id > 0|;
+ $query .= qq|WHERE p.part_type = 'part'|;
}
if ($p->{searchitems} eq 'service') {
- $query .= qq|WHERE p.inventory_accno_id IS NULL|;
+ $query .= qq|WHERE p.part_type = 'service'|;
}
if ($p->{searchitems} eq 'assembly') {
- $query .= qq|WHERE p.assembly = '1'|;
- }
- if ($p->{searchitems} eq 'labor') {
- $query .= qq|WHERE (p.inventory_accno_id > 0) AND (p.income_accno_id IS NULL)|;
+ $query .= qq|WHERE p.part_type = 'assembly'|;
}
$query .= qq|ORDER BY partsgroup|;
projects / kivitendo-erp.git / blobdiff