$form->{paid} += $form->parse_amount($myconfig, $form->{"paid_$i"});
}
}
-
- $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+ if($form->{taxincluded}) {
+ $form->{subtotal} = $form->format_amount($myconfig, $form->{total} - $tax, 2);
+ }
+ else {
+ $form->{subtotal} = $form->format_amount($myconfig, $form->{total}, 2);
+ }
$yesdiscount = $form->{nodiscount_total} - $nodiscount;
$form->{nodiscount_subtotal} = $form->format_amount($myconfig, $form->{nodiscount_total}, 2);
$form->{discount_total} = $form->format_amount($myconfig, $form->{discount_total}, 2);
if ($form->{amount}{ $form->{id} }{ $form->{AR} } != 0) {
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
- transdate, project_id)
+ transdate, taxkey, project_id)
VALUES ($form->{id}, (SELECT c.id FROM chart c
- WHERE c.accno = '$form->{AR}'),
- $amount, '$form->{"datepaid_$i"}', ?)|;
- do_query($form, $dbh, $query, $project_id);
+ WHERE c.accno = ?),
+ $amount, '$form->{"datepaid_$i"}',
+ (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+ do_query($form, $dbh, $query, $form->{AR}, $form->{AR}, $project_id);
}
# record payment
$form->{"paid_$i"} *= -1;
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id)
+ source, memo, taxkey, project_id)
VALUES ($form->{id}, (SELECT c.id FROM chart c
- WHERE c.accno = '$accno'),
+ WHERE c.accno = ?),
$form->{"paid_$i"}, '$form->{"datepaid_$i"}',
- '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
- do_query($form, $dbh, $query, $project_id);
+ '$form->{"source_$i"}', '$form->{"memo_$i"}',
+ (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+ do_query($form, $dbh, $query, $accno, $accno, $project_id);
# exchangerate difference
$form->{fx}{$accno}{ $form->{"datepaid_$i"} } +=
) {
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
- transdate, cleared, fx_transaction, project_id)
+ transdate, cleared, fx_transaction, taxkey, project_id)
VALUES ($form->{id},
(SELECT c.id FROM chart c
- WHERE c.accno = '$accno'),
- $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
- do_query($form, $dbh, $query, $project_id);
+ WHERE c.accno = ?),
+ $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1',
+ (SELECT taxkey_id FROM chart WHERE accno = ?), ?)|;
+ do_query($form, $dbh, $query, $accno, $accno, $project_id);
}
}
}
delivery_customer_id = $form->{delivery_customer_id},
delivery_vendor_id = $form->{delivery_vendor_id},
employee_id = $form->{employee_id},
+ salesman_id = | . conv_i($form->{salesman_id}, 'NULL') . qq|,
storno = '$form->{storno}',
globalproject_id = | . conv_i($form->{"globalproject_id"}, 'NULL') . qq|,
cp_id = | . conv_i($form->{"cp_id"}, 'NULL') . qq|
}
sub post_payment {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form, $locale) = @_;
+ $main::lxdebug->enter_sub() and my ($self, $myconfig, $form, $locale) = @_;
# connect to database, turn off autocommit
my $dbh = $form->dbconnect_noauto($myconfig);
# total payments, don't move we need it here
for my $i (1 .. $form->{paidaccounts}) {
- if ($form->{type} eq "credit_note") {
- $form->{"paid_$i"} = $form->parse_amount($myconfig, $form->{"paid_$i"}) * -1;
- } else {
- $form->{"paid_$i"} = $form->parse_amount($myconfig, $form->{"paid_$i"});
- }
- $form->{paid} += $form->{"paid_$i"};
- $form->{datepaid} = $form->{"datepaid_$i"} if ($form->{"datepaid_$i"});
+ $form->{"paid_$i"} = $form->parse_amount($myconfig, $form->{"paid_$i"});
+ $form->{"paid_$i"} *= -1 if ($form->{type} eq "credit_note");
+ $form->{"paid"} += $form->{"paid_$i"};
+ $form->{"datepaid"} = $form->{"datepaid_$i"} if ($form->{"datepaid_$i"});
}
- $form->{exchangerate} =
- $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
- "buy");
-
- my $project_id = conv_i($form->{"globalproject_id"});
+ $form->{exchangerate} = $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate}, "buy");
# record payments and offsetting AR
for my $i (1 .. $form->{paidaccounts}) {
+ if ($form->{"paid_$i"}) {
- if ($form->{"paid_$i"} != 0) {
my ($accno) = split /--/, $form->{"AR_paid_$i"};
- $form->{"datepaid_$i"} = $form->{invdate}
- unless ($form->{"datepaid_$i"});
+ $form->{"datepaid_$i"} = $form->{invdate} unless ($form->{"datepaid_$i"});
$form->{datepaid} = $form->{"datepaid_$i"};
$exchangerate = 0;
if (($form->{currency} eq $form->{defaultcurrency}) || ($form->{defaultcurrency} eq "")) {
$form->{"exchangerate_$i"} = 1;
} else {
- $exchangerate =
- $form->check_exchangerate($myconfig, $form->{currency},
- $form->{"datepaid_$i"}, 'buy');
-
- $form->{"exchangerate_$i"} =
- ($exchangerate)
- ? $exchangerate
- : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
+ $exchangerate = $form->check_exchangerate($myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'buy');
+ $form->{"exchangerate_$i"} = ($exchangerate) ? $exchangerate : $form->parse_amount($myconfig, $form->{"exchangerate_$i"});
}
# record AR
- $amount =
- $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
- 2);
-
-
- $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
- WHERE c.accno = '$form->{AR}') AND amount=$amount AND transdate='$form->{"datepaid_$i"}'|;
- $dbh->do($query) || $form->dberror($query);
-
- $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
- transdate, project_id)
- VALUES ($form->{id}, (SELECT c.id FROM chart c
- WHERE c.accno = '$form->{AR}'),
- $amount, '$form->{"datepaid_$i"}', ?)|;
- do_query($form, $dbh, $query, $project_id);
+ $amount = $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"}, 2);
+ $query = qq|DELETE FROM acc_trans WHERE trans_id = ? AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) AND amount = ? AND transdate = ?|;
+ do_query($form, $dbh, $query, $form->{id}, $form->{AR}, $amount, $form->{"datepaid_$i"});
+ $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey)
+ VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+ do_query($form, $dbh, $query, $form->{id}, $form->{AR}, $amount, $form->{"datepaid_$i"}, conv_i($form->{"globalproject_id"}), $accno);
# record payment
$form->{"paid_$i"} *= -1;
- $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
- WHERE c.accno = '$accno') AND amount=$form->{"paid_$i"} AND transdate='$form->{"datepaid_$i"}' AND source='$form->{"source_$i"}' AND memo='$form->{"memo_$i"}'|;
- $dbh->do($query) || $form->dberror($query);
-
- $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id)
- VALUES ($form->{id}, (SELECT c.id FROM chart c
- WHERE c.accno = '$accno'),
- $form->{"paid_$i"}, '$form->{"datepaid_$i"}',
- '$form->{"source_$i"}', '$form->{"memo_$i"}', ?)|;
- do_query($form, $dbh, $query, $project_id);
-
+ $query = qq|DELETE FROM acc_trans WHERE trans_id = ? AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?) AND amount = ? AND transdate = ? AND source = ? AND memo = ?|;
+ do_query($form, $dbh, $query, $form->{id}, $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"}, $form->{"source_$i"}, $form->{"memo_$i"});
+ $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey)
+ VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+ do_query($form, $dbh, $query, $form->{id}, $accno, $form->{"paid_$i"}, $form->{"datepaid_$i"}, $form->{"source_$i"}, $form->{"memo_$i"},
+ conv_i($form->{"globalproject_id"}), $accno);
# gain/loss
- $amount =
- $form->{"paid_$i"} * $form->{exchangerate} - $form->{"paid_$i"} *
- $form->{"exchangerate_$i"};
- if ($amount > 0) {
- $form->{fx}{ $form->{fxgain_accno} }{ $form->{"datepaid_$i"} } +=
- $amount;
- } else {
- $form->{fx}{ $form->{fxloss_accno} }{ $form->{"datepaid_$i"} } +=
- $amount;
- }
+ $amount = $form->{"paid_$i"} * $form->{exchangerate} - $form->{"paid_$i"} * $form->{"exchangerate_$i"};
+ $form->{fx}{ $form->{($amount > 0 ? 'fxgain_accno' : 'fxloss_accno')} }{ $form->{"datepaid_$i"} } += $amount;
$diff = 0;
# update exchange rate
if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
- $form->update_exchangerate($dbh, $form->{currency},
- $form->{"datepaid_$i"},
- $form->{"exchangerate_$i"}, 0);
+ $form->update_exchangerate($dbh, $form->{currency}, $form->{"datepaid_$i"}, $form->{"exchangerate_$i"}, 0);
}
+
}
}
# record exchange rate differences and gains/losses
foreach my $accno (keys %{ $form->{fx} }) {
foreach my $transdate (keys %{ $form->{fx}{$accno} }) {
- if (
- ($form->{fx}{$accno}{$transdate} =
- $form->round_amount($form->{fx}{$accno}{$transdate}, 2)
- ) != 0
- ) {
- $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
- WHERE c.accno = '$accno') AND amount=$form->{fx}{$accno}{$transdate} AND transdate='$transdate' AND cleared='0' AND fx_transaction='1'|;
- $dbh->do($query) || $form->dberror($query);
- $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount,
- transdate, cleared, fx_transaction, project_id)
- VALUES ($form->{id},
- (SELECT c.id FROM chart c
- WHERE c.accno = '$accno'),
- $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1', ?)|;
- do_query($form, $dbh, $query, $project_id);
+
+ if ($form->{fx}{$accno}{$transdate} = $form->round_amount($form->{fx}{$accno}{$transdate}, 2)) { # '=' is no typo, it's an assignment
+ $query = qq|DELETE FROM acc_trans WHERE trans_id = ? AND chart_id = (SELECT c.id FROM chart c WHERE c.accno = ?)
+ AND amount = ? AND transdate = ? AND cleared = ? AND fx_transaction = ?|;
+ do_query($form, $dbh, $query, $form->{id}, $accno, $form->{fx}{$accno}{$transdate}, $transdate, 0, 1);
+ $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, cleared, fx_transaction, project_id, taxkey)
+ VALUES (?, (SELECT c.id FROM chart c WHERE c.accno = ?), ?, ?, ?, ?, ?, (SELECT taxkey_id FROM chart WHERE accno = ?))|;
+ do_query($form, $dbh, $query, $form->{id}, $accno, $form->{fx}{$accno}{$transdate}, $transdate, 0, 1, conv_i($form->{"globalproject_id"}), $accno);
}
+
}
}
- my $datepaid = ($form->{paid}) ? qq|'$form->{datepaid}'| : "NULL";
# save AR record
- my $query = qq|UPDATE ar set
- paid = $form->{paid},
- datepaid = $datepaid
- WHERE id=$form->{id}|;
+ delete $form->{datepaid} unless $form->{paid};
- $dbh->do($query) || $form->dberror($query);
+ my $query = qq|UPDATE ar set paid = ?, datepaid = ? WHERE id = ?|;
+ do_query($form, $dbh, $query, $form->{paid}, $form->{datepaid}, $form->{id});
my $rc = $dbh->commit;
$dbh->disconnect;
- $main::lxdebug->leave_sub();
-
- return $rc;
+ $main::lxdebug->leave_sub() and return $rc;
}
sub process_assembly {
a.transdate AS invdate, a.deliverydate, a.paid, a.storno, a.gldate,
a.shippingpoint, a.shipvia, a.terms, a.notes, a.intnotes, a.taxzone_id,
a.duedate, a.taxincluded, a.curr AS currency, a.shipto_id, a.cp_id,
- a.employee_id, e.name AS employee, a.payment_id, a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type
+ a.employee_id, e.name AS employee, a.salesman_id, a.payment_id, a.language_id, a.delivery_customer_id, a.delivery_vendor_id, a.type
FROM ar a
LEFT JOIN employee e ON (e.id = a.employee_id)
WHERE a.id = $form->{id}|;
my $query = qq|SELECT c.name AS customer, c.discount, c.creditlimit, c.terms,
c.email, c.cc, c.bcc, c.language_id, c.payment_id AS customer_payment_id,
c.street, c.zipcode, c.city, c.country,
- $duedate + c.terms AS duedate, c.notes AS intnotes,
- b.discount AS tradediscount, b.description AS business, c.klass as customer_klass, c.taxzone_id
+ $duedate + COALESCE(pt.terms_netto, 0) AS duedate, c.notes AS intnotes,
+ b.discount AS tradediscount, b.description AS business, c.klass as customer_klass, c.taxzone_id,
+ c.salesman_id
FROM customer c
LEFT JOIN business b ON (b.id = c.business_id)
- WHERE c.id = $form->{customer_id}|;
- my $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- $ref = $sth->fetchrow_hashref(NAME_lc);
-
+ LEFT JOIN payment_terms pt ON c.payment_id = pt.id
+ WHERE c.id = ?|;
+ $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id});
map { $form->{$_} = $ref->{$_} } keys %$ref;
- $sth->finish;
-
- my $query = qq|SELECT sum(a.amount-a.paid) AS dunning_amount FROM ar a WHERE a.paid < a.amount AND a.customer_id=$form->{customer_id} AND a.dunning_id IS NOT NULL|;
- my $sth = $dbh->prepare($query);
-
- $sth->execute || $form->dberror($query);
-
- $ref = $sth->fetchrow_hashref(NAME_lc);
+ my $query = qq|SELECT sum(a.amount - a.paid) AS dunning_amount FROM ar a
+ WHERE a.paid < a.amount AND a.customer_id = ? AND a.dunning_config_id IS NOT NULL|;
+ $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id});
map { $form->{$_} = $ref->{$_} } keys %$ref;
- $sth->finish;
-
- #print(STDERR "DUNNING AMOUTN $form->{dunning_amount}\n");
-
- my $query = qq|SELECT dnn.dunning_description AS max_dunning_level FROM dunning_config dnn WHERE id in (select dunning_id from ar WHERE paid < amount AND customer_id=$form->{customer_id} AND dunning_id IS NOT NULL) ORDER BY dunning_level DESC LIMIT 1|;
- my $sth = $dbh->prepare($query);
-
- $sth->execute || $form->dberror($query);
-
- $ref = $sth->fetchrow_hashref(NAME_lc);
+ my $query = qq|SELECT dnn.dunning_description AS max_dunning_level FROM dunning_config dnn
+ WHERE id in (SELECT dunning_config_id from ar WHERE paid < amount AND customer_id = ? AND dunning_id IS NOT NULL)
+ ORDER BY dunning_level DESC LIMIT 1|;
+ $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{customer_id});
map { $form->{$_} = $ref->{$_} } keys %$ref;
- $sth->finish;
- #print(STDERR "LEVEL $form->{max_dunning_level}\n");
-
#check whether payment_terms are better than old payment_terms
if (($form->{payment_id} ne "") && ($form->{customer_payment_id} ne "")) {
- my $query = qq|select (select ranking from payment_terms WHERE id = $form->{payment_id}), (select ranking from payment_terms WHERE id = $form->{customer_payment_id})|;
+ my $query = qq|SELECT (SELECT ranking from payment_terms WHERE id = $form->{payment_id}), (SELECT ranking FROM payment_terms WHERE id = $form->{customer_payment_id})|;
my $stw = $dbh->prepare($query);
$stw->execute || $form->dberror($query);
($old_ranking, $new_ranking) = $stw->fetchrow_array;
# setup last accounts used for this customer
if (!$form->{id} && $form->{type} !~ /_(order|quotation)/) {
- $query = qq|SELECT c.accno, c.description, c.link, c.category
+ $query = qq|SELECT c.id, c.accno, c.description, c.link, c.category
FROM chart c
JOIN acc_trans ac ON (ac.chart_id = c.id)
JOIN ar a ON (a.id = ac.trans_id)
if ($ref->{category} eq 'I') {
$i++;
$form->{"AR_amount_$i"} = "$ref->{accno}--$ref->{description}";
+
+ if ($form->{initial_transdate}) {
+ my $tax_query =
+ qq|SELECT tk.tax_id, t.rate FROM taxkeys tk | .
+ qq|LEFT JOIN tax t ON tk.tax_id = t.id | .
+ qq|WHERE tk.chart_id = ? AND startdate <= ? | .
+ qq|ORDER BY tk.startdate DESC LIMIT 1|;
+ my ($tax_id, $rate) =
+ selectrow_query($form, $dbh, $tax_query, $ref->{id},
+ $form->{initial_transdate});
+ $form->{"taxchart_$i"} = "${tax_id}--${rate}";
+ }
}
if ($ref->{category} eq 'A') {
$form->{ARselected} = $form->{AR_1} = $ref->{accno};
projects / kivitendo-erp.git / blobdiff