Revision f89cce75
Von Bernd Bleßmann vor etwa 4 Jahren hinzugefügt
SL/AR.pm | ||
---|---|---|
481 | 481 |
|
482 | 482 |
my $query = |
483 | 483 |
qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | . |
484 |
qq| a.donumber, a.deliverydate, | . |
|
484 | 485 |
qq| a.duedate, a.netamount, a.amount, a.paid, | . |
485 | 486 |
qq| a.invoice, a.datepaid, a.notes, a.shipvia, | . |
486 | 487 |
qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | . |
... | ... | |
682 | 683 |
my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; |
683 | 684 |
my $sortorder = join(', ', map { "$_ $sortdir" } @a); |
684 | 685 |
|
685 |
if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description department))) { |
|
686 |
if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description department))) {
|
|
686 | 687 |
$sortorder = $form->{sort} . " $sortdir"; |
687 | 688 |
} |
688 | 689 |
|
bin/mozilla/ar.pl | ||
---|---|---|
1010 | 1010 |
my $report = SL::ReportGenerator->new(\%myconfig, $form); |
1011 | 1011 |
|
1012 | 1012 |
@columns = |
1013 |
qw(ids transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid |
|
1013 |
qw(ids transdate id type invnumber ordnumber cusordnumber donumber deliverydate name netamount tax amount paid
|
|
1014 | 1014 |
datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia |
1015 | 1015 |
marge_total marge_percent globalprojectnumber customernumber country ustid taxzone |
1016 | 1016 |
payment_terms charts customertype direct_debit dunning_description department); |
... | ... | |
1037 | 1037 |
'invnumber' => { 'text' => $locale->text('Invoice'), }, |
1038 | 1038 |
'ordnumber' => { 'text' => $locale->text('Order'), }, |
1039 | 1039 |
'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), }, |
1040 |
'donumber' => { 'text' => $locale->text('Delivery Order'), }, |
|
1041 |
'deliverydate' => { 'text' => $locale->text('Delivery Date'), }, |
|
1040 | 1042 |
'name' => { 'text' => $locale->text('Customer'), }, |
1041 | 1043 |
'netamount' => { 'text' => $locale->text('Amount'), }, |
1042 | 1044 |
'tax' => { 'text' => $locale->text('Tax'), }, |
... | ... | |
1067 | 1069 |
%column_defs_cvars, |
1068 | 1070 |
); |
1069 | 1071 |
|
1070 |
foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) { |
|
1072 |
foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {
|
|
1071 | 1073 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
1072 | 1074 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
1073 | 1075 |
} |
templates/webpages/ar/search.html | ||
---|---|---|
135 | 135 |
<td nowrap>[% 'Customer Number' | $T8 %]</td> |
136 | 136 |
<td align=right><input name="l_department" id="l_department" class=checkbox type=checkbox value=Y></td> |
137 | 137 |
<td nowrap>[% 'Department' | $T8 %]</td> |
138 |
|
|
139 | 138 |
</tr> |
139 |
<tr> |
|
140 |
<td align=right><input name="l_donumber" id="l_donumber" class=checkbox type=checkbox value=Y></td> |
|
141 |
<td nowrap>[% 'Delivery Order Number' | $T8 %]</td> |
|
142 |
<td align=right><input name="l_deliverydate" id="l_deliverydate" class=checkbox type=checkbox value=Y></td> |
|
143 |
<td nowrap>[% 'Delivery Date' | $T8 %]</td> |
|
140 | 144 |
<tr> |
141 | 145 |
<td align=right><input name="l_netamount" id="l_netamount" class=checkbox type=checkbox value="Y" checked></td> |
142 | 146 |
<td nowrap>[% 'Amount' | $T8 %]</td> |
Auch abrufbar als: Unified diff
VK-Rechnungsbericht: Lieferscheinnummer und Lieferdatum anzeigen können