# 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::DBUtils;
use SL::IO;
use SL::MoreCommon;
+use SL::DB::ApGl;
use SL::DB::Default;
+use SL::DB::Draft;
+use SL::DB::Order;
+use SL::DB::PurchaseInvoice;
+use SL::Util qw(trim);
+use SL::DB;
use Data::Dumper;
-
+use List::Util qw(sum0);
use strict;
sub post_transaction {
+ my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
$main::lxdebug->enter_sub();
- 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 $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form, $provided_dbh, %params);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _post_transaction {
+ my ($self, $myconfig, $form, $provided_dbh, %params) = @_;
+
+ my $payments_only = $params{payments_only};
+ 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});
$query = qq|UPDATE ap SET invnumber = ?,
transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
- amount = ?, duedate = ?, paid = ?, netamount = ?,
+ amount = ?, duedate = ?, deliverydate = ?, tax_point = ?, paid = ?, netamount = ?,
currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
- globalproject_id = ?, direct_debit = ?
+ globalproject_id = ?, direct_debit = ?, payment_id = ?, transaction_description = ?
WHERE id = ?|;
@values = ($form->{invnumber}, conv_date($form->{transdate}),
$form->{ordnumber}, conv_i($form->{vendor_id}),
$form->{taxincluded} ? 't' : 'f', $form->{invtotal},
- conv_date($form->{duedate}), $form->{invpaid},
- $form->{netamount},
+ conv_date($form->{duedate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}),
+ $form->{invpaid}, $form->{netamount},
$form->{currency}, $form->{notes},
conv_i($form->{department_id}), $form->{storno},
$form->{storno_id}, conv_i($form->{globalproject_id}),
$form->{direct_debit} ? 't' : 'f',
+ conv_i($form->{payment_id}), $form->{transaction_description},
$form->{id});
do_query($form, $dbh, $query, @values);
+ $form->new_lastmtime('ap');
+
+ # Link this record to the record it was created from.
+ my $convert_from_oe_id = delete $form->{convert_from_oe_id};
+ if (!$form->{postasnew} && $convert_from_oe_id) {
+ RecordLinks->create_links('dbh' => $dbh,
+ 'mode' => 'ids',
+ 'from_table' => 'oe',
+ 'from_ids' => $convert_from_oe_id,
+ 'to_table' => 'ap',
+ 'to_id' => $form->{id},
+ );
+
+ # Close the record it was created from if the amount of
+ # all APs create from this record equals the records amount.
+ my @links = RecordLinks->get_links('dbh' => $dbh,
+ 'from_table' => 'oe',
+ 'from_id' => $convert_from_oe_id,
+ 'to_table' => 'ap',
+ );
+
+ my $amount_sum = sum0 map { SL::DB::PurchaseInvoice->new(id => $_->{to_id})->load->amount } @links;
+ my $order = SL::DB::Order->new(id => $convert_from_oe_id)->load;
+
+ $order->update_attributes(closed => 1) if ($amount_sum - $order->amount) == 0;
+ }
+
# 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);
}
$form->{payables} = $form->{invpaid};
}
+ my %already_cleared = %{ $params{already_cleared} // {} };
+
# add paid transactions
for my $i (1 .. $form->{paidaccounts}) {
$amount =
$form->round_amount($form->{"paid_$i"} * $form->{exchangerate} * -1,
2);
+
+ my $new_cleared = !$form->{"acc_trans_id_$i"} ? 'f'
+ : !$already_cleared{$form->{"acc_trans_id_$i"}} ? 'f'
+ : $already_cleared{$form->{"acc_trans_id_$i"}}->{amount} != $amount * -1 ? 'f'
+ : $already_cleared{$form->{"acc_trans_id_$i"}}->{accno} != $form->{"AP_paid_account_$i"} ? 'f'
+ : $already_cleared{$form->{"acc_trans_id_$i"}}->{cleared} ? 't'
+ : 'f';
+
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|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, cleared, taxkey, tax_id, chart_link) | .
+ 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,
- conv_date($form->{"datepaid_$i"}), $project_id,
- $form->{AP_payables}, $form->{AP_payables}, conv_date($form->{"datepaid_$i"}),
- $form->{AP_payables});
+ 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, $new_cleared,
+ $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;
# add payment
my $gldate = (conv_date($form->{"gldate_$i"}))? conv_date($form->{"gldate_$i"}) : conv_date($form->current_date($myconfig));
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, taxkey, tax_id, chart_link) | .
- qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, | .
+ qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, gldate, source, memo, project_id, cleared, taxkey, tax_id, chart_link) | .
+ qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, ?, ?, | .
qq| (SELECT taxkey_id FROM chart WHERE accno = ?), | .
qq| (SELECT tax_id| .
qq| FROM taxkeys| .
qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
@values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
conv_date($form->{"datepaid_$i"}), $gldate, $form->{"source_$i"},
- $form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"},
+ $form->{"memo_$i"}, $project_id, $new_cleared, $form->{"AP_paid_account_$i"},
$form->{"AP_paid_account_$i"}, conv_date($form->{"datepaid_$i"}),
$form->{"AP_paid_account_$i"});
do_query($form, $dbh, $query, @values);
$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}) ]);
+ }
+
+ # hook for taxkey 94
+ $self->_reverse_charge($myconfig, $form);
# 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
+ return 1;
+}
- $main::lxdebug->leave_sub();
+sub _reverse_charge {
+ my ($self, $myconfig, $form) = @_;
- return $rc;
+ # delete previous bookings, if they exists (repost)
+ my $ap_gl = SL::DB::Manager::ApGl->get_first(where => [ ap_id => $form->{id} ]);
+ my $gl_id = ref $ap_gl eq 'SL::DB::ApGl' ? $ap_gl->gl_id : undef;
+
+ SL::DB::Manager::GLTransaction->delete_all(where => [ id => $gl_id ]) if $gl_id;
+ SL::DB::Manager::ApGl-> delete_all(where => [ ap_id => $form->{id} ]) if $gl_id;
+ SL::DB::Manager::RecordLink-> delete_all(where => [ from_table => 'ap', to_table => 'gl', from_id => $form->{id} ]);
+
+ my ($i, $current_transaction);
+
+ for $i (1 .. $form->{rowcount}) {
+
+ my $tax = SL::DB::Manager::Tax->get_first( where => [id => $form->{"tax_id_$i"}, '!reverse_charge_chart_id' => undef ]);
+ next unless ref $tax eq 'SL::DB::Tax';
+
+ # gl booking
+ my ($credit, $debit);
+ $credit = SL::DB::Manager::Chart->find_by(id => $tax->chart_id);
+ $debit = SL::DB::Manager::Chart->find_by(id => $tax->reverse_charge_chart_id);
+
+ croak("No such Chart ID" . $tax->chart_id) unless ref $credit eq 'SL::DB::Chart';
+ croak("No such Chart ID" . $tax->reverse_chart_id) unless ref $debit eq 'SL::DB::Chart';
+
+ my ($tmpnetamount, $tmptaxamount) = $form->calculate_tax($form->{"amount_$i"}, $tax->rate, $form->{taxincluded}, 2);
+ $current_transaction = SL::DB::GLTransaction->new(
+ employee_id => $form->{employee_id},
+ transdate => $form->{transdate},
+ description => $form->{notes} || $form->{invnumber},
+ reference => $form->{invnumber},
+ department_id => $form->{department_id} ? $form->{department_id} : undef,
+ imported => 0, # not imported
+ taxincluded => 0,
+ )->add_chart_booking(
+ chart => $tmptaxamount > 0 ? $debit : $credit,
+ debit => abs($tmptaxamount),
+ source => "Reverse Charge for " . $form->{invnumber},
+ tax_id => 0,
+ )->add_chart_booking(
+ chart => $tmptaxamount > 0 ? $credit : $debit,
+ credit => abs($tmptaxamount),
+ source => "Reverse Charge for " . $form->{invnumber},
+ tax_id => 0,
+ )->post;
+ # add a stable link from ap to gl
+ my %props_gl = (
+ ap_id => $form->{id},
+ gl_id => $current_transaction->id,
+ );
+ SL::DB::ApGl->new(%props_gl)->save;
+ # Record a record link from ap to gl
+ my %props_rl = (
+ from_table => 'ap',
+ from_id => $form->{id},
+ to_table => 'gl',
+ to_id => $current_transaction->id,
+ );
+ SL::DB::RecordLink->new(%props_rl)->save;
+ }
}
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
- # connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
+ SL::DB->client->with_transaction(sub {
- # acc_trans entries are deleted by database triggers.
- my $query = qq|DELETE FROM ap WHERE id = ?|;
- do_query($form, $dbh, $query, $form->{id});
+ # if tax 94 reverse charge, clear all GL bookings and links
+ my $ap_gl = SL::DB::Manager::ApGl->get_first(where => [ ap_id => $form->{id} ]);
+ my $gl_id = ref $ap_gl eq 'SL::DB::ApGl' ? $ap_gl->gl_id : undef;
- my $rc = $dbh->commit;
- $dbh->disconnect;
+ SL::DB::Manager::GLTransaction->delete_all(where => [ id => $gl_id ]) if $gl_id;
+ SL::DB::Manager::ApGl-> delete_all(where => [ ap_id => $form->{id} ]) if $gl_id;
+ SL::DB::Manager::RecordLink-> delete_all(where => [ from_table => 'ap', to_table => 'gl', from_id => $form->{id} ]);
+ # done gl delete for tax 94 case
+
+ # begin ap delete
+ 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 {
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, a.direct_debit, | .
+ qq| a.transaction_description, a.itime::DATE AS insertdate, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| e.name AS employee, | .
qq| v.vendornumber, v.country, v.ustid, | .
qq| tz.description AS taxzone, | .
qq| pt.description AS payment_terms, | .
+ qq| department.description AS department, | .
qq{ ( SELECT ch.accno || ' -- ' || ch.description
FROM acc_trans at
LEFT JOIN chart ch ON ch.id = at.chart_id
WHERE ch.link ~ 'AP[[:>:]]'
AND at.trans_id = a.id
LIMIT 1
- ) AS charts } .
+ ) AS charts, } .
+ qq{ ( SELECT ch.accno || ' -- ' || ch.description
+ FROM acc_trans at
+ LEFT JOIN chart ch ON ch.id = at.chart_id
+ WHERE ch.link ~ 'AP_amount'
+ AND at.trans_id = a.id
+ LIMIT 1
+ ) AS debit_chart } .
qq|FROM ap a | .
qq|JOIN vendor v ON (a.vendor_id = v.id) | .
qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) | .
qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
- qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)|;
+ qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| .
+ qq|LEFT JOIN department ON (department.id = a.department_id)|;
my $where = '';
- unless ( $::auth->assert('show_ap_transactions', 1) ) {
- $where .= " AND NOT invoice = 'f' "; # remove ap transactions from Sales -> Reports -> Invoices
- };
-
my @values;
- if ($form->{vendor_id}) {
- $where .= " AND a.vendor_id = ?";
- push(@values, $form->{vendor_id});
- } elsif ($form->{vendor}) {
+ # Permissions:
+ # - Always return invoices & AP transactions for projects the employee has "view invoices" permissions for, no matter what the other rules say.
+ # - Exclude AP transactions if no permissions for them exist.
+ # - Limit to own invoices unless may edit all invoices or view invoices is allowed.
+ # - If may edit all or view invoices is allowed, allow filtering by employee.
+ my (@permission_where, @permission_values);
+
+ if ($::auth->assert('vendor_invoice_edit', 1) || $::auth->assert('purchase_invoice_view', 1)) {
+ if (!$::auth->assert('show_ap_transactions', 1)) {
+ push @permission_where, "NOT invoice = 'f'"; # remove ap transactions from Purchase -> Reports -> Invoices
+ }
+
+ if (!$::auth->assert('purchase_all_edit', 1) && !$::auth->assert('purchase_invoice_view', 1)) {
+ # only show own invoices
+ push @permission_where, "a.employee_id = ?";
+ push @permission_values, SL::DB::Manager::Employee->current->id;
+
+ } else {
+ if ($form->{employee_id}) {
+ push @permission_where, "a.employee_id = ?";
+ push @permission_values, conv_i($form->{employee_id});
+ }
+ }
+ }
+
+ if (@permission_where || (!$::auth->assert('vendor_invoice_edit', 1) && !$::auth->assert('purchase_invoice_view', 1))) {
+ my $permission_where_str = @permission_where ? "OR (" . join(" AND ", map { "($_)" } @permission_where) . ")" : "";
+ $where .= qq|
+ AND ( (a.globalproject_id IN (
+ SELECT epi.project_id
+ FROM employee_project_invoices epi
+ WHERE epi.employee_id = ?))
+ $permission_where_str)
+ |;
+ push @values, SL::DB::Manager::Employee->current->id, @permission_values;
+ }
+
+ 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->{taxzone_id}) {
+ $where .= " AND a.taxzone_id = ?";
+ push(@values, $form->{taxzone_id});
+ }
+ if ($form->{transaction_description}) {
+ $where .= " AND a.transaction_description ILIKE ?";
+ push(@values, like($form->{transaction_description}));
}
if ($form->{notes}) {
- $where .= " AND lower(a.notes) LIKE ?";
- push(@values, $form->like($form->{notes}));
+ $where .= " AND a.notes ILIKE ?";
+ 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->{duedatefrom}) {
+ $where .= " AND a.duedate >= ?";
+ push(@values, trim($form->{duedatefrom}));
+ }
+ if ($form->{duedateto}) {
+ $where .= " AND a.duedate <= ?";
+ push(@values, trim($form->{duedateto}));
}
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 ");
+ $where =~ s{\s*AND\s*}{ 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 direct_debit))) {
+ if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department taxzone))) {
$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);
$old_form = save_form();
+ $query = <<SQL;
+ SELECT at.acc_trans_id, at.amount, at.cleared, c.accno
+ FROM acc_trans at
+ LEFT JOIN chart c ON (at.chart_id = c.id)
+ WHERE (at.trans_id = ?)
+SQL
+
+ my %already_cleared = selectall_as_map($form, $dbh, $query, 'acc_trans_id', [ qw(amount cleared accno) ], $form->{id});
+
# Delete all entries in acc_trans from prior payments.
if (SL::DB::Default->get->payments_changeable != 0) {
$self->_delete_payments($form, $dbh);
# 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);
+ $self->post_transaction($myconfig, $form, $dbh, payments_only => 1, already_cleared => \%already_cleared);
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);
$storno_row->{netamount} *= -1;
$storno_row->{paid} = $storno_row->{amount};
- delete @$storno_row{qw(itime mtime)};
+ delete @$storno_row{qw(itime mtime gldate)};
$query = sprintf 'INSERT INTO ap (%s) VALUES (%s)', join(', ', keys %$storno_row), join(', ', map '?', values %$storno_row);
do_query($form, $dbh, $query, (values %$storno_row));
$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);
}
for my $row (@$rowref) {
- delete @$row{qw(itime mtime link acc_trans_id)};
+ delete @$row{qw(itime mtime link acc_trans_id gldate)};
$query = sprintf 'INSERT INTO acc_trans (%s) VALUES (%s)', join(', ', keys %$row), join(', ', map '?', values %$row);
$row->{trans_id} = $new_id;
$row->{amount} *= -1;
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