package GL;
use Data::Dumper;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
+use strict;
+
sub delete_transaction {
my ($self, $myconfig, $form) = @_;
$main::lxdebug->enter_sub();
# connect to database
my $dbh = $form->dbconnect_noauto($myconfig);
- my @values = (conv_i($form->{id}));
- do_query($form, $dbh, qq|DELETE FROM acc_trans WHERE trans_id = ?|, @values);
- do_query($form, $dbh, qq|DELETE FROM gl WHERE id = ?|, @values);
+ # acc_trans entries are deleted by database triggers.
+ do_query($form, $dbh, qq|DELETE FROM gl WHERE id = ?|, conv_i($form->{id}));
# commit and redirect
my $rc = $dbh->commit;
$form->{taxincluded} = 0;
}
- my ($query, $sth);
+ my ($query, $sth, @values, $taxkey, $rate, $posted);
if ($form->{id}) {
$query =
qq|INSERT INTO gl (id, employee_id) | .
qq|VALUES (?, (SELECT id FROM employee WHERE login = ?))|;
- @values = ($form->{id}, $form->{login});
+ @values = ($form->{id}, $::myconfig{login});
do_query($form, $dbh, $query, @values);
}
my ($null, $department_id) = split(/--/, $form->{department});
- $department_id *= 1;
+
+ $form->{ob_transaction} *= 1;
+ $form->{cb_transaction} *= 1;
$query =
qq|UPDATE gl SET
reference = ?, description = ?, notes = ?,
transdate = ?, department_id = ?, taxincluded = ?,
- storno = ?, storno_id = ?
+ storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?
WHERE id = ?|;
@values = ($form->{reference}, $form->{description}, $form->{notes},
- conv_date($form->{transdate}), $department_id, $form->{taxincluded},
- $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}),
+ conv_date($form->{transdate}), conv_i($department_id), $form->{taxincluded} ? 't' : 'f',
+ $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
conv_i($form->{id}));
do_query($form, $dbh, $query, @values);
if ($amount != 0) {
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id, taxkey)
+ source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id, chart_link)
VALUES (?, (SELECT id FROM chart WHERE accno = ?),
- ?, ?, ?, ?, ?, ?)|;
+ ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE accno = ?))|;
@values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
- $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey);
+ $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f', conv_i($form->{"tax_id_$i"}), $accno);
do_query($form, $dbh, $query, @values);
}
# add taxentry
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id, taxkey)
+ source, memo, project_id, taxkey, tax_id, chart_link)
VALUES (?, (SELECT chart_id FROM tax WHERE id = ?),
- ?, ?, ?, ?, ?, ?)|;
+ ?, ?, ?, ?, ?, ?, ?, (SELECT link
+ FROM chart
+ WHERE id = (SELECT chart_id
+ FROM tax
+ WHERE id = ?)))|;
@values = (conv_i($form->{id}), conv_i($form->{"tax_id_$i"}),
$tax, conv_date($form->{transdate}), $form->{"source_$i"},
- $form->{"memo_$i"}, $project_id, $taxkey);
+ $form->{"memo_$i"}, $project_id, $taxkey, conv_i($form->{"tax_id_$i"}), conv_i($form->{"tax_id_$i"}));
do_query($form, $dbh, $query, @values);
}
}
do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id}));
}
+ # safety check datev export
+ if ($::instance_conf->get_datev_check_on_gl_transaction) {
+ my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ trans_id => $form->{id},
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
# commit and redirect
my $rc = $dbh->commit;
$dbh->disconnect;
# connect to database
my $dbh = $form->dbconnect($myconfig);
- my ($query, $sth, $source, $null);
+ my ($query, $sth, $source, $null, $space);
my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1");
my (@glvalues, @arvalues, @apvalues);
}
if ($form->{source}) {
- $glwhere .= " AND ac.source ILIKE ?";
- $arwhere .= " AND ac.source ILIKE ?";
- $apwhere .= " AND ac.source ILIKE ?";
+ $glwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+ $arwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
+ $apwhere .= " AND ac.trans_id IN (SELECT trans_id from acc_trans WHERE source ILIKE ?)";
push(@glvalues, '%' . $form->{source} . '%');
push(@arvalues, '%' . $form->{source} . '%');
push(@apvalues, '%' . $form->{source} . '%');
}
+ # default Datumseinschränkung falls nicht oder falsch übergeben (sollte nie passieren)
+ $form->{datesort} = 'transdate' unless $form->{datesort} =~ /^(transdate|gldate)$/;
+
if ($form->{datefrom}) {
- $glwhere .= " AND ac.transdate >= ?";
- $arwhere .= " AND ac.transdate >= ?";
- $apwhere .= " AND ac.transdate >= ?";
+ $glwhere .= " AND ac.$form->{datesort} >= ?";
+ $arwhere .= " AND ac.$form->{datesort} >= ?";
+ $apwhere .= " AND ac.$form->{datesort} >= ?";
push(@glvalues, $form->{datefrom});
push(@arvalues, $form->{datefrom});
push(@apvalues, $form->{datefrom});
}
if ($form->{dateto}) {
- $glwhere .= " AND ac.transdate <= ?";
- $arwhere .= " AND ac.transdate <= ?";
- $apwhere .= " AND ac.transdate <= ?";
+ $glwhere .= " AND ac.$form->{datesort} <= ?";
+ $arwhere .= " AND ac.$form->{datesort} <= ?";
+ $apwhere .= " AND ac.$form->{datesort} <= ?";
push(@glvalues, $form->{dateto});
push(@arvalues, $form->{dateto});
push(@apvalues, $form->{dateto});
push(@apvalues, '%' . $form->{description} . '%');
}
+ if ($form->{employee_id}) {
+ $glwhere .= " AND g.employee_id = ? ";
+ $arwhere .= " AND a.employee_id = ? ";
+ $apwhere .= " AND a.employee_id = ? ";
+ push(@glvalues, conv_i($form->{employee_id}));
+ push(@arvalues, conv_i($form->{employee_id}));
+ push(@apvalues, conv_i($form->{employee_id}));
+ }
+
if ($form->{notes}) {
$glwhere .= " AND g.notes ILIKE ?";
$arwhere .= " AND a.notes ILIKE ?";
}
if ($form->{category} ne 'X') {
- $glwhere .=
- qq| AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $arwhere .=
- qq| AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
- $apwhere .=
- qq| AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN
- (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $glwhere .= qq| AND g.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $arwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
+ $apwhere .= qq| AND a.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = ?))|;
push(@glvalues, $form->{category});
push(@arvalues, $form->{category});
push(@apvalues, $form->{category});
push(@apvalues, $project_id, $project_id);
}
- my ($project_columns, %project_join);
+ my ($project_columns, $project_join);
if ($form->{"l_projectnumbers"}) {
$project_columns = qq|, ac.project_id, pr.projectnumber|;
$project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|;
qq|SELECT SUM(ac.amount)
FROM acc_trans ac
LEFT JOIN chart c ON (ac.chart_id = c.id)
- WHERE (c.accno = ?) AND (ac.transdate < ?)|;
+ WHERE (c.accno = ?) AND (ac.$form->{datesort} < ?)|;
($form->{balance}) = selectrow_query($form, $dbh, $query, $form->{accno}, conv_date($form->{datefrom}));
}
}
- my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
-
- my $sortorder;
-
- if ($form->{sort}) {
- $form->{sort} =~ s/[^a-zA-Z_]//g;
- $sortorder = $form->{sort} . ",";
+ my %sort_columns = (
+ 'id' => [ qw(id) ],
+ 'transdate' => [ qw(transdate id) ],
+ 'gldate' => [ qw(gldate id) ],
+ 'reference' => [ qw(lower_reference id) ],
+ 'description' => [ qw(lower_description id) ],
+ 'accno' => [ qw(accno transdate id) ],
+ );
+ my %lowered_columns = (
+ 'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', },
+ 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', },
+ 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', },
+ );
+
+ # sortdir = sort direction (ascending or descending)
+ my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+ my $sortkey = $sort_columns{$form->{sort}} ? $form->{sort} : $form->{datesort}; # default used to be transdate
+ my $sortorder = join ', ', map { "$_ $sortdir" } @{ $sort_columns{$sortkey} };
+
+ my %columns_for_sorting = ( 'gl' => '', 'arap' => '', );
+ foreach my $spec (@{ $sort_columns{$sortkey} }) {
+ next if ($spec !~ m/^lower_(.*)$/);
+
+ my $column = $1;
+ map { $columns_for_sorting{$_} .= sprintf(', lower(%s) AS lower_%s', $lowered_columns{$column}->{$_}, $column) } qw(gl arap);
}
- my $query =
+ $query =
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, g.notes, t.chart_id, ac.oid
+ ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link,
+ g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+ ac.amount, c.accno, g.notes, t.chart_id,
+ CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
- FROM gl g, acc_trans ac $project_join, chart c
+ $columns_for_sorting{gl}
+ FROM gl g
+ LEFT JOIN employee e ON (g.employee_id = e.id),
+ 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)
UNION
- 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, a.notes, t.chart_id, ac.oid
+ SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+ ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+ ac.amount, c.accno, a.notes, t.chart_id,
+ CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
- FROM ar a, acc_trans ac $project_join, customer ct, chart c
+ $columns_for_sorting{arap}
+ FROM ar a
+ LEFT JOIN employee e ON (a.employee_id = e.id),
+ 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)
UNION
- 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, a.notes, t.chart_id, ac.oid
+ SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link,
+ ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id,
+ ac.amount, c.accno, a.notes, t.chart_id,
+ CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
- FROM ap a, acc_trans ac $project_join, vendor ct, chart c
+ $columns_for_sorting{arap}
+ FROM ap a
+ LEFT JOIN employee e ON (a.employee_id = e.id),
+ 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, acoid, taxkey DESC|;
+ ORDER BY $sortorder, acc_trans_id $sortdir|;
+# ORDER BY gldate DESC, id DESC, acc_trans_id DESC
my @values = (@glvalues, @arvalues, @apvalues);
# Show all $query in Debuglevel LXDebug::QUERY
- $callingdetails = (caller (0))[3];
- dump_query(LXDebug::QUERY, "$callingdetails", $query, @values);
+ my $callingdetails = (caller (0))[3];
+ dump_query(LXDebug->QUERY(), "$callingdetails", $query, @values);
$sth = prepare_execute_query($form, $dbh, $query, @values);
my $trans_id = "";
my $trans_id2 = "";
+ my $balance;
my ($i, $j, $k, $l, $ref, $ref2);
$form->{GL} = [];
- while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref0 = $sth->fetchrow_hashref("NAME_lc")) {
$trans_id = $ref0->{id};
+ my $source = $ref0->{source};
+ undef($ref0->{source});
+
if ($trans_id != $trans_id2) { # first line of a booking
if ($trans_id2) {
$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 { #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};
$ref->{ac_transdate}{$k} = $ref->{transdate};
-
+ $ref->{source}{$k} = $source;
} else {
$ref->{credit}{$l} = $ref->{amount} * 1;
$ref->{credit_accno}{$l} = $ref->{accno};
$ref->{credit_taxkey}{$l} = $ref->{taxkey};
$ref->{ac_transdate}{$l} = $ref->{transdate};
-
-
+ $ref->{source}{$l} = $source;
}
}
} else { # following lines of a booking, line increasing
$ref2 = $ref0;
- $trans_old = $trans_id2;
+# $trans_old = $trans_id2; # doesn't seem to be used anymore
$trans_id2 = $ref2->{id};
$balance =
if ($ref->{debit_accno}{$k} ne "") {
$k++;
}
+ if ($ref->{source}{$k} ne "") {
+ $space = " | ";
+ } else {
+ $space = "";
+ }
$ref->{debit}{$k} = $ref2->{amount} * - 1;
$ref->{debit_accno}{$k} = $ref2->{accno};
$ref->{debit_taxkey}{$k} = $ref2->{taxkey};
$ref->{ac_transdate}{$k} = $ref2->{transdate};
+ $ref->{source}{$k} = $source . $space . $ref->{source}{$k};
} else {
if ($ref->{credit_accno}{$l} ne "") {
$l++;
}
+ if ($ref->{source}{$l} ne "") {
+ $space = " | ";
+ } else {
+ $space = "";
+ }
$ref->{credit}{$l} = $ref2->{amount};
$ref->{credit_accno}{$l} = $ref2->{accno};
$ref->{credit_taxkey}{$l} = $ref2->{taxkey};
$ref->{ac_transdate}{$l} = $ref2->{transdate};
+ $ref->{source}{$l} = $ref->{source}{$l} . $space . $source;
}
}
}
}
+
push @{ $form->{GL} }, $ref;
$sth->finish;
if ($form->{id}) {
$query =
qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
- d.description AS department, e.name AS employee, g.taxincluded, g.gldate
+ d.description AS department, e.name AS employee, g.taxincluded, g.gldate,
+ g.ob_transaction, g.cb_transaction
FROM gl g
LEFT JOIN department d ON (d.id = g.department_id)
LEFT JOIN employee e ON (e.id = g.employee_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))
+ LEFT JOIN tax t ON (t.id = a.tax_id)
WHERE (a.trans_id = ?)
AND (a.fx_transaction = '0')
- ORDER BY a.oid, a.transdate|;
+ ORDER BY a.acc_trans_id, a.transdate|;
$form->{GL} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
} else {
$query = qq|SELECT * FROM gl WHERE id = ?|;
$storno_row = selectfirst_hashref_query($form, $dbh, $query, $id);
- $storno_row->{id} = $new_id;
- $storno_row->{storno_id} = $id;
- $storno_row->{storno} = 't';
- $storno_row->{reference} = 'Storno-' . $storno_row->{reference};
+ $storno_row->{id} = $new_id;
+ $storno_row->{storno_id} = $id;
+ $storno_row->{storno} = 't';
+ $storno_row->{reference} = 'Storno-' . $storno_row->{reference};
+
+ $query = qq|SELECT id FROM employee WHERE login = ?|;
+ my ($employee_id) = selectrow_query($form, $dbh, $query, $::myconfig{login});
+ $storno_row->{employee_id} = $employee_id;
- delete @$storno_row{qw(itime mtime)};
+ delete @$storno_row{qw(itime mtime gldate)};
$query = sprintf 'INSERT INTO gl (%s) VALUES (%s)', join(', ', keys %$storno_row), join(', ', map '?', values %$storno_row);
do_query($form, $dbh, $query, (values %$storno_row));
# now copy acc_trans entries
$query = qq|SELECT * FROM acc_trans WHERE trans_id = ?|;
- my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
+ my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
for my $row (@$rowref) {
- delete @$row{qw(itime mtime)};
+ delete @$row{qw(itime mtime acc_trans_id gldate)};
$query = sprintf 'INSERT INTO acc_trans (%s) VALUES (%s)', join(', ', keys %$row), join(', ', map '?', values %$row);
$row->{trans_id} = $new_id;
$row->{amount} *= -1;
$main::lxdebug->leave_sub();
}
+sub get_chart_balances {
+ $main::lxdebug->enter_sub();
+
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(charts));
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
+
+ my @ids = map { $_->{id} } @{ $params{charts} };
+
+ if (!@ids) {
+ $main::lxdebug->leave_sub();
+ return;
+ }
+
+ my $query = qq|SELECT chart_id, SUM(amount) AS sum
+ FROM acc_trans
+ WHERE chart_id IN (| . join(', ', ('?') x scalar(@ids)) . qq|)
+ GROUP BY chart_id|;
+
+ my %balances = selectall_as_map($form, $dbh, $query, 'chart_id', 'sum', @ids);
+
+ foreach my $chart (@{ $params{charts} }) {
+ $chart->{balance} = $balances{ $chart->{id} } || 0;
+ }
+
+ $main::lxdebug->leave_sub();
+}
+
+sub get_tax_dropdown {
+ my ($self, $accno) = @_;
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ my $dbh = $form->get_standard_dbh($myconfig);
+
+ my $query = qq|SELECT category FROM chart WHERE accno = ?|;
+ my ($category) = selectrow_query($form, $dbh, $query, $accno);
+
+ $query = qq|SELECT * FROM tax WHERE chart_categories like '%$category%' order by taxkey, rate|;
+
+ my $sth = prepare_execute_query($form, $dbh, $query);
+
+ my @tax_accounts = ();
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
+ push(@tax_accounts, $ref);
+ }
+
+ return @tax_accounts;
+}
+
1;
projects / kivitendo-erp.git / blobdiff