package GL;
+use Data::Dumper;
+
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
# connect to database
my $dbh = $form->dbconnect_noauto($myconfig);
# commit and redirect
my $rc = $dbh->commit;
$dbh->disconnect;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
$rc;
sub post_transaction {
my ($self, $myconfig, $form) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($debit, $credit) = (0, 0);
my $project_id;
# commit and redirect
my $rc = $dbh->commit;
$dbh->disconnect;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
$rc;
sub all_transactions {
my ($self, $myconfig, $form) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
# connect to database
my $dbh = $form->dbconnect($myconfig);
$apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
}
if ($form->{category} ne 'X') {
- $glwhere .= " AND c.category = '$form->{category}'";
- $arwhere .= " AND c.category = '$form->{category}'";
- $apwhere .= " AND c.category = '$form->{category}'";
+ $glwhere .=
+ " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+ $arwhere .=
+ " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+ $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->{accno}) {
my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
+ my $sortorder = join ', ',
+ $form->sort_columns(qw(transdate reference source description accno));
+ my %ordinal = (transdate => 6,
+ reference => 4,
+ source => 7,
+ description => 5);
+ map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
+
+ if ($form->{sort}) {
+ $sortorder = $form->{sort} . ",";
+ } else {
+ $sortorder = "";
+ }
+
my $query =
- qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
+ qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.type AS taxtype,
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
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 a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, t.type AS taxtype,
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
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 a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, t.type AS taxtype,
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
AND ac.chart_id = c.id
AND a.vendor_id = ct.id
AND a.id = ac.trans_id
- ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
+ ORDER BY $sortorder transdate, trans_id, taxkey DESC, taxtype DESC,oid|;
+
+ # 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_id2) {
+ push @{ $form->{GL} }, $ref;
+ $balance = 0;
+ }
+
+ $ref = $ref0;
+ $trans_id2 = $ref->{id};
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- print(STDERR $ref->{id}, " Transaction\n");
-
- # gl
- if ($ref->{type} eq "gl") {
- $ref->{module} = "gl";
- }
+ # gl
+ if ($ref->{type} eq "gl") {
+ $ref->{module} = "gl";
+ }
- # ap
- if ($ref->{type} eq "ap") {
- if ($ref->{invoice}) {
- $ref->{module} = "ir";
- } else {
- $ref->{module} = "ap";
+ # ap
+ if ($ref->{type} eq "ap") {
+ if ($ref->{invoice}) {
+ $ref->{module} = "ir";
+ } else {
+ $ref->{module} = "ap";
+ }
}
- }
- # ar
- if ($ref->{type} eq "ar") {
- if ($ref->{invoice}) {
- $ref->{module} = "is";
- } else {
- $ref->{module} = "ar";
+ # ar
+ if ($ref->{type} eq "ar") {
+ if ($ref->{invoice}) {
+ $ref->{module} = "is";
+ } else {
+ $ref->{module} = "ar";
+ }
}
- }
- $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};
+
+ $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};
+ } else {
+ $ref->{debit}{$k} = $ref->{amount} * -1;
+ $ref->{debit_accno}{$k} = $ref->{accno};
+ $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+ }
+
} else {
- $ref->{debit}{$k} = $ref->{amount} * -1;
- $ref->{debit_accno}{$k} = $ref->{accno};
- $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+
+ if ($ref->{chart_id} > 0) {
+ $ref->{credit_tax}{$j} = $ref->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref->{accno};
+ } else {
+ $ref->{credit}{$l} = $ref->{amount};
+ $ref->{credit_accno}{$l} = $ref->{accno};
+ $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+ }
+
}
+
} else {
- if ($ref->{chart_id} > 0) {
- $ref->{credit_tax}{$j} = $ref->{amount};
- $ref->{credit_tax_accno}{$j} = $ref->{accno};
- } else {
- $ref->{credit}{$l} = $ref->{amount};
- $ref->{credit_accno}{$l} = $ref->{accno};
- $ref->{credit_taxkey}{$l} = $ref->{taxkey};
- }
- }
- while (abs($balance) >= 0.015) {
- my $ref2 = $sth->fetchrow_hashref(NAME_lc)
- || $form->error("Unbalanced ledger!");
+ $ref2 = $ref0;
+ $trans_old =$trans_id2;
+ $trans_id2 = $ref2->{id};
$balance =
(int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
- print(STDERR $balance, " BAlance\n");
+
if ($ref2->{amount} < 0) {
+
if ($ref2->{chart_id} > 0) {
+
if ($ref->{debit_tax_accno}{$i} ne "") {
$i++;
}
- $ref->{debit_tax}{$i} = $ref2->{amount} * -1;
- $ref->{debit_tax_accno}{$i} = $ref2->{accno};
+ if ($ref2->{taxtype} eq 'U') {
+ $ref->{credit_tax}{$j} = $ref2->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ }
+ if ($ref2->{taxtype} eq 'V') {
+ $ref->{debit_tax}{$j} = $ref2->{amount} * -1;
+ $ref->{debit_tax_accno}{$j} = $ref2->{accno};
+ }
+
} else {
+
if ($ref->{debit_accno}{$k} ne "") {
$k++;
}
$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};
+ if ($ref2->{taxtype} eq 'U') {
+ $ref->{credit_tax}{$j} = $ref2->{amount};
+ $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+ }
+ if ($ref2->{taxtype} eq 'V') {
+ $ref->{debit_tax}{$j} = $ref2->{amount} * -1;
+ $ref->{debit_tax_accno}{$j} = $ref2->{accno};
+ }
+
} else {
+
if ($ref->{credit_accno}{$l} ne "") {
$l++;
}
}
}
}
-
- # print(STDERR Dumper($ref));
- push @{ $form->{GL} }, $ref;
- $balance = 0;
}
+ push @{ $form->{GL} }, $ref;
$sth->finish;
if ($form->{accno}) {
$query =
- qq|SELECT c.description FROM chart c WHERE c.accno = '$form->{accno}'|;
+ qq|SELECT c.description FROM chart c WHERE c.accno = '$form->{accno}
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
($form->{gifi_account_description}) = $sth->fetchrow_array;
$sth->finish;
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
$dbh->disconnect;
sub transaction {
my ($self, $myconfig, $form) = @_;
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my ($query, $sth, $ref);
$sth->finish;
# retrieve individual rows
- $query = "SELECT c.accno, a.amount, project_id,
+ $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
+ 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}
}
# get tax description
- $query = qq| SELECT * FROM tax t|;
+ $query = qq| SELECT * FROM tax t order by t.taxkey|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$form->{TAX} = ();
$sth->finish;
$sth->finish;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
$dbh->disconnect;
projects / kivitendo-erp.git / blobdiff