delete $form->{currency} unless $form->{defaultcurrency};
($null, $form->{department_id}) = split(/--/, $form->{department});
- $form->{department_id} *= 1;
if ($form->{currency} eq $form->{defaultcurrency}) {
$form->{exchangerate} = 1;
invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
amount = ?, duedate = ?, paid = ?, netamount = ?,
curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
- globalproject_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);
# 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);
}
IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
# safety check datev export
- if ($::lx_office_conf{datev_check}{check_on_ap_transaction}) {
+ if ($::instance_conf->get_datev_check_on_ap_transaction) {
my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
$transdate ||= DateTime->today;
# 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});
- $query = qq|DELETE FROM acc_trans WHERE trans_id = ?|;
- do_query($form, $dbh, $query, $form->{id});
-
- # commit and redirect
my $rc = $dbh->commit;
$dbh->disconnect;