use SL::DBUtils;
use Data::Dumper;
use List::Util qw(sum);
-# use strict;
-# use warnings;
+# use warnings;
+use strict;
# new implementation of balance sheet
# readme!
}
if ($form->{project_id}) {
+ # Diese Bedingung wird derzeit niemals wahr sein, da man in Bericht->Bilanz keine
+ # Projekte auswählen kann
$project = qq| AND (ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
}
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AR_paid%')
$subwhere
)
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AP_paid%')
$subwhere
)
GROUP BY c.accno, c.description, c.category |;
if ($form->{project_id}) {
+ # s.o. keine Projektauswahl in Bilanz
$query .=
qq|
UNION ALL
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%AR_paid%')
$subwhere
)
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE link LIKE '%AP_paid%'
$subwhere
)
}
} else { # if ($form->{method} eq 'cash')
- if ($department_id) {
- $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
- $dpt_where = qq| AND t.department_id = $department_id |;
- }
+ # ich sehe keinen sinn das nochmal explizit ohne conv_i aufzurufen
+ # bitte prüfen und löschen jan 15.11.2009
+ # if ($department_id) {
+ # $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
+ # $dpt_where = qq| AND t.department_id = $department_id |;
+ # }
$query = qq|
SELECT c.accno, sum(ac.amount) AS amount, c.description, c.category
GROUP BY c.accno, c.description, c.category |;
if ($form->{project_id}) {
+ # s.o. keine Projektauswahl in Bilanz
$query .= qq|
UNION ALL
my $glwhere = "";
my $prwhere = "";
my $subwhere = "";
+ my $inwhere = "";
my $item;
if ($fromdate) {
JOIN ar a ON (a.id = ac.trans_id)
$dpt_join
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)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
$project
GROUP BY c.$category
*/
JOIN ap a ON (a.id = ac.trans_id)
$dpt_join
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)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
$project
GROUP BY c.$category
JOIN chart c on (p.income_accno_id = c.id)
$dpt_join
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)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AR_paid%') $subwhere)
$project
GROUP BY c.$category
JOIN chart c on (p.expense_accno_id = c.id)
$dpt_join
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)
+ AND ac.trans_id IN ( SELECT trans_id FROM acc_trans a JOIN chart c ON (a.chart_id = c.id) WHERE (link LIKE '%AP_paid%') $subwhere)
$project
GROUP BY c.$category
|;
}
} else { # if ($form->{method} eq 'cash')
- if ($department_id) {
- $dpt_join = qq| JOIN dpt_trans t ON (t.trans_id = ac.trans_id) |;
- $dpt_where = qq| AND (t.department_id = | . conv_i($department_id, 'NULL') . qq|) |;
- }
+ # s.o. jan 15.11.2009
+# if ($department_id) {
+# ($dpt_join, $dpt_where) = sql_department($department_id);
+# }
$query = qq|
SELECT sum(ac.amount * chart_category_to_sgn(c.category)) AS amount, c.$category
my $glwhere = '';
my $glsumwhere = '';
my $tofrom;
+ my ($fromdate, $todate);
if ($form->{fromdate} || $form->{todate}) {
if ($form->{fromdate}) {
AND (exchangerate.transdate = ${arap}.transdate)) AS exchangerate
FROM ${arap}, ${ct}
WHERE ((paid != amount) OR (datepaid > (date $todate) AND datepaid is not null))
- AND (${arap}.storno IS FALSE)
+ AND NOT COALESCE (${arap}.storno, 'f')
AND (${arap}.${ct}_id = ${ct}.id)
AND (${ct}.id = ?)
AND (transdate <= (date $todate) $fromwhere )
AND ac.trans_id IN
(
SELECT trans_id
- FROM acc_trans
- JOIN chart ON (chart_id = id)
+ FROM acc_trans a
+ JOIN chart c ON (a.chart_id = c.id)
WHERE (link LIKE '%${ARAP}_paid%')
AND (transdate <= $todate)
)
&get_accounts_g($dbh, $last_period, $form->{fromdate}, $form->{todate}, $form, "pos_ustva");
# foreach $item (@categories_cent) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
# foreach $item (@categories_euro) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # } foreach $item (@categories_cent) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # } foreach $item (@categories_cent) {
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
# foreach $item (@categories_euro) {
- # if ($form->{$item}{"jetzt"} > 0) {
- # $form->{$item} = $form->{$item}{"jetzt"};
- # delete $form->{$item}{"jetzt"};
- # }
+ # if ($form->{$item}{"jetzt"} > 0) {
+ # $form->{$item} = $form->{$item}{"jetzt"};
+ # delete $form->{$item}{"jetzt"};
+ # }
# }
#
# }