: $form->parse_amount($myconfig, $form->{exchangerate});
}
+ for $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});
+
# reverse and parse amounts
- for my $i (1 .. 1) {
+ 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
# taxincluded doesn't make sense if there is no amount
$form->{taxincluded} = 0 if ($form->{amount} == 0);
- $query =
- qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{taxkey}|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- ($form->{AP}{"tax"}, $form->{taxrate}) = $sth->fetchrow_array;
- $sth->finish;
-
- $formtax = $form->parse_amount($myconfig, $form->{"tax"});
+ for $i (1 .. $form->{rowcount}) {
+ ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
- $form->{"tax"} = $form->{amount} * $form->{taxrate};
- $form->{"tax"} =
- $form->round_amount($form->{"tax"} * $form->{exchangerate}, 2) * -1;
+ $query = qq|SELECT c.accno, t.taxkey, t.rate
+ FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
+ WHERE t.id=$form->{"tax_id_$i"}
+ ORDER BY c.accno|;
+ $sth = $dbh->prepare($query);
+ $sth->execute || $form->dberror($query);
+ ($form->{AP_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) =
+ $sth->fetchrow_array;
+ $form->{AP_amounts}{"tax_$i"}{taxkey} = $form->{"taxkey_$i"};
+ $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
- if ($form->{taxcheck}) {
- $form->{"tax"} = $formtax * -1;
+ $sth->finish;
+ if ($form->{taxincluded} *= 1) {
+ if (!$form->{"korrektur_$i"}) {
+ $tax =
+ $form->{"amount_$i"} -
+ ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
+ } else {
+ $tax = $form->{"tax_$i"};
+ }
+ $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 {
+ if (!$form->{"korrektur_$i"}) {
+ $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
+ } else {
+ $tax = $form->{"tax_$i"};
+ }
+ $form->{"tax_$i"} =
+ $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
+ $form->{netamount} += $form->{"amount_$i"};
+ }
+ $form->{total_tax} += $form->{"tax_$i"} * -1;
}
- $form->{total_tax} += ($form->{"tax"} * -1);
-
# 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);
- if ($form->{taxincluded} *= 1) {
- for $i (1 .. 1) {
- $tax =
- $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{taxrate} + 1));
- if ($form->{taxcheck}) {
- $tax = $formtax * -1;
- }
- $amount = $form->{"amount_$i"} - $tax;
- $form->{"amount_$i"} = $form->round_amount($amount, 2);
- $diff += $amount - $form->{"amount_$i"};
- $form->{tax} = $form->round_amount($tax, 2);
- $form->{total_tax} = $form->{tax} * -1;
- }
- print(STDERR "Steuer $form->{tax}\n");
- print(STDERR "TotalSteuer $form->{total_tax}\n");
-
- # deduct taxes from amount
- # $form->{amount} -= $form->{total_tax};
- # deduct difference from amount_1
- # $form->{amount_1} += $form->round_amount($diff, 2);
- $form->{amount} = $form->{amount_1} * -1;
- }
-
- $form->{netamount} = $form->{amount};
-
# store invoice total, this goes into ap table
- $form->{invtotal} = $form->{amount} + $form->{total_tax};
+ $form->{invtotal} = $form->{netamount} + $form->{total_tax};
# amount for total AP
$form->{payables} = $form->{invtotal};
}
# add individual transactions
- foreach my $item (keys %{ $form->{AP} }) {
- if ($form->{$item} != 0) {
+ for $i (1 .. $form->{rowcount}) {
+ if ($form->{"amount_$i"} != 0) {
$project_id = 'NULL';
- if ($item =~ /amount_/) {
- if ($form->{"project_id_$'"} && $form->{"projectnumber_$'"}) {
- $project_id = $form->{"project_id_$'"};
+ if ("amount_$i" =~ /amount_/) {
+ if ($form->{"project_id_$i"} && $form->{"projectnumber_$i"}) {
+ $project_id = $form->{"project_id_$i"};
}
}
+ if ("amount_$i" =~ /amount/) {
+ $taxkey = $form->{AP_amounts}{"amount_$i"}{taxkey};
+ }
# insert detail records in acc_trans
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
project_id, taxkey)
VALUES ($form->{id}, (SELECT c.id FROM chart c
- WHERE c.accno = '$form->{AP}{$item}'),
- $form->{$item}, '$form->{transdate}', $project_id, '$form->{taxkey}')|;
+ WHERE c.accno = '$form->{AP_amounts}{"amount_$i"}'),
+ $form->{"amount_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
$dbh->do($query) || $form->dberror($query);
+ if ($form->{"tax_$i"} != 0) {
+
+ # insert detail records in acc_trans
+ $query =
+ qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
+ project_id, taxkey)
+ VALUES ($form->{id}, (SELECT c.id FROM chart c
+ WHERE c.accno = '$form->{AP_amounts}{"tax_$i"}'),
+ $form->{"tax_$i"}, '$form->{transdate}', $project_id, '$taxkey')|;
+ $dbh->do($query) || $form->dberror($query);
+ }
+
}
}
+ # add payables
+ $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->{AP_amounts}{payables}'),
+ $form->{payables}, '$form->{transdate}', $project_id)|;
+ $dbh->do($query) || $form->dberror($query);
+
# if there is no amount but a payment record a payable
if ($form->{amount} == 0 && $form->{invtotal} == 0) {
$form->{payables} = $form->{invpaid};
my @a = (transdate, invnumber, name);
push @a, "employee" if $self->{l_employee};
my $sortorder = join ', ', $form->sort_columns(@a);
- $sortorder = $form->{sort} unless $sortorder;
+ $sortorder = $form->{sort} if $form->{sort};
$query .= "WHERE $where
ORDER by $sortorder";
$main::lxdebug->leave_sub();
}
+sub get_transdate {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $myconfig, $form) = @_;
+
+ # connect to database
+ my $dbh = $form->dbconnect($myconfig);
+
+ my $query =
+ "SELECT COALESCE(" .
+ " (SELECT transdate FROM ap WHERE id = " .
+ " (SELECT MAX(id) FROM ap) LIMIT 1), " .
+ " current_date)";
+ ($form->{transdate}) = $dbh->selectrow_array($query);
+
+ $dbh->disconnect;
+
+ $main::lxdebug->leave_sub();
+}
+
+
+sub post_payment {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $myconfig, $form, $locale) = @_;
+
+ # connect to database, turn off autocommit
+ my $dbh = $form->dbconnect_noauto($myconfig);
+
+ $form->{datepaid} = $form->{invdate};
+
+ # total payments, don't move we need it here
+ for my $i (1 .. $form->{paidaccounts}) {
+ $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->{exchangerate} =
+ $form->get_exchangerate($dbh, $form->{currency}, $form->{invdate},
+ "buy");
+
+ # record payments and offsetting AP
+ for my $i (1 .. $form->{paidaccounts}) {
+
+ if ($form->{"paid_$i"} != 0) {
+ my ($accno) = split /--/, $form->{"AP_paid_$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"});
+ }
+
+ # record AP
+ $amount =
+ $form->round_amount($form->{"paid_$i"} * $form->{"exchangerate"},
+ 2) * -1;
+
+
+ $query = qq|DELETE FROM acc_trans WHERE trans_id=$form->{id} AND chart_id=(SELECT c.id FROM chart c
+ WHERE c.accno = '$form->{AP}') 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)
+ VALUES ($form->{id}, (SELECT c.id FROM chart c
+ WHERE c.accno = '$form->{AP}'),
+ $amount, '$form->{"datepaid_$i"}')|;
+ $dbh->do($query) || $form->dberror($query);
+
+
+
+ $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)
+ 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"}')|;
+ $dbh->do($query) || $form->dberror($query);
+
+
+ # 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;
+ }
+
+ $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);
+ }
+ }
+ }
+
+ # 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)
+ VALUES ($form->{id},
+ (SELECT c.id FROM chart c
+ WHERE c.accno = '$accno'),
+ $form->{fx}{$accno}{$transdate}, '$transdate', '0', '1')|;
+ $dbh->do($query) || $form->dberror($query);
+ }
+ }
+ }
+ my $datepaid = ($form->{paid}) ? qq|'$form->{datepaid}'| : "NULL";
+
+ # save AP record
+ my $query = qq|UPDATE ap set
+ paid = $form->{paid},
+ datepaid = $datepaid
+ WHERE id=$form->{id}|;
+
+ $dbh->do($query) || $form->dberror($query);
+
+ my $rc = $dbh->commit;
+ $dbh->disconnect;
+
+ $main::lxdebug->leave_sub();
+
+ return $rc;
+}
+
1;
projects / kivitendo-erp.git / blobdiff