Revision c98c318c
Von Moritz Bunkus vor mehr als 9 Jahren hinzugefügt
SL/AP.pm | ||
---|---|---|
416 | 416 |
my $query = |
417 | 417 |
qq|SELECT a.id, a.invnumber, a.transdate, a.duedate, a.amount, a.paid, | . |
418 | 418 |
qq| a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | . |
419 |
qq| a.globalproject_id, a.storno, a.storno_id, | . |
|
419 |
qq| a.globalproject_id, a.storno, a.storno_id, a.direct_debit, | .
|
|
420 | 420 |
qq| pr.projectnumber AS globalprojectnumber, | . |
421 | 421 |
qq| e.name AS employee, | . |
422 | 422 |
qq| v.vendornumber, v.country, v.ustid, | . |
... | ... | |
513 | 513 |
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; |
514 | 514 |
my $sortorder = join(', ', map { "$_ $sortdir" } @a); |
515 | 515 |
|
516 |
if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description))) { |
|
516 |
if (grep({ $_ eq $form->{sort} } qw(transdate id invnumber ordnumber name netamount tax amount paid datepaid due duedate notes employee transaction_description direct_debit))) {
|
|
517 | 517 |
$sortorder = $form->{sort} . " $sortdir"; |
518 | 518 |
} |
519 | 519 |
|
bin/mozilla/ap.pl | ||
---|---|---|
871 | 871 |
my @columns = |
872 | 872 |
qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid |
873 | 873 |
due duedate transaction_description notes employee globalprojectnumber |
874 |
vendornumber country ustid taxzone payment_terms charts); |
|
874 |
vendornumber country ustid taxzone payment_terms charts direct_debit);
|
|
875 | 875 |
|
876 | 876 |
my @hidden_variables = map { "l_${_}" } @columns; |
877 | 877 |
push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto department); |
... | ... | |
902 | 902 |
'taxzone' => { 'text' => $locale->text('Steuersatz'), }, |
903 | 903 |
'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, |
904 | 904 |
'charts' => { 'text' => $locale->text('Buchungskonto'), }, |
905 |
'direct_debit' => { 'text' => $locale->text('direct debit'), }, |
|
905 | 906 |
); |
906 | 907 |
|
907 |
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) { |
|
908 |
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit)) {
|
|
908 | 909 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
909 | 910 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
910 | 911 |
} |
... | ... | |
980 | 981 |
: $locale->text("AP Transaction (abbreviation)"); |
981 | 982 |
} |
982 | 983 |
|
984 |
$ap->{direct_debit} = $ap->{direct_debit} ? $::locale->text('yes') : $::locale->text('no'); |
|
985 |
|
|
983 | 986 |
my $row = { }; |
984 | 987 |
|
985 | 988 |
foreach my $column (@columns) { |
templates/webpages/ap/search.html | ||
---|---|---|
150 | 150 |
<td nowrap>[% 'Payment Terms' | $T8 %]</td> |
151 | 151 |
<td align=right><input name="l_charts" class=checkbox type=checkbox value=Y></td> |
152 | 152 |
<td nowrap>[% 'Buchungskonto' | $T8 %]</td> |
153 |
<td align=right><input name="l_direct_debit" id="l_direct_debit" class=checkbox type=checkbox value=Y></td> |
|
154 |
<td nowrap>[% 'direct debit' | $T8 %]</td> |
|
153 | 155 |
</tr> |
154 | 156 |
<tr> |
155 | 157 |
<td colspan=4 align=left><b>[% 'Vendor' | $T8 %] </td> |
Auch abrufbar als: Unified diff
Einkaufsrechnungssuche: Spalte Lastschrifteinzug optional anzeigen