Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 29bed1cf

Von Bernd Bleßmann vor etwa 4 Jahren hinzugefügt

Buchungsjournal: auch globale Projektnummer im Bericht mit anzeigen

Unterschiede anzeigen:

SL/GL.pm
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}) {
......
ac.amount, c.accno, g.notes, t.chart_id,
d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
$project_columns $gl_globalproject_columns
$columns_for_sorting{gl}
FROM gl g
LEFT JOIN employee e ON (g.employee_id = e.id)
......
ac.amount, c.accno, a.notes, t.chart_id,
d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
$project_columns $arap_globalproject_columns
$columns_for_sorting{arap}
FROM ar a
LEFT JOIN employee e ON (a.employee_id = e.id)
LEFT JOIN department d ON (a.department_id = d.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
......
ac.amount, c.accno, a.notes, t.chart_id,
d.description AS department,
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
$project_columns
$project_columns $arap_globalproject_columns
$columns_for_sorting{arap}
FROM ap a
LEFT JOIN employee e ON (a.employee_id = e.id)
LEFT JOIN department d ON (a.department_id = d.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
......
}
$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};
......
$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) {

Auch abrufbar als: Unified diff