X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCA.pm;h=019d44f49ca7e17120756ed1402e577418ba3406;hb=d58f0807a72e7a791cded47b057e5f20116ca13f;hp=52d2b0bafb7102322e9a12d0083f7144d73bb3fd;hpb=74fca575d438232002756175338c23f55b8a6c12;p=kivitendo-erp.git diff --git a/SL/CA.pm b/SL/CA.pm index 52d2b0baf..019d44f49 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -1,4 +1,4 @@ - #===================================================================== +#===================================================================== # LX-Office ERP # Copyright (C) 2004 # Based on SQL-Ledger Version 2.1.9 @@ -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. #====================================================================== # chart of accounts # @@ -40,6 +41,7 @@ use strict; package CA; use Data::Dumper; use SL::DBUtils; +use SL::DB; sub all_accounts { $main::lxdebug->enter_sub(); @@ -49,7 +51,7 @@ sub all_accounts { my (%amount, $acc_cash_where); # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; # bug 1071 Warum sollte bei Erreichen eines neuen Jahres die Kontenübersicht nur noch die # bereits bebuchten Konten anzeigen? @@ -99,11 +101,11 @@ sub all_accounts { c.pos_eur, c.valid_from, c.datevautomatik, - comma(tk.startdate::text) AS startdate, - comma(tk.taxkey_id::text) AS taxkey, - comma(tx.taxdescription || to_char (tx.rate, '99V99' ) || '%') AS taxdescription, - comma(tx.taxnumber::text) AS taxaccount, - comma(tk.pos_ustva::text) AS tk_ustva, + array_agg(tk.startdate) AS startdates, + array_agg(tk.taxkey_id) AS taxkeys, + array_agg(tx.taxdescription || to_char (tx.rate, '99V99' ) || '%') AS taxdescriptions, + array_agg(taxchart.accno) AS taxaccounts, + array_agg(tk.pos_ustva) AS pos_ustvas, ( SELECT accno FROM chart c2 WHERE c2.id = c.id @@ -111,9 +113,10 @@ sub all_accounts { FROM chart c LEFT JOIN taxkeys tk ON (c.id = tk.chart_id) LEFT JOIN tax tx ON (tk.tax_id = tx.id) + LEFT JOIN chart taxchart ON (taxchart.id = tx.chart_id) WHERE 1=1 $where - GROUP BY c.accno, c.id, c.description, c.charttype, c.gifi_accno, + GROUP BY c.accno, c.id, c.description, c.charttype, c.category, c.link, c.pos_bwa, c.pos_bilanz, c.pos_eur, c.valid_from, c.datevautomatik ORDER BY c.accno @@ -134,7 +137,6 @@ sub all_accounts { } $sth->finish; - $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -144,8 +146,7 @@ sub all_transactions { my ($self, $myconfig, $form) = @_; - # connect to database - my $dbh = $form->dbconnect($myconfig); + my $dbh = SL::DB->client->dbh; # get chart_id my $query = qq|SELECT id FROM chart WHERE accno = ?|; @@ -182,13 +183,6 @@ sub all_transactions { my $sortorder = join ', ', $form->sort_columns(qw(transdate reference description)); - my $false = ($myconfig->{dbdriver} eq 'Pg') ? "FALSE" : q|'0'|; - - # Oracle workaround, use ordinal positions - my %ordinal = (transdate => 4, - reference => 2, - description => 3); - map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal; my ($null, $department_id) = split(/--/, $form->{department}); my ($dpt_where, $dpt_join, @department_values); @@ -203,22 +197,6 @@ sub all_transactions { $project = qq| AND ac.project_id = ? |; @project_values = (conv_i($form->{project_id})); } - my $acc_cash_where = ""; - my $ar_cash_where = ""; - my $ap_cash_where = ""; - - - if ($form->{method} eq "cash") { - $where = qq| (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM ap WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM gl WHERE transdate>= ? AND transdate<= ?)) |; - @where_values = (); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - push(@where_values, conv_date($form->{fromdate})); - push(@where_values, conv_date($form->{todate})); - } - if ($form->{accno}) { @@ -287,8 +265,8 @@ sub all_transactions { # get all transactions $query = - qq|SELECT a.id, a.reference, a.description, ac.transdate, ac.chart_id, | . - qq| $false AS invoice, ac.amount, 'gl' as module, | . + qq|SELECT ac.itime, a.id, a.reference, a.description, ac.transdate, ac.chart_id, | . + qq| FALSE AS invoice, ac.amount, 'gl' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, gl a | . $dpt_join . @@ -299,7 +277,7 @@ sub all_transactions { qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, c.name, ac.transdate, ac.chart_id, | . + qq|SELECT ac.itime, a.id, a.invnumber, c.name, ac.transdate, ac.chart_id, | . qq| a.invoice, ac.amount, 'ar' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, customer c, ar a | . @@ -312,7 +290,7 @@ sub all_transactions { qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, v.name, ac.transdate, ac.chart_id, | . + qq|SELECT ac.itime, a.id, a.invnumber, v.name, ac.transdate, ac.chart_id, | . qq| a.invoice, ac.amount, 'ap' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, vendor v, ap a | . @@ -339,16 +317,16 @@ sub all_transactions { # RP->trial_balance() I tried to figure out which bizarre flow through the # program would happen to set that var, so that it would be used here later on, # (which would be nonsense, since you would normally load chart before -# claculating balance of said charts) and then decided that any mechanic that +# calculating balance of said charts) and then decided that any mechanic that # complex should fail anyway. -# if anyone is missing a time check on charts, that broke arounf the time +# if anyone is missing a time check on charts, that broke around the time # trial_balance was rewritten, this would be it $query .= qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, c.name, a.transdate, | . + qq|SELECT ac.itime, a.id, a.invnumber, c.name, a.transdate, | . qq| a.invoice, ac.qty * ac.sellprice AS sellprice, 'ar' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § . qq|FROM ar a | . @@ -363,7 +341,7 @@ sub all_transactions { $project . qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, v.name, a.transdate, | . + qq|SELECT ac.itime, a.id, a.invnumber, v.name, a.transdate, | . qq| a.invoice, ac.qty * ac.sellprice AS sellprice, 'ap' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § . qq|FROM ap a | . @@ -389,8 +367,9 @@ sub all_transactions { } my $sort = grep({ $form->{sort} eq $_ } qw(transdate reference description)) ? $form->{sort} : 'transdate'; - - $query .= qq|ORDER BY $sort|; + $sort = ($sort eq 'transdate') ? 'transdate, itime' : $sort; + my $sort2 = ($sort eq 'reference') ? 'transdate, itime' : 'reference'; + $query .= qq|ORDER BY $sort , $sort2 |; my $sth = prepare_execute_query($form, $dbh, $query, @values); #get detail information for each transaction @@ -447,7 +426,6 @@ sub all_transactions { } $sth->finish; - $dbh->disconnect; $main::lxdebug->leave_sub(); }