use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
+use SL::Util qw(trim);
use Data::Dumper;
use strict;
my $exchangerate = 0;
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
- delete $form->{currency} unless $form->{defaultcurrency};
+ $form->{taxincluded} = 0 unless $form->{taxincluded};
($null, $form->{department_id}) = split(/--/, $form->{department});
$form->{AP_amounts}{"amount_$i"} =
(split(/--/, $form->{"AP_amount_$i"}))[0];
}
+
($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
($form->{AP_payables}) = split(/--/, $form->{APselected});
- # reverse and parse amounts
- for my $i (1 .. $form->{rowcount}) {
- $form->{"amount_$i"} =
- $form->round_amount(
- $form->parse_amount($myconfig, $form->{"amount_$i"}) *
- $form->{exchangerate} * -1,
- 2);
- $amount += ($form->{"amount_$i"} * -1);
-
- # parse tax_$i for later
- $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"}) * -1;
- }
-
- # this is for ap
- $form->{amount} = $amount;
-
- # taxincluded doesn't make sense if there is no amount
- $form->{taxincluded} = 0 if ($form->{amount} == 0);
-
- for my $i (1 .. $form->{rowcount}) {
- ($form->{"tax_id_$i"}, undef) = split /--/, $form->{"taxchart_$i"};
-
- my $query =
- qq|SELECT c.accno, t.taxkey, t.rate | .
- qq|FROM tax t LEFT JOIN chart c on (c.id=t.chart_id) | .
- qq|WHERE t.id = ? | .
- qq|ORDER BY c.accno|;
- my $sth = $dbh->prepare($query);
- $sth->execute($form->{"tax_id_$i"}) || $form->dberror($query . " (" . $form->{"tax_id_$i"} . ")");
- ($form->{AP_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) = $sth->fetchrow_array();
-
- $sth->finish;
-
- my ($tax, $diff);
- if ($form->{taxincluded} *= 1) {
- $tax = $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
- $amount = $form->{"amount_$i"} - $tax;
- $form->{"amount_$i"} = $form->round_amount($amount, 2);
- $diff += $amount - $form->{"amount_$i"};
- $form->{"tax_$i"} = $form->round_amount($tax, 2);
- $form->{netamount} += $form->{"amount_$i"};
- } else {
- $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
- $form->{netamount} += $form->{"amount_$i"};
- }
- $form->{total_tax} += $form->{"tax_$i"} * -1;
- }
+ # 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});
# adjust paidaccounts if there is no date in the last row
$form->{paidaccounts}-- unless ($form->{"datepaid_$form->{paidaccounts}"});
$form->{invpaid} = 0;
- $form->{netamount} *= -1;
# add payments
for my $i (1 .. $form->{paidaccounts}) {
$form->{invpaid} =
$form->round_amount($form->{invpaid} * $form->{exchangerate}, 2);
- # store invoice total, this goes into ap table
- $form->{invtotal} = $form->{netamount} + $form->{total_tax};
+ # # store invoice total, this goes into ap table
+ # $form->{invtotal} = $form->{netamount} + $form->{total_tax};
# amount for total AP
$form->{payables} = $form->{invtotal};
do_query($form, $dbh, $query, $form->{id});
} else {
- my $uid = rand() . time;
-
- $uid .= $form->{login};
- $uid = substr($uid, 2, 75);
+ ($form->{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('glid')|);
$query =
- qq|INSERT INTO ap (invnumber, employee_id) | .
- qq|VALUES (?, (SELECT e.id FROM employee e WHERE e.login = ?))|;
- do_query($form, $dbh, $query, $uid, $form->{login});
+ qq|INSERT INTO ap (id, invnumber, employee_id,currency_id, taxzone_id) | .
+ qq|VALUES (?, ?, (SELECT e.id FROM employee e WHERE e.login = ?),
+ (SELECT id FROM currencies WHERE name = ?), (SELECT taxzone_id FROM vendor WHERE id = ?) )|;
+ do_query($form, $dbh, $query, $form->{id}, $form->{invnumber}, $::myconfig{login}, $form->{currency}, $form->{vendor_id});
- $query = qq|SELECT a.id FROM ap a
- WHERE a.invnumber = ?|;
- ($form->{id}) = selectrow_query($form, $dbh, $query, $uid);
}
- $form->{invnumber} = $form->{id} unless $form->{invnumber};
-
- $query = qq|UPDATE ap SET
- invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
+ $query = qq|UPDATE ap SET invnumber = ?,
+ transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
amount = ?, duedate = ?, paid = ?, netamount = ?,
- curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
- globalproject_id = ?
+ currency_id = (SELECT id FROM currencies WHERE name = ?), notes = ?, department_id = ?, storno = ?, storno_id = ?,
+ globalproject_id = ?, direct_debit = ?
WHERE id = ?|;
@values = ($form->{invnumber}, conv_date($form->{transdate}),
$form->{ordnumber}, conv_i($form->{vendor_id}),
$form->{currency}, $form->{notes},
conv_i($form->{department_id}), $form->{storno},
$form->{storno_id}, conv_i($form->{globalproject_id}),
+ $form->{direct_debit} ? 't' : 'f',
$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) {
# insert detail records in acc_trans
$query =
qq|INSERT INTO acc_trans | .
- qq| (trans_id, chart_id, amount, transdate, project_id, taxkey)| .
+ 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| ?, ?, ?, ?, ?,| .
+ qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
@values = ($form->{id}, $form->{AP_amounts}{"amount_$i"},
$form->{"amount_$i"}, conv_date($form->{transdate}),
- $project_id, $form->{"taxkey_$i"});
+ $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
+ $form->{AP_amounts}{"amount_$i"});
do_query($form, $dbh, $query, @values);
if ($form->{"tax_$i"} != 0) {
# insert detail records in acc_trans
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, | .
- qq| project_id, taxkey) | .
+ qq| project_id, taxkey, tax_id, chart_link) | .
qq|VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), | .
- qq| ?, ?, ?, ?)|;
+ qq| ?, ?, ?, ?, ?,| .
+ qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
@values = ($form->{id}, $form->{AP_amounts}{"tax_$i"},
$form->{"tax_$i"}, conv_date($form->{transdate}),
- $project_id, $form->{"taxkey_$i"});
+ $project_id, $form->{"taxkey_$i"}, conv_i($form->{"tax_id_$i"}),
+ $form->{AP_amounts}{"tax_$i"});
do_query($form, $dbh, $query, @values);
}
# add payables
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, taxkey) | .
+ 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| (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+ qq| (SELECT tax_id| .
+ qq| FROM taxkeys| .
+ qq| WHERE chart_id= (SELECT id | .
+ qq| FROM chart| .
+ qq| WHERE accno = ?)| .
+ 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});
+ conv_date($form->{transdate}), $form->{AP_amounts}{payables}, $form->{AP_amounts}{payables}, conv_date($form->{transdate}),
+ $form->{AP_amounts}{payables});
do_query($form, $dbh, $query, @values);
}
2);
if ($form->{payables}) {
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
+ 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| (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+ qq| (SELECT tax_id| .
+ qq| FROM taxkeys| .
+ qq| WHERE chart_id= (SELECT id | .
+ qq| FROM chart| .
+ qq| WHERE accno = ?)| .
+ 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});
do_query($form, $dbh, $query, @values);
}
# 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) | .
+ 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| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+ qq| (SELECT taxkey_id FROM chart WHERE accno = ?), | .
+ qq| (SELECT tax_id| .
+ qq| FROM taxkeys| .
+ qq| WHERE chart_id= (SELECT id | .
+ qq| FROM chart| .
+ qq| WHERE accno = ?)| .
+ 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_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, $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);
# add exchange rate difference
($form->{"exchangerate_$i"} - 1), 2);
if ($amount != 0) {
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
+ 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', ?, | .
- qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+ qq| (SELECT taxkey_id FROM chart WHERE accno = ?), | .
+ qq| (SELECT tax_id| .
+ qq| FROM taxkeys| .
+ qq| WHERE chart_id= (SELECT id | .
+ qq| FROM chart| .
+ qq| WHERE accno = ?)| .
+ 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_paid_account_$i"}, $amount,
conv_date($form->{"datepaid_$i"}), $project_id,
+ $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);
}
if ($amount != 0) {
$query =
- qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
+ 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', ?, | .
- qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
- @values = ($form->{id}, ($amount > 0) ?
- $form->{fxgain_accno} : $form->{fxloss_accno},
+ qq| (SELECT taxkey_id FROM chart WHERE accno = ?),| .
+ qq| (SELECT tax_id| .
+ qq| FROM taxkeys| .
+ qq| WHERE chart_id= (SELECT id | .
+ qq| FROM chart| .
+ qq| WHERE accno = ?)| .
+ qq| AND startdate <= ?| .
+ qq| ORDER BY startdate DESC LIMIT 1),| .
+ qq| (SELECT c.link FROM chart c WHERE c.accno = ?))|;
+ @values = ($form->{id},
+ ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
$amount, conv_date($form->{"datepaid_$i"}), $project_id,
- ($amount > 0) ?
- $form->{fxgain_accno} : $form->{fxloss_accno});
+ ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno},
+ ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno}, conv_date($form->{"datepaid_$i"}),
+ ($amount > 0) ? $form->{fxgain_accno} : $form->{fxloss_accno});
do_query($form, $dbh, $query, @values);
}
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);
exporttype => DATEV_ET_BUCHUNGEN,
format => DATEV_FORMAT_KNE,
dbh => $dbh,
- from => $transdate,
- to => $transdate,
+ trans_id => $form->{id},
);
$datev->export;
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, | .
) AS charts } .
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 = v.taxzone_id)| .
- qq|LEFT JOIN payment_terms pt ON (pt.id = v.payment_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)|;
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}) {
push(@values, $form->{vendor_id});
} elsif ($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, (like($form->{"cp_name"}))x2);
}
if ($form->{department}) {
# ähnlich wie commit 0bbfb33b6aa8e38bb6c81d1684ab7d08e5b5c5af abteilung
}
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";
}
$form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate});
$form->{defaultcurrency} = $form->get_default_currency($myconfig);
- delete $form->{currency} unless $form->{defaultcurrency};
# Get the AP accno.
$query =
my ($self, $form, $for_post_payments) = @_;
my ($exchangerate, $i, $j, $k, $key, $akey, $ref, $index, $taxamount, $totalamount, $totaltax, $totalwithholding, $withholdingrate,
- $taxincluded, $tax, $diff);
+ $tax, $diff);
# forex
$form->{forex} = $form->{exchangerate};
}
}
- $form->{taxincluded} = $taxincluded if ($form->{id});
$form->{paidaccounts} = 1 if not defined $form->{paidaccounts};
if ($form->{taxincluded} && $form->{taxrate} && $totalamount) {
$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);
}
1;
-
projects / kivitendo-erp.git / blobdiff