# 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.
#======================================================================
#
# Accounts Payables database backend routines
use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
+use SL::DB::Draft;
+use SL::Util qw(trim);
+use SL::DB;
use Data::Dumper;
use strict;
sub post_transaction {
+ my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form, $provided_dbh, $payments_only);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _post_transaction {
my ($self, $myconfig, $form, $provided_dbh, $payments_only) = @_;
- my $rc = 0; # return code auf false setzen
- # connect to database
- my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect_noauto($myconfig);
+ my $dbh = $provided_dbh || SL::DB->client->dbh;
my ($null, $taxrate, $amount);
my $exchangerate = 0;
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
$form->{taxincluded} = 0 unless $form->{taxincluded};
- ($null, $form->{department_id}) = split(/--/, $form->{department});
-
if ($form->{currency} eq $form->{defaultcurrency}) {
$form->{exchangerate} = 1;
} else {
$form->{exchangerate} = $exchangerate || $form->parse_amount($myconfig, $form->{exchangerate});
}
- for my $i (1 .. $form->{rowcount}) {
- $form->{AP_amounts}{"amount_$i"} =
- (split(/--/, $form->{"AP_amount_$i"}))[0];
- }
-
- ($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
- ($form->{AP_payables}) = split(/--/, $form->{APselected});
+ # get the charts selected
+ $form->{AP_amounts}{"amount_$_"} = $form->{"AP_amount_chart_id_$_"} for (1 .. $form->{rowcount});
# calculate the totals while calculating and reformatting the $amount_$i and $tax_$i
($form->{netamount},$form->{total_tax},$form->{invtotal}) = $form->calculate_arap('buy',$form->{taxincluded}, $form->{exchangerate});
$form->{id});
do_query($form, $dbh, $query, @values);
+ $form->new_lastmtime('ap');
+
# add individual transactions
for my $i (1 .. $form->{rowcount}) {
if ($form->{"amount_$i"} != 0) {
$query =
qq|INSERT INTO acc_trans | .
qq| (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link)| .
- qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
- qq| ?, ?, ?, ?, ?,| .
- qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
- @values = ($form->{id}, $form->{AP_amounts}{"amount_$i"},
+ qq|VALUES (?, ?, ?, ?, ?, ?, ?, (SELECT c.link FROM chart c WHERE c.id = ?))|;
+ @values = ($form->{id}, $form->{"AP_amount_chart_id_$i"},
$form->{"amount_$i"}, conv_date($form->{transdate}),
$project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
- $form->{AP_amounts}{"amount_$i"});
+ $form->{"AP_amount_chart_id_$i"});
do_query($form, $dbh, $query, @values);
if ($form->{"tax_$i"} != 0) {
# add payables
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey, tax_id, chart_link) | .
- qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, | .
- qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+ qq|VALUES (?, ?, ?, ?, | .
+ qq| (SELECT taxkey_id FROM chart WHERE id = ?),| .
qq| (SELECT tax_id| .
qq| FROM taxkeys| .
- qq| WHERE chart_id= (SELECT id | .
- qq| FROM chart| .
- qq| WHERE accno = ?)| .
+ qq| WHERE chart_id = ?| .
qq| AND startdate <= ?| .
qq| ORDER BY startdate DESC LIMIT 1),| .
- qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
- @values = ($form->{id}, $form->{AP_amounts}{payables}, $form->{payables},
- conv_date($form->{transdate}), $form->{AP_amounts}{payables}, $form->{AP_amounts}{payables}, conv_date($form->{transdate}),
- $form->{AP_amounts}{payables});
+ qq| (SELECT c.link FROM chart c WHERE c.id = ?))|;
+ @values = ($form->{id}, $form->{AP_chart_id}, $form->{payables},
+ conv_date($form->{transdate}), $form->{AP_chart_id}, $form->{AP_chart_id}, conv_date($form->{transdate}),
+ $form->{AP_chart_id});
do_query($form, $dbh, $query, @values);
}
if ($form->{payables}) {
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey, tax_id, chart_link) | .
- qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
- qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+ qq|VALUES (?, ?, ?, ?, ?, | .
+ qq| (SELECT taxkey_id FROM chart WHERE id = ?),| .
qq| (SELECT tax_id| .
qq| FROM taxkeys| .
- qq| WHERE chart_id= (SELECT id | .
- qq| FROM chart| .
- qq| WHERE accno = ?)| .
+ qq| WHERE chart_id = ?| .
qq| AND startdate <= ?| .
qq| ORDER BY startdate DESC LIMIT 1),| .
- qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
- @values = ($form->{id}, $form->{AP_payables}, $amount,
+ qq| (SELECT c.link FROM chart c WHERE c.id = ?))|;
+ @values = ($form->{id}, $form->{AP_chart_id}, $amount,
conv_date($form->{"datepaid_$i"}), $project_id,
- $form->{AP_payables}, $form->{AP_payables}, conv_date($form->{"datepaid_$i"}),
- $form->{AP_payables});
+ $form->{AP_chart_id}, $form->{AP_chart_id}, conv_date($form->{"datepaid_$i"}),
+ $form->{AP_chart_id});
do_query($form, $dbh, $query, @values);
}
$form->{payables} = $amount;
$form->{"exchangerate_$i"}), 2);
if ($amount != 0) {
+ # fetch fxgain and fxloss chart info from defaults if charts aren't already filled in form
+ if ( !$form->{fxgain_accno} && $::instance_conf->get_fxgain_accno_id ) {
+ $form->{fxgain_accno} = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxgain_accno_id)->accno;
+ };
+ if ( !$form->{fxloss_accno} && $::instance_conf->get_fxloss_accno_id ) {
+ $form->{fxloss_accno} = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_fxloss_accno_id)->accno;
+ };
+ die "fxloss_accno missing" if $amount < 0 and not $form->{fxloss_accno};
+ die "fxgain_accno missing" if $amount > 0 and not $form->{fxgain_accno};
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey, tax_id, chart_link) | .
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
if ($payments_only) {
$query = qq|UPDATE ap SET paid = ?, datepaid = ? WHERE id = ?|;
do_query($form, $dbh, $query, $form->{invpaid}, $form->{invpaid} ? conv_date($form->{datepaid}) : undef, conv_i($form->{id}));
+ $form->new_lastmtime('ap');
}
IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
+ if ($form->{draft_id}) {
+ SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]);
+ }
+
# safety check datev export
if ($::instance_conf->get_datev_check_on_ap_transaction) {
- my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
- $transdate ||= DateTime->today;
-
my $datev = SL::DATEV->new(
- exporttype => DATEV_ET_BUCHUNGEN,
- format => DATEV_FORMAT_KNE,
dbh => $dbh,
trans_id => $form->{id},
);
-
- $datev->export;
+ $datev->generate_datev_data;
if ($datev->errors) {
- $dbh->rollback;
die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
}
}
- if (!$provided_dbh) {
- $dbh->commit();
- $dbh->disconnect();
- }
-
- $rc = 1; # Den return-code auf true setzen, aber nur falls beim commit alles i.O. ist
-
- $main::lxdebug->leave_sub();
-
- return $rc;
+ return 1;
}
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
- # connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
-
- # acc_trans entries are deleted by database triggers.
- my $query = qq|DELETE FROM ap WHERE id = ?|;
- do_query($form, $dbh, $query, $form->{id});
-
- my $rc = $dbh->commit;
- $dbh->disconnect;
+ SL::DB->client->with_transaction(sub {
+ my $query = qq|DELETE FROM ap WHERE id = ?|;
+ do_query($form, SL::DB->client->dbh, $query, $form->{id});
+ 1;
+ }) or do { die SL::DB->client->error };
$main::lxdebug->leave_sub();
- return $rc;
+ return 1;
}
sub ap_transactions {
my $query =
qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | .
qq| a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
- qq| a.globalproject_id, a.storno, a.storno_id, | .
+ qq| a.globalproject_id, a.storno, a.storno_id, a.direct_debit, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| e.name AS employee, | .
qq| v.vendornumber, v.country, v.ustid, | .
my @values;
- if ($form->{vendor_id}) {
- $where .= " AND a.vendor_id = ?";
- push(@values, $form->{vendor_id});
- } elsif ($form->{vendor}) {
+ if ($form->{vendor}) {
$where .= " AND v.name ILIKE ?";
- push(@values, $form->like($form->{vendor}));
+ push(@values, like($form->{vendor}));
}
if ($form->{"cp_name"}) {
$where .= " AND (cp.cp_name ILIKE ? OR cp.cp_givenname ILIKE ?)";
- push(@values, ('%' . $form->{"cp_name"} . '%')x2);
+ push(@values, (like($form->{"cp_name"}))x2);
}
- if ($form->{department}) {
- # ähnlich wie commit 0bbfb33b6aa8e38bb6c81d1684ab7d08e5b5c5af abteilung
- # wird so nicht mehr als zeichenkette zusammengebaut
- # hätte zu ee9f9f9aa4c3b9d5d20ab10a45c12bcaa6aa78d0 auffallen können ;-) jan
- #my ($null, $department_id) = split /--/, $form->{department};
+ if ($form->{department_id}) {
$where .= " AND a.department_id = ?";
- push(@values, $form->{department});
+ push(@values, $form->{department_id});
}
if ($form->{invnumber}) {
$where .= " AND a.invnumber ILIKE ?";
- push(@values, $form->like($form->{invnumber}));
+ push(@values, like($form->{invnumber}));
}
if ($form->{ordnumber}) {
$where .= " AND a.ordnumber ILIKE ?";
- push(@values, $form->like($form->{ordnumber}));
+ push(@values, like($form->{ordnumber}));
}
if ($form->{notes}) {
$where .= " AND lower(a.notes) LIKE ?";
- push(@values, $form->like($form->{notes}));
+ push(@values, like($form->{notes}));
}
if ($form->{project_id}) {
$where .=
- qq|AND ((a.globalproject_id = ?) OR EXISTS | .
+ qq| AND ((a.globalproject_id = ?) OR EXISTS | .
qq| (SELECT * FROM invoice i | .
qq| WHERE i.project_id = ? AND i.trans_id = a.id) | .
qq| OR EXISTS | .
if ($form->{transdatefrom}) {
$where .= " AND a.transdate >= ?";
- push(@values, $form->{transdatefrom});
+ push(@values, trim($form->{transdatefrom}));
}
if ($form->{transdateto}) {
$where .= " AND a.transdate <= ?";
- push(@values, $form->{transdateto});
+ push(@values, trim($form->{transdateto}));
}
if ($form->{open} || $form->{closed}) {
unless ($form->{open} && $form->{closed}) {
}
}
+ if ($form->{parts_partnumber}) {
+ $where .= <<SQL;
+ AND EXISTS (
+ SELECT invoice.trans_id
+ FROM invoice
+ LEFT JOIN parts ON (invoice.parts_id = parts.id)
+ WHERE (invoice.trans_id = a.id)
+ AND (parts.partnumber ILIKE ?)
+ LIMIT 1
+ )
+SQL
+ push @values, like($form->{parts_partnumber});
+ }
+
+ if ($form->{parts_description}) {
+ $where .= <<SQL;
+ AND EXISTS (
+ SELECT invoice.trans_id
+ FROM invoice
+ WHERE (invoice.trans_id = a.id)
+ AND (invoice.description ILIKE ?)
+ LIMIT 1
+ )
+SQL
+ push @values, like($form->{parts_description});
+ }
+
if ($where) {
substr($where, 0, 4, " WHERE ");
$query .= $where;
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
my $sortorder = join(', ', map { "$_ $sortdir" } @a);
- if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description))) {
+ if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit))) {
$sortorder = $form->{sort} . " $sortdir";
}
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = SL::DB->client->dbh;
my $query =
"SELECT COALESCE(" .
" current_date)";
($form->{transdate}) = $dbh->selectrow_array($query);
- $dbh->disconnect;
-
$main::lxdebug->leave_sub();
}
}
sub post_payment {
+ my ($self, $myconfig, $form, $locale) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_post_payment, $self, $myconfig, $form, $locale);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _post_payment {
my ($self, $myconfig, $form, $locale) = @_;
- # connect to database, turn off autocommit
- my $dbh = $form->dbconnect_noauto($myconfig);
+ my $dbh = SL::DB->client->dbh;
my (%payments, $old_form, $row, $item, $query, %keep_vars);
# Get the AP accno.
$query =
- qq|SELECT c.accno
+ qq|SELECT c.id
FROM acc_trans at
LEFT JOIN chart c ON (at.chart_id = c.id)
WHERE (trans_id = ?)
ORDER BY at.acc_trans_id
LIMIT 1|;
- ($form->{APselected}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));
+ ($form->{AP_chart_id}) = selectfirst_array_query($form, $dbh, $query, conv_i($form->{id}));
# Post the new payments.
$self->post_transaction($myconfig, $form, $dbh, 1);
restore_form($old_form);
- my $rc = $dbh->commit();
- $dbh->disconnect();
-
- $main::lxdebug->leave_sub();
-
- return $rc;
+ return 1;
}
sub setup_form {
}
$index = $form->{acc_trans}{$key}->[$i - 1]->{index};
- $form->{"tax_$index"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1;
+ $form->{"tax_$index"} = $form->round_amount($form->{acc_trans}{$key}->[$i - 1]->{amount} * -1 / $exchangerate, 2);
$totaltax += $form->{"tax_$index"};
} else {
$form->{"projectnumber_$k"} = "$form->{acc_trans}{$key}->[$i-1]->{projectnumber}";
$form->{"oldprojectnumber_$k"} = $form->{"projectnumber_$k"};
$form->{"project_id_$k"} = "$form->{acc_trans}{$key}->[$i-1]->{project_id}";
- }
-
- $form->{"${key}_$k"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}";
-
- my $q_description = quotemeta($form->{acc_trans}{$key}->[$i-1]->{description});
- $form->{"select${key}"} =~
- m/<option value=\"
- ($form->{acc_trans}{$key}->[$i-1]->{accno}--[^\"]*)
- \">
- $form->{acc_trans}{$key}->[$i-1]->{accno}
- --
- ${q_description}
- <\/option>\n/x;
- $form->{"${key}_$k"} = $1;
-
- if ($akey eq "AP") {
- $form->{APselected} = $form->{acc_trans}{$key}->[$i-1]->{accno};
-
- } elsif ($akey eq 'amount') {
- $form->{"${key}_$k"} = $form->{acc_trans}{$key}->[$i-1]->{accno} . "--" . $form->{acc_trans}{$key}->[$i-1]->{id};
+ $form->{"${key}_chart_id_$k"} = $form->{acc_trans}{$key}->[$i-1]->{chart_id};
$form->{"taxchart_$k"} = $form->{acc_trans}{$key}->[$i-1]->{id} . "--" . $form->{acc_trans}{$key}->[$i-1]->{rate};
}
}
}
sub storno {
+ my ($self, $form, $myconfig, $id) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_storno, $self, $form, $myconfig, $id);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _storno {
my ($self, $form, $myconfig, $id) = @_;
my ($query, $new_id, $storno_row, $acc_trans_rows);
- my $dbh = $form->get_standard_dbh($myconfig);
+ my $dbh = SL::DB->client->dbh;
$query = qq|SELECT nextval('glid')|;
($new_id) = selectrow_query($form, $dbh, $query);
$query = qq|UPDATE ap SET paid = amount + paid, storno = 't' WHERE id = ?|;
do_query($form, $dbh, $query, $id);
+ $form->new_lastmtime('ap') if $id == $form->{id};
+
# now copy acc_trans entries
$query = qq|SELECT a.*, c.link FROM acc_trans a LEFT JOIN chart c ON a.chart_id = c.id WHERE a.trans_id = ? ORDER BY a.acc_trans_id|;
my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
map { IO->set_datepaid(table => 'ap', id => $_, dbh => $dbh) } ($id, $new_id);
- $dbh->commit;
-
- $main::lxdebug->leave_sub();
+ return 1;
}
1;
projects / kivitendo-erp.git / blobdiff