Revision c49684f8
Von Bernd Bleßmann vor fast 3 Jahren hinzugefügt
| SL/GL.pm | ||
|---|---|---|
| 301 | 301 |
push(@apvalues, like($form->{notes}));
|
| 302 | 302 |
} |
| 303 | 303 |
|
| 304 |
if (trim($form->{transaction_description})) {
|
|
| 305 |
$glwhere .= " AND g.transaction_description ILIKE ?"; |
|
| 306 |
$arwhere .= " AND a.transaction_description ILIKE ?"; |
|
| 307 |
$apwhere .= " AND a.transaction_description ILIKE ?"; |
|
| 308 |
push(@glvalues, like($form->{transaction_description}));
|
|
| 309 |
push(@arvalues, like($form->{transaction_description}));
|
|
| 310 |
push(@apvalues, like($form->{transaction_description}));
|
|
| 311 |
} |
|
| 312 |
|
|
| 304 | 313 |
if ($form->{accno}) {
|
| 305 | 314 |
$glwhere .= " AND c.accno = '$form->{accno}'";
|
| 306 | 315 |
$arwhere .= " AND c.accno = '$form->{accno}'";
|
| ... | ... | |
| 364 | 373 |
'description' => [ qw(lower_description id) ], |
| 365 | 374 |
'accno' => [ qw(accno transdate id) ], |
| 366 | 375 |
'department' => [ qw(department transdate id) ], |
| 376 |
'transaction_description' => [ qw(lower_transaction_description id) ], |
|
| 367 | 377 |
); |
| 368 | 378 |
my %lowered_columns = ( |
| 369 | 379 |
'reference' => { 'gl' => 'g.reference', 'arap' => 'a.invnumber', },
|
| 370 | 380 |
'source' => { 'gl' => 'ac.source', 'arap' => 'ac.source', },
|
| 371 | 381 |
'description' => { 'gl' => 'g.description', 'arap' => 'ct.name', },
|
| 382 |
'transaction_description' => { 'gl' => 'g.transaction_description', 'arap' => 'a.transaction_description', },
|
|
| 372 | 383 |
); |
| 373 | 384 |
|
| 374 | 385 |
# sortdir = sort direction (ascending or descending) |
| ... | ... | |
| 389 | 400 |
ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link, |
| 390 | 401 |
g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id, |
| 391 | 402 |
ac.amount, c.accno, g.notes, t.chart_id, |
| 392 |
d.description AS department, |
|
| 403 |
d.description AS department, g.transaction_description,
|
|
| 393 | 404 |
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee |
| 394 | 405 |
$project_columns $gl_globalproject_columns |
| 395 | 406 |
$columns_for_sorting{gl}
|
| ... | ... | |
| 407 | 418 |
SELECT ac.acc_trans_id, a.id, 'ar' AS type, a.invoice, a.invnumber, ac.taxkey, c.link, |
| 408 | 419 |
ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id, |
| 409 | 420 |
ac.amount, c.accno, a.notes, t.chart_id, |
| 410 |
d.description AS department, |
|
| 421 |
d.description AS department, a.transaction_description,
|
|
| 411 | 422 |
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee |
| 412 | 423 |
$project_columns $arap_globalproject_columns |
| 413 | 424 |
$columns_for_sorting{arap}
|
| ... | ... | |
| 427 | 438 |
SELECT ac.acc_trans_id, a.id, 'ap' AS type, a.invoice, a.invnumber, ac.taxkey, c.link, |
| 428 | 439 |
ct.name, ac.transdate, ac.gldate, ac.source, ac.trans_id, |
| 429 | 440 |
ac.amount, c.accno, a.notes, t.chart_id, |
| 430 |
d.description AS department, |
|
| 441 |
d.description AS department, a.transaction_description,
|
|
| 431 | 442 |
CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee |
| 432 | 443 |
$project_columns $arap_globalproject_columns |
| 433 | 444 |
$columns_for_sorting{arap}
|
Auch abrufbar als: Unified diff
Buchungsjournal: Vorgangsbezeichnung anzeigen und danach filtern können