X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FGL.pm;h=46c2d49b193b5f2bbdafcb2b7726d6286d2fac3a;hb=15aab04c1710b3c8a2bf8785aef31f13a958a43e;hp=a36c8e303fbdbdcfff546f885a59e01ec269e1c0;hpb=6c7334b32c2219f4eb46ab2ca56e3a044a22db80;p=kivitendo-erp.git diff --git a/SL/GL.pm b/SL/GL.pm index a36c8e303..46c2d49b1 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -25,7 +25,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # General ledger backend code @@ -38,30 +39,41 @@ package GL; +use List::Util qw(first); + use Data::Dumper; +use SL::DATEV qw(:CONSTANTS); use SL::DBUtils; +use SL::DB::Chart; +use SL::DB::Draft; +use SL::Util qw(trim); +use SL::DB; + +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); + SL::DB->client->with_transaction(sub { + do_query($form, SL::DB->client->dbh, qq|DELETE FROM gl WHERE id = ?|, conv_i($form->{id})); + 1; + }) or do { die SL::DB->client->error }; - # commit and redirect - my $rc = $dbh->commit; - $dbh->disconnect; $main::lxdebug->leave_sub(); +} - $rc; +sub post_transaction { + my ($self, $myconfig, $form) = @_; + $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_post_transaction, $self, $myconfig, $form); + + $::lxdebug->leave_sub; + return $rc; } -sub post_transaction { +sub _post_transaction { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); @@ -70,8 +82,7 @@ sub post_transaction { my $i; - # connect to database, turn off AutoCommit - my $dbh = $form->dbconnect_noauto($myconfig); + my $dbh = SL::DB->client->dbh; # post the transaction # make up a unique handle and store in reference field @@ -86,7 +97,7 @@ sub post_transaction { $form->{taxincluded} = 0; } - my ($query, $sth); + my ($query, $sth, @values, $taxkey, $rate, $posted); if ($form->{id}) { @@ -102,33 +113,30 @@ sub post_transaction { $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 = ?, ob_transaction = ?, cb_transaction = ? + transdate = ?, deliverydate = ?, tax_point = ?, department_id = ?, taxincluded = ?, + storno = ?, storno_id = ?, ob_transaction = ?, cb_transaction = ?, + transaction_description = ? WHERE id = ?|; @values = ($form->{reference}, $form->{description}, $form->{notes}, - conv_date($form->{transdate}), $department_id, $form->{taxincluded} ? 't' : 'f', + conv_date($form->{transdate}), conv_date($form->{deliverydate}), conv_date($form->{tax_point}), conv_i($form->{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', + $form->{transaction_description}, conv_i($form->{id})); do_query($form, $dbh, $query, @values); # insert acc_trans transactions for $i (1 .. $form->{rowcount}) { - # extract accno - my ($accno) = split(/--/, $form->{"accno_$i"}); ($form->{"tax_id_$i"}) = split(/--/, $form->{"taxchart_$i"}); if ($form->{"tax_id_$i"} ne "") { $query = qq|SELECT taxkey, rate FROM tax WHERE id = ?|; @@ -156,11 +164,10 @@ sub post_transaction { if ($amount != 0) { $query = qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, - source, memo, project_id, taxkey, ob_transaction, cb_transaction) - VALUES (?, (SELECT id 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->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f'); + source, memo, project_id, taxkey, ob_transaction, cb_transaction, tax_id, chart_link) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, (SELECT link FROM chart WHERE id = ?))|; + @values = (conv_i($form->{id}), $form->{"accno_id_$i"}, $amount, conv_date($form->{transdate}), + $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"}), $form->{"accno_id_$i"}); do_query($form, $dbh, $query, @values); } @@ -168,12 +175,16 @@ sub post_transaction { # 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); } } @@ -182,21 +193,35 @@ sub post_transaction { do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id})); } - # commit and redirect - my $rc = $dbh->commit; - $dbh->disconnect; - $main::lxdebug->leave_sub(); + if ($form->{draft_id}) { + SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]); + } - return $rc; + # safety check datev export + if ($::instance_conf->get_datev_check_on_gl_transaction) { + + # create datev object + my $datev = SL::DATEV->new( + dbh => $dbh, + trans_id => $form->{id}, + ); + + $datev->generate_datev_data; + + if ($datev->errors) { + die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors; + } + } + + return 1; } sub all_transactions { my ($self, $myconfig, $form) = @_; $main::lxdebug->enter_sub(); - # connect to database - my $dbh = $form->dbconnect($myconfig); - my ($query, $sth, $source, $null); + my $dbh = SL::DB->client->dbh; + my ($query, $sth, $source, $null, $space); my ($glwhere, $arwhere, $apwhere) = ("1 = 1", "1 = 1", "1 = 1"); my (@glvalues, @arvalues, @apvalues); @@ -205,64 +230,84 @@ sub all_transactions { $glwhere .= qq| AND g.reference ILIKE ?|; $arwhere .= qq| AND a.invnumber ILIKE ?|; $apwhere .= qq| AND a.invnumber ILIKE ?|; - push(@glvalues, '%' . $form->{reference} . '%'); - push(@arvalues, '%' . $form->{reference} . '%'); - push(@apvalues, '%' . $form->{reference} . '%'); + push(@glvalues, like($form->{reference})); + push(@arvalues, like($form->{reference})); + push(@apvalues, like($form->{reference})); } - if ($form->{department}) { - my ($null, $department) = split /--/, $form->{department}; + if ($form->{department_id}) { $glwhere .= qq| AND g.department_id = ?|; $arwhere .= qq| AND a.department_id = ?|; $apwhere .= qq| AND a.department_id = ?|; - push(@glvalues, $department); - push(@arvalues, $department); - push(@apvalues, $department); + push(@glvalues, $form->{department_id}); + push(@arvalues, $form->{department_id}); + push(@apvalues, $form->{department_id}); } if ($form->{source}) { $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} . '%'); + push(@glvalues, like($form->{source})); + push(@arvalues, like($form->{source})); + push(@apvalues, like($form->{source})); } - if ($form->{datefrom}) { - $glwhere .= " AND ac.transdate >= ?"; - $arwhere .= " AND ac.transdate >= ?"; - $apwhere .= " AND ac.transdate >= ?"; - push(@glvalues, $form->{datefrom}); - push(@arvalues, $form->{datefrom}); - push(@apvalues, $form->{datefrom}); + # default Datumseinschränkung falls nicht oder falsch übergeben (sollte nie passieren) + $form->{datesort} = 'transdate' unless $form->{datesort} =~ /^(transdate|gldate)$/; + + if (trim($form->{datefrom})) { + $glwhere .= " AND ac.$form->{datesort} >= ?"; + $arwhere .= " AND ac.$form->{datesort} >= ?"; + $apwhere .= " AND ac.$form->{datesort} >= ?"; + push(@glvalues, trim($form->{datefrom})); + push(@arvalues, trim($form->{datefrom})); + push(@apvalues, trim($form->{datefrom})); } - if ($form->{dateto}) { - $glwhere .= " AND ac.transdate <= ?"; - $arwhere .= " AND ac.transdate <= ?"; - $apwhere .= " AND ac.transdate <= ?"; - push(@glvalues, $form->{dateto}); - push(@arvalues, $form->{dateto}); - push(@apvalues, $form->{dateto}); + if (trim($form->{dateto})) { + $glwhere .= " AND ac.$form->{datesort} <= ?"; + $arwhere .= " AND ac.$form->{datesort} <= ?"; + $apwhere .= " AND ac.$form->{datesort} <= ?"; + push(@glvalues, trim($form->{dateto})); + push(@arvalues, trim($form->{dateto})); + push(@apvalues, trim($form->{dateto})); } - if ($form->{description}) { + if (trim($form->{description})) { $glwhere .= " AND g.description ILIKE ?"; $arwhere .= " AND ct.name ILIKE ?"; $apwhere .= " AND ct.name ILIKE ?"; - push(@glvalues, '%' . $form->{description} . '%'); - push(@arvalues, '%' . $form->{description} . '%'); - push(@apvalues, '%' . $form->{description} . '%'); + push(@glvalues, like($form->{description})); + push(@arvalues, like($form->{description})); + push(@apvalues, like($form->{description})); } - if ($form->{notes}) { + 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 (trim($form->{notes})) { $glwhere .= " AND g.notes ILIKE ?"; $arwhere .= " AND a.notes ILIKE ?"; $apwhere .= " AND a.notes ILIKE ?"; - push(@glvalues, '%' . $form->{notes} . '%'); - push(@arvalues, '%' . $form->{notes} . '%'); - push(@apvalues, '%' . $form->{notes} . '%'); + push(@glvalues, like($form->{notes})); + push(@arvalues, like($form->{notes})); + push(@apvalues, like($form->{notes})); + } + + if (trim($form->{transaction_description})) { + $glwhere .= " AND g.transaction_description ILIKE ?"; + $arwhere .= " AND a.transaction_description ILIKE ?"; + $apwhere .= " AND a.transaction_description ILIKE ?"; + push(@glvalues, like($form->{transaction_description})); + push(@arvalues, like($form->{transaction_description})); + push(@apvalues, like($form->{transaction_description})); } if ($form->{accno}) { @@ -294,10 +339,15 @@ sub all_transactions { push(@apvalues, $project_id, $project_id); } - my ($project_columns, %project_join); + my ($project_columns, $project_join); + my ($arap_globalproject_columns, $arap_globalproject_join); + my ($gl_globalproject_columns); 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)|; + $project_columns = qq|, ac.project_id, pr.projectnumber|; + $project_join = qq|LEFT JOIN project pr ON (ac.project_id = pr.id)|; + $arap_globalproject_columns = qq|, a.globalproject_id, globalpr.projectnumber AS globalprojectnumber|; + $arap_globalproject_join = qq|LEFT JOIN project globalpr ON (a.globalproject_id = globalpr.id)|; + $gl_globalproject_columns = qq|, NULL AS globalproject_id, '' AS globalprojectnumber|; } if ($form->{accno}) { @@ -310,28 +360,31 @@ sub all_transactions { 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 %sort_columns = ( - 'id' => [ qw(id) ], - 'transdate' => [ qw(transdate id) ], - 'reference' => [ qw(lower_reference id) ], - 'description' => [ qw(lower_description id) ], - 'accno' => [ qw(accno transdate id) ], + '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) ], + 'department' => [ qw(department transdate id) ], + 'transaction_description' => [ qw(lower_transaction_description 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', }, + 'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', }, + 'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', }, + 'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', }, + 'transaction_description' => { 'gl' => 'g.transaction_description', 'arap' => 'a.transaction_description', }, ); + # sortdir = sort direction (ascending or descending) my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; - my $sortkey = $sort_columns{$form->{sort}} ? $form->{sort} : 'transdate'; + 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' => '', ); @@ -342,14 +395,19 @@ sub all_transactions { 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 - $project_columns + 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, + d.description AS department, g.transaction_description, + CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee + $project_columns $gl_globalproject_columns $columns_for_sorting{gl} - FROM gl g, acc_trans ac $project_join, chart c + FROM gl g + LEFT JOIN employee e ON (g.employee_id = e.id) + LEFT JOIN department d ON (g.department_id = d.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) @@ -357,12 +415,18 @@ sub all_transactions { 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 - $project_columns + 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, + d.description AS department, a.transaction_description, + CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee + $project_columns $arap_globalproject_columns $columns_for_sorting{arap} - FROM ar a, acc_trans ac $project_join, customer ct, chart c + FROM ar a + LEFT JOIN employee e ON (a.employee_id = e.id) + LEFT JOIN department d ON (a.department_id = d.id) + $arap_globalproject_join, + 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) @@ -371,34 +435,42 @@ sub all_transactions { 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 - $project_columns + 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, + d.description AS department, a.transaction_description, + CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee + $project_columns $arap_globalproject_columns $columns_for_sorting{arap} - FROM ap a, acc_trans ac $project_join, vendor ct, chart c + FROM ap a + LEFT JOIN employee e ON (a.employee_id = e.id) + LEFT JOIN department d ON (a.department_id = d.id) + $arap_globalproject_join, + 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, acoid $sortdir|; + 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}; @@ -439,7 +511,8 @@ sub all_transactions { } $ref->{"projectnumbers"} = {}; - $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref->{"projectnumber"}} = 1 if ($ref->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref->{"globalprojectnumber"}} = 1 if ($ref->{"globalprojectnumber"}); $balance = $ref->{amount}; @@ -489,13 +562,14 @@ sub all_transactions { } 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 = (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000; - $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref2->{"projectnumber"}} = 1 if ($ref2->{"projectnumber"}); + $ref->{"projectnumbers"}->{$ref2->{"globalprojectnumber"}} = 1 if ($ref2->{"globalprojectnumber"}); if ($ref2->{chart_id} > 0) { # all tax accounts, following lines if ($ref2->{amount} < 0) { @@ -571,8 +645,6 @@ sub all_transactions { ($form->{account_description}) = selectrow_query($form, $dbh, $query, $form->{accno}); } - $dbh->disconnect; - $main::lxdebug->leave_sub(); } @@ -582,8 +654,7 @@ sub transaction { my ($query, $sth, $ref, @values); - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; $query = qq|SELECT closedto, revtrans FROM defaults|; ($form->{closedto}, $form->{revtrans}) = selectrow_query($form, $dbh, $query); @@ -595,9 +666,12 @@ sub transaction { 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, - g.ob_transaction, g.cb_transaction + qq|SELECT g.reference, g.description, g.notes, g.transdate, g.deliverydate, g.tax_point, + g.storno, g.storno_id, + g.department_id, d.description AS department, + e.name AS employee, g.taxincluded, g.gldate, + g.ob_transaction, g.cb_transaction, + g.transaction_description FROM gl g LEFT JOIN department d ON (d.id = g.department_id) LEFT JOIN employee e ON (e.id = g.employee_id) @@ -609,7 +683,7 @@ sub transaction { $query = qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo, a.source, a.transdate, a.cleared, a.project_id, p.projectnumber, - a.taxkey, t.rate AS taxrate, t.id, + a.taxkey, t.rate AS taxrate, t.id, a.chart_id, (SELECT c1.accno FROM chart c1, tax t1 WHERE (t1.id = t.id) AND (c1.id = t.chart_id)) AS taxaccno, @@ -620,22 +694,10 @@ sub transaction { 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 { @@ -667,18 +729,24 @@ sub transaction { ORDER BY c.accno|; $form->{chart} = selectall_hashref_query($form, $dbh, $query, conv_date($form->{transdate})); - $dbh->disconnect; - $main::lxdebug->leave_sub(); } sub storno { + my ($self, $form, $myconfig, $id) = @_; $main::lxdebug->enter_sub(); + my $rc = SL::DB->client->with_transaction(\&_storno, $self, $form, $myconfig, $id); + + $::lxdebug->leave_sub; + return $rc; +} + +sub _storno { my ($self, $form, $myconfig, $id) = @_; my ($query, $new_id, $storno_row, $acc_trans_rows); - my $dbh = $form->get_standard_dbh($myconfig); + my $dbh = SL::DB->client->dbh; $query = qq|SELECT nextval('glid')|; ($new_id) = selectrow_query($form, $dbh, $query); @@ -686,12 +754,16 @@ sub storno { $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)); @@ -701,19 +773,106 @@ sub storno { # 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; do_query($form, $dbh, $query, (values %$row)); } - $dbh->commit; + return 1; +} - $main::lxdebug->leave_sub(); +sub get_chart_balances { + my ($self, @chart_ids) = @_; + + return () unless @chart_ids; + + my $placeholders = join ', ', ('?') x scalar(@chart_ids); + my $query = qq|SELECT chart_id, SUM(amount) AS sum + FROM acc_trans + WHERE chart_id IN (${placeholders}) + GROUP BY chart_id|; + + my %balances = selectall_as_map($::form, $::form->get_standard_dbh(\%::myconfig), $query, 'chart_id', 'sum', @chart_ids); + + return %balances; +} + +sub get_active_taxes_for_chart { + my ($self, $chart_id, $transdate, $tax_id) = @_; + + my $chart = SL::DB::Chart->new(id => $chart_id)->load; + my $active_taxkey = $chart->get_active_taxkey($transdate); + + my $where = [ chart_categories => { like => '%' . $chart->category . '%' } ]; + + if ( defined $tax_id && $tax_id >= 0 ) { + $where = [ or => [ chart_categories => { like => '%' . $chart->category . '%' }, + id => $tax_id + ] + ]; + } + + my $taxes = SL::DB::Manager::Tax->get_all( + where => $where, + sort_by => 'taxkey, rate', + ); + + my $default_tax = first { $active_taxkey->tax_id == $_->id } @{ $taxes }; + $default_tax->{is_default} = 1 if $default_tax; + + return @{ $taxes }; } 1; + +__END__ + +=pod + +=encoding utf8 + +=head1 NAME + +SL::GL - some useful GL functions + +=head1 FUNCTIONS + +=over 4 + +=item C $transdate $tax_id + +Returns a list of valid taxes for a certain chart. + +If the optional param transdate exists one entry in the returning list +may get the attribute C for this specific tax-dependent date. +The possible entries are filtered by the charttype of the tax, i.e. only taxes +whose chart_categories match the category of the chart will be shown. + +In the case of existing records, e.g. when opening an old ar record, due to +changes in the configurations the desired tax might not be available in the +dropdown anymore. If we are loading an old record and know its tax_id (from +acc_trans), we can pass $tax_id as the third parameter and be sure that the +original tax always appears in the dropdown. + +The functions returns an array which may be used for building dropdowns in ar/ap/gl code. + +=back + +=head1 TODO + +Nothing here yet. + +=head1 BUGS + +Nothing here yet. + +=head1 AUTHOR + +G. Richardson Egrichardson@kivitec.deE + +=cut