From a304d5faac8b7cb752c8510e3bcdc8b359d9ddf8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 12 Mar 2009 14:57:01 +0000 Subject: [PATCH] =?utf8?q?Whitespace=20Purge=20f=C3=BCr=20Bugfixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/RP.pm | 16 ++++++++-------- bin/mozilla/rp.pl | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/SL/RP.pm b/SL/RP.pm index f8fd245a8..d9a09eec5 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -642,7 +642,7 @@ sub get_accounts_g { WHERE $where $dpt_where AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category UNION @@ -654,7 +654,7 @@ sub get_accounts_g { WHERE $where $dpt_where AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category UNION @@ -663,7 +663,7 @@ sub get_accounts_g { JOIN chart c ON (c.id = ac.chart_id) JOIN gl a ON (a.id = ac.trans_id) $dpt_join - WHERE $where $dpt_where $glwhere + WHERE $where $dpt_where $glwhere AND NOT ((c.link = 'AR') OR (c.link = 'AP')) $project GROUP BY c.$category @@ -682,7 +682,7 @@ sub get_accounts_g { WHERE (c.category = 'I') $prwhere $dpt_where AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AR_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category UNION @@ -695,7 +695,7 @@ sub get_accounts_g { WHERE (c.category = 'E') $prwhere $dpt_where AND ac.trans_id IN ( SELECT trans_id FROM acc_trans JOIN chart ON (chart_id = id) WHERE (link LIKE '%AP_paid%') $subwhere) $project - GROUP BY c.$category + GROUP BY c.$category |; } @@ -829,7 +829,7 @@ sub trial_balance { if ($ref->{amount} != 0 || $form->{all_accounts}) { $trb{ $ref->{accno} }{description} = $ref->{description}; $trb{ $ref->{accno} }{charttype} = 'A'; - + if ($ref->{amount} > 0) { $trb{ $ref->{accno} }{haben_eb} = $ref->{amount}; } else { @@ -918,7 +918,7 @@ sub trial_balance { (ac.trans_id in (SELECT id from gl) $glwhere) )|; - $saldowhere .= + $saldowhere .= qq| AND ((ac.trans_id IN (SELECT id from ar) AND ac.trans_id IN ( @@ -944,7 +944,7 @@ qq| AND ((ac.trans_id IN (SELECT id from ar) AND (ac.trans_id in (SELECT id from gl) $glsaldowhere) )|; - $sumwhere .= + $sumwhere .= qq| AND ((ac.trans_id IN (SELECT id from ar) AND ac.trans_id IN ( diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 6c8562b46..2b927855f 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -464,7 +464,7 @@ $checked> | . $locale->text('Decimalplaces') . qq| - + $jsscript |; } @@ -601,7 +601,7 @@ $jsscript | . $locale->text('Decimalplaces') . qq| - + $jsscript |; } @@ -1167,37 +1167,37 @@ sub generate_balance_sheet { my $edit_url = build_std_url('action=edit', 'type', 'vc'); # foreach $accno (@{ $form->{TB} }) { -# +# # $accno->{soll} = $accno->{debit}; # $accno->{haben} = $accno->{credit}; # map { $totals{$_} += $accno->{$_} } @subtotal_columns; -# +# # map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); -# +# # map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); -# +# # my $row = { }; -# +# # foreach my $column (@columns) { # $row->{$column} = { # 'data' => $accno->{$column}, # 'align' => $column_alignment{$column}, # }; # } -# -# +# +# # $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; -# +# # my $row_set = [ $row ]; -# -# +# +# # $report->add_data($row_set); -# +# # $idx++; # } -# +# # $report->add_separator(); -# +# # $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); $report->generate_with_headers(); @@ -2063,7 +2063,7 @@ sub print_form { $form->{what_done} = $form->{type}; $form->save_history($form->dbconnect(\%myconfig)); } - # /saving the history + # /saving the history $lxdebug->leave_sub(); } -- 2.20.1