Revision 25517b3d
Von Bernd Bleßmann vor mehr als 5 Jahren hinzugefügt
SL/AP.pm | ||
---|---|---|
454 | 454 |
qq| v.vendornumber, v.country, v.ustid, | . |
455 | 455 |
qq| tz.description AS taxzone, | . |
456 | 456 |
qq| pt.description AS payment_terms, | . |
457 |
qq| department.description AS department, | . |
|
457 | 458 |
qq{ ( SELECT ch.accno || ' -- ' || ch.description |
458 | 459 |
FROM acc_trans at |
459 | 460 |
LEFT JOIN chart ch ON ch.id = at.chart_id |
... | ... | |
467 | 468 |
qq|LEFT JOIN employee e ON (a.employee_id = e.id) | . |
468 | 469 |
qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) | . |
469 | 470 |
qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| . |
470 |
qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)|; |
|
471 |
qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| . |
|
472 |
qq|LEFT JOIN department ON (department.id = a.department_id)|; |
|
471 | 473 |
|
472 | 474 |
my $where = ''; |
473 | 475 |
|
... | ... | |
590 | 592 |
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; |
591 | 593 |
my $sortorder = join(', ', map { "$_ $sortdir" } @a); |
592 | 594 |
|
593 |
if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit))) { |
|
595 |
if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit department))) {
|
|
594 | 596 |
$sortorder = $form->{sort} . " $sortdir"; |
595 | 597 |
} |
596 | 598 |
|
bin/mozilla/ap.pl | ||
---|---|---|
1001 | 1001 |
|
1002 | 1002 |
my @columns = |
1003 | 1003 |
qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid |
1004 |
due duedate transaction_description notes employee globalprojectnumber |
|
1004 |
due duedate transaction_description notes employee globalprojectnumber department
|
|
1005 | 1005 |
vendornumber country ustid taxzone payment_terms charts direct_debit); |
1006 | 1006 |
|
1007 | 1007 |
my @hidden_variables = map { "l_${_}" } @columns; |
... | ... | |
1028 | 1028 |
'notes' => { 'text' => $locale->text('Notes'), }, |
1029 | 1029 |
'employee' => { 'text' => $locale->text('Employee'), }, |
1030 | 1030 |
'globalprojectnumber' => { 'text' => $locale->text('Document Project Number'), }, |
1031 |
'department' => { 'text' => $locale->text('Department'), }, |
|
1031 | 1032 |
'vendornumber' => { 'text' => $locale->text('Vendor Number'), }, |
1032 | 1033 |
'country' => { 'text' => $locale->text('Country'), }, |
1033 | 1034 |
'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, |
... | ... | |
1037 | 1038 |
'direct_debit' => { 'text' => $locale->text('direct debit'), }, |
1038 | 1039 |
); |
1039 | 1040 |
|
1040 |
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit)) { |
|
1041 |
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {
|
|
1041 | 1042 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
1042 | 1043 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
1043 | 1044 |
} |
templates/webpages/ap/search.html | ||
---|---|---|
103 | 103 |
<td nowrap>[% 'Notes' | $T8 %]</td> |
104 | 104 |
<td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td> |
105 | 105 |
<td nowrap>[% 'Employee' | $T8 %]</td> |
106 |
<td align=right><input name="l_department" class=checkbox type=checkbox value=Y></td> |
|
107 |
<td nowrap>[% 'Department' | $T8 %]</td> |
|
106 | 108 |
</tr> |
107 | 109 |
<tr> |
108 | 110 |
<td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td> |
Auch abrufbar als: Unified diff
Bericht EK-Rg/Kreditorenbuchungen: Abteilungen anzeigen können