package GL;
use Data::Dumper;
+use SL::DBUtils;
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
# check if debit and credit balances
if ($form->{storno}) {
- $debit = $debit * -1;
- $credit = $credit * -1;
- $tax = $tax * -1;
$form->{reference} = "Storno-" . $form->{reference};
$form->{description} = "Storno-" . $form->{description};
}
# insert acc_trans transactions
for $i (1 .. $form->{rowcount}) {
-
+ my $taxkey;
+ my $rate;
# extract accno
+ print(STDERR $form->{"taxchart_$i"}, "TAXCHART\n");
my ($accno) = split(/--/, $form->{"accno_$i"});
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+ ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+ if ($form->{"tax_id_$i"} ne "") {
+ $query = qq|SELECT t.taxkey, t.rate
+ FROM tax t
+ WHERE t.id=$form->{"tax_id_$i"}|;
+
+ $sth = $dbh->prepare($query);
+ $sth->execute || $form->dberror($query);
+ ($taxkey, $rate) =
+ $sth->fetchrow_array;
+ $sth->finish;
+ }
+
my $amount = 0;
my $debit = $form->{"debit_$i"};
my $credit = $form->{"credit_$i"};
$posted = 0;
}
+ $project_id = conv_i($form->{"project_id_$i"});
+
# if there is an amount, add the record
if ($amount != 0) {
- $project_id =
- ($form->{"project_id_$i"}) ? $form->{"project_id_$i"} : 'NULL';
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
source, memo, project_id, taxkey)
VALUES
$amount, '$form->{transdate}', |
. $dbh->quote($form->{"source_$i"}) . qq|, |
. $dbh->quote($form->{"memo_$i"}) . qq|,
- $project_id, $taxkey)|;
+ ?, $taxkey)|;
- $dbh->do($query) || $form->dberror($query);
+ do_query($form, $dbh, $query, $project_id);
}
if ($tax != 0) {
-
# add taxentry
- $amount = $tax;
-
- $project_id =
- ($form->{"project_id_$i"}) ? $form->{"project_id_$i"} : 'NULL';
$query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
source, memo, project_id, taxkey)
VALUES
($form->{id}, (SELECT t.chart_id
FROM tax t
- WHERE t.taxkey = $taxkey),
- $amount, '$form->{transdate}', |
+ WHERE t.id = $form->{"tax_id_$i"}),
+ $tax, '$form->{transdate}', |
. $dbh->quote($form->{"source_$i"}) . qq|, |
- . $dbh->quote($form->{"memo_$i"}) . qq|,
- $project_id, $taxkey)|;
+ . $dbh->quote($form->{"memo_$i"}) . qq|, ?, $taxkey)|;
- $dbh->do($query) || $form->dberror($query);
+ do_query($form, $dbh, $query, $project_id);
}
}
$apwhere .=
" AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
}
+ if ($form->{project_id}) {
+ $glwhere .= " AND g.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = " . conv_i($form->{project_id}, 'NULL') . ")";
+ $arwhere .=
+ " AND ((a.globalproject_id = " . conv_i($form->{project_id}, 'NULL') . ") OR " .
+ " (a.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = " . conv_i($form->{project_id}, 'NULL') . ")))";
+ $apwhere .=
+ " AND ((a.globalproject_id = " . conv_i($form->{project_id}, 'NULL') . ") OR " .
+ " (a.id IN (SELECT DISTINCT trans_id FROM acc_trans WHERE project_id = " . conv_i($form->{project_id}, 'NULL') . ")))";
+ }
+
+ my ($project_columns, %project_join);
+ if ($form->{"l_projectnumbers"}) {
+ $project_columns = ", ac.project_id, pr.projectnumber";
+ $project_join = "LEFT JOIN project pr ON (ac.project_id = pr.id)";
+ }
if ($form->{accno}) {
}
my $query =
- qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
+ qq|SELECT ac.oid AS acoid, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link,
g.description, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, c.gifi_accno, g.notes, t.chart_id, ac.oid
- FROM gl g, acc_trans ac, chart c LEFT JOIN tax t ON
+ $project_columns
+ FROM gl g, acc_trans ac $project_join, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $glwhere
AND ac.chart_id = c.id
AND g.id = ac.trans_id
UNION
- SELECT a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, t.taxkey AS sorttax,
+ SELECT ac.oid AS acoid, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
- FROM ar a, acc_trans ac, customer ct, chart c LEFT JOIN tax t ON
+ $project_columns
+ FROM ar a, acc_trans ac $project_join, customer ct, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $arwhere
AND ac.chart_id = c.id
AND a.customer_id = ct.id
AND a.id = ac.trans_id
UNION
- SELECT a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, t.taxkey AS sorttax,
+ SELECT ac.oid AS acoid, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
ct.name, ac.transdate, ac.source, ac.trans_id,
ac.amount, c.accno, c.gifi_accno, a.notes, t.chart_id, ac.oid
- FROM ap a, acc_trans ac, vendor ct, chart c LEFT JOIN tax t ON
+ $project_columns
+ FROM ap a, acc_trans ac $project_join, vendor ct, chart c LEFT JOIN tax t ON
(t.chart_id=c.id)
WHERE $apwhere
AND ac.chart_id = c.id
AND a.vendor_id = ct.id
AND a.id = ac.trans_id
- ORDER BY $sortorder transdate, trans_id, taxkey DESC, sorttax DESC,oid|;
+ ORDER BY $sortorder transdate, trans_id, acoid, taxkey DESC|;
+
+ # Show all $query in Debuglevel LXDebug::QUERY
+ $callingdetails = (caller (0))[3];
+ $main::lxdebug->message(LXDebug::QUERY, "$callingdetails \$query=\n $query");
+
my $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
my $trans_id = "";
my $trans_id2 = "";
+
while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
+
$trans_id = $ref0->{id};
- if ($trans_id != $trans_id2) {
+
+ if ($trans_id != $trans_id2) { # first line of a booking
+
if ($trans_id2) {
push @{ $form->{GL} }, $ref;
$balance = 0;
}
+
$ref = $ref0;
$trans_id2 = $ref->{id};
$ref->{module} = "ar";
}
}
+
+ $ref->{"projectnumbers"} = {};
+ $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"});
+
$balance = $ref->{amount};
- $i = 0;
- $j = 0;
- $k = 0;
- $l = 0;
- if ($ref->{amount} < 0) {
- if ($ref->{chart_id} > 0) {
- $ref->{debit_tax}{$i} = $ref->{amount} * -1;
- $ref->{debit_tax_accno}{$i} = $ref->{accno};
+
+ # Linenumbers of General Ledger
+ $k = 0; # Debit # AP # Soll
+ $l = 0; # Credit # AR # Haben
+ $i = 0; # Debit Tax # AP_tax # VSt
+ $j = 0; # Credit Tax # AR_tax # USt
+
+
+ if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing
+ if ($ref->{amount} < 0) {
+ if ($ref->{link} =~ /AR_tax/) {
+ $ref->{credit_tax}{$j} = $ref->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref->{accno};
+ }
+ if ($ref->{link} =~ /AP_tax/) {
+ $ref->{debit_tax}{$i} = $ref->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref->{accno};
+ }
} else {
+ if ($ref->{link} =~ /AR_tax/) {
+ $ref->{credit_tax}{$j} = $ref->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref->{accno};
+ }
+ if ($ref->{link} =~ /AP_tax/) {
+ $ref->{debit_tax}{$i} = $ref->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref->{accno};
+ }
+ }
+ } else { #all other accounts first line
+ if ($ref->{amount} < 0) {
$ref->{debit}{$k} = $ref->{amount} * -1;
$ref->{debit_accno}{$k} = $ref->{accno};
$ref->{debit_taxkey}{$k} = $ref->{taxkey};
- }
- } else {
- if ($ref->{chart_id} > 0) {
- $ref->{credit_tax}{$j} = $ref->{amount};
- $ref->{credit_tax_accno}{$j} = $ref->{accno};
+ $ref->{ac_transdate}{$k} = $ref->{transdate};
+
} else {
- $ref->{credit}{$l} = $ref->{amount};
+ $ref->{credit}{$l} = $ref->{amount} * 1;
$ref->{credit_accno}{$l} = $ref->{accno};
$ref->{credit_taxkey}{$l} = $ref->{taxkey};
+ $ref->{ac_transdate}{$l} = $ref->{transdate};
+
+
}
}
- } else {
+
+ } else { # following lines of a booking, line increasing
+
$ref2 = $ref0;
+ $trans_old =$trans_id2;
$trans_id2 = $ref2->{id};
-
- # if ($form->{accno} eq ''){ # flo & udo: if general report,
- # then check balance
- # while (abs($balance) >= 0.015) {
- # my $ref2 = $sth->fetchrow_hashref(NAME_lc)
- # || $form->error("Unbalanced ledger!");
- #
+
$balance =
(int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
- if ($ref2->{amount} < 0) {
- if ($ref2->{chart_id} > 0) {
- if ($ref->{debit_tax_accno}{$i} ne "") {
- $i++;
+
+ $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"});
+
+ if ($ref2->{chart_id} > 0) { # all tax accounts, following lines
+ if ($ref2->{amount} < 0) {
+ if ($ref2->{link} =~ /AR_tax/) {
+ if ($ref->{credit_tax_accno}{$j} ne "") {
+ $j++;
+ }
+ $ref->{credit_tax}{$j} = $ref2->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ }
+ if ($ref2->{link} =~ /AP_tax/) {
+ if ($ref->{debit_tax_accno}{$i} ne "") {
+ $i++;
+ }
+ $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref2->{accno};
}
- $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
- $ref->{debit_tax_accno}{$i} = $ref2->{accno};
} else {
+ if ($ref2->{link} =~ /AR_tax/) {
+ if ($ref->{credit_tax_accno}{$j} ne "") {
+ $j++;
+ }
+ $ref->{credit_tax}{$j} = $ref2->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ }
+ if ($ref2->{link} =~ /AP_tax/) {
+ if ($ref->{debit_tax_accno}{$i} ne "") {
+ $i++;
+ }
+ $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
+ $ref->{debit_tax_accno}{$i} = $ref2->{accno};
+ }
+ }
+ } else { # all other accounts, following lines
+ if ($ref2->{amount} < 0) {
if ($ref->{debit_accno}{$k} ne "") {
$k++;
}
- $ref->{debit}{$k} = $ref2->{amount} * -1;
+ $ref->{debit}{$k} = $ref2->{amount} * - 1;
$ref->{debit_accno}{$k} = $ref2->{accno};
$ref->{debit_taxkey}{$k} = $ref2->{taxkey};
- }
- } else {
- if ($ref2->{chart_id} > 0) {
- if ($ref->{credit_tax_accno}{$j} ne "") {
- $j++;
- }
- $ref->{credit_tax}{$j} = $ref2->{amount};
- $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ $ref->{ac_transdate}{$k} = $ref2->{transdate};
} else {
if ($ref->{credit_accno}{$l} ne "") {
$l++;
$ref->{credit}{$l} = $ref2->{amount};
$ref->{credit_accno}{$l} = $ref2->{accno};
$ref->{credit_taxkey}{$l} = $ref2->{taxkey};
+ $ref->{ac_transdate}{$l} = $ref2->{transdate};
}
}
-
- # }
- # } else {
- # # if account-report, then calculate the Balance?!
- # # ToDo: Calculate the Balance
- # 1;
- # }
}
-
}
push @{ $form->{GL} }, $ref;
$sth->finish;
$sth->finish;
# retrieve individual rows
- $query = "SELECT c.accno, c.taxkey_id AS accnotaxkey, a.amount, project_id,
- (SELECT p.projectnumber FROM project p
- WHERE a.project_id = p.id) AS projectnumber, a.taxkey, (SELECT c1.accno FROM chart c1, tax t WHERE t.taxkey=a.taxkey AND c1.id=t.chart_id) AS taxaccno, (SELECT t1.rate FROM tax t1 WHERE t1.taxkey=a.taxkey) AS taxrate
- FROM acc_trans a, chart c
- WHERE a.chart_id = c.id
- AND a.trans_id = $form->{id}
- ORDER BY a.oid";
+ $query = qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo,
+ a.transdate, a.cleared, a.project_id, p.projectnumber,
+ a.taxkey, t.rate AS taxrate, t.id, (SELECT c1.accno FROM chart c1, tax t1 WHERE t1.id=t.id AND c1.id=t.chart_id) AS taxaccno, (SELECT tk.tax_id FROM taxkeys tk WHERE tk.chart_id =a.chart_id AND tk.startdate<=a.transdate ORDER BY tk.startdate desc LIMIT 1) AS tax_id
+ FROM acc_trans a
+ JOIN chart c ON (c.id = a.chart_id)
+ LEFT JOIN project p ON (p.id = a.project_id)
+ LEFT JOIN tax t ON (t.id=(SELECT tk.tax_id from taxkeys tk WHERE (tk.taxkey_id=a.taxkey) AND ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id=a.taxkey) THEN tk.chart_id=a.chart_id ELSE 1=1 END) OR (c.link LIKE '%tax%')) AND startdate <=a.transdate ORDER BY startdate DESC LIMIT 1))
+ WHERE a.trans_id = $form->{id}
+ AND a.fx_transaction = '0'
+ ORDER BY a.oid,a.transdate|;
+
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
+ $form->{GL} = [];
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $form->{GL} }, $ref;
}
$query = qq| SELECT * FROM tax t order by t.taxkey|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
- $form->{TAX} = ();
+ $form->{TAX} = [];
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $form->{TAX} }, $ref;
}
$sth->finish;
} else {
- $query = "SELECT current_date AS transdate, closedto, revtrans
- FROM defaults";
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- ($form->{transdate}, $form->{closedto}, $form->{revtrans}) =
- $sth->fetchrow_array;
+ $query = "SELECT closedto, revtrans FROM defaults";
+ ($form->{closedto}, $form->{revtrans}) = $dbh->selectrow_array($query);
+ $query =
+ "SELECT COALESCE(" .
+ " (SELECT transdate FROM gl WHERE id = " .
+ " (SELECT MAX(id) FROM gl) LIMIT 1), " .
+ " current_date)";
+ ($form->{transdate}) = $dbh->selectrow_array($query);
# get tax description
$query = qq| SELECT * FROM tax t order by t.taxkey|;
}
$sth->finish;
-
+ my $transdate = "current_date";
+ if ($form->{transdate}) {
+ $transdate = qq|'$form->{transdate}'|;
+ }
# get chart of accounts
- $query = qq|SELECT c.accno, c.description, c.taxkey_id
- FROM chart c
- WHERE c.charttype = 'A'
- ORDER by c.accno|;
+ $query = qq|SELECT c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id
+ FROM chart c
+ LEFT JOIN taxkeys tk ON (tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=$transdate ORDER BY startdate desc LIMIT 1))
+ ORDER BY c.accno|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$form->{chart} = ();
projects / kivitendo-erp.git / blobdiff