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) | .
+ qq|VALUES (?, ?, (SELECT e.id FROM employee e WHERE e.login = ?),
+ (SELECT id FROM currencies WHERE name = ?) )|;
+ do_query($form, $dbh, $query, $form->{id}, $form->{invnumber}, $form->{login}, $form->{currency});
- $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 = ?,
+ transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
amount = ?, duedate = ?, paid = ?, netamount = ?,
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}),
+ @values = (conv_date($form->{transdate}),
$form->{ordnumber}, conv_i($form->{vendor_id}),
$form->{taxincluded} ? 't' : 'f', $form->{invtotal},
conv_date($form->{duedate}), $form->{invpaid},
$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| (SELECT tax_id| .
- qq| FROM taxkeys| .
- qq| WHERE chart_id= (SELECT id | .
- qq| FROM chart| .
- qq| WHERE accno = ?)| .
- qq| AND startdate <= ?| .
+ 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},
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 tax_id| .
- qq| FROM taxkeys| .
- qq| WHERE chart_id= (SELECT id | .
- qq| FROM chart| .
- qq| WHERE accno = ?)| .
- qq| AND startdate <= ?| .
+ 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,
$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| (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| 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"},
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 tax_id| .
- qq| FROM taxkeys| .
- qq| WHERE chart_id= (SELECT id | .
- qq| FROM chart| .
- qq| WHERE accno = ?)| .
- qq| AND startdate <= ?| .
+ 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,
$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', ?, | .
- 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| (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},
+ @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},
dbh => $dbh,
from => $transdate,
to => $transdate,
+ trans_id => $form->{id},
);
$datev->export;
qq|LEFT JOIN payment_terms pt ON (pt.id = v.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}) {
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) {
}
1;
-