Revision 7e4b86b1
Von G. Richardson vor mehr als 13 Jahren hinzugefügt
bin/mozilla/vk.pl | ||
---|---|---|
125 | 125 |
$form->{title} = $locale->text('Sales Report'); |
126 | 126 |
|
127 | 127 |
@columns = |
128 |
qw(description invnumber partnumber parts_id transdate qty unit sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent);
|
|
128 |
qw(description invnumber transdate customernumber partnumber transdate qty unit sellprice sellprice_total discount lastcost lastcost_total marge_total marge_percent);
|
|
129 | 129 |
|
130 | 130 |
# hidden variables für pdf/csv export übergeben |
131 | 131 |
# einmal mit l_ um zu bestimmen welche Spalten ausgegeben werden sollen |
132 | 132 |
# einmal optionen für die Überschrift (z.B. transdatefrom, partnumber, ...) |
133 |
my @hidden_variables = (qw(l_headers l_subtotal l_total transdatefrom transdateto decimalplaces customer customername customer_id department partnumber description project_id), "$form->{db}number", map { "l_$_" } @columns);
|
|
133 |
my @hidden_variables = (qw(l_headers l_subtotal l_total l_customernumber transdatefrom transdateto decimalplaces customer customername customer_id department partnumber description project_id customernumber), "$form->{db}number", map { "l_$_" } @columns);
|
|
134 | 134 |
my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables); |
135 | 135 |
# Variablen werden dann als Hidden Variable mitgegeben, z.B. |
136 | 136 |
# <input type="hidden" name="report_generator_hidden_transdateto" value="21.05.2010"> |
... | ... | |
152 | 152 |
'lastcost' => { 'text' => $locale->text('Purchase price'), }, |
153 | 153 |
'marge_total' => { 'text' => $locale->text('Sales margin'), }, |
154 | 154 |
'marge_percent' => { 'text' => $locale->text('Sales margin %'), }, |
155 |
'customernumber' => { 'text' => $locale->text('Customer Number'), }, |
|
155 | 156 |
); |
156 | 157 |
|
157 | 158 |
my %column_alignment = map { $_ => 'right' } qw(lastcost sellprice sellprice_total lastcost_total unit discount marge_total marge_percent qty); |
... | ... | |
167 | 168 |
if ($form->{customer}) { |
168 | 169 |
push @options, $locale->text('Customer') . " : $form->{customername}"; |
169 | 170 |
} |
171 |
if ($form->{customernumber}) { |
|
172 |
push @options, $locale->text('Customer Number') . " : $form->{customernumber}"; |
|
173 |
} |
|
170 | 174 |
if ($form->{department}) { |
171 | 175 |
my ($department) = split /--/, $form->{department}; |
172 | 176 |
push @options, $locale->text('Department') . " : $department"; |
... | ... | |
335 | 339 |
$name = 'name'; |
336 | 340 |
}; |
337 | 341 |
|
338 |
if ($form->{l_subtotal} eq 'Y' ) {
|
|
342 |
if ($form->{l_subtotal} eq 'Y') { |
|
339 | 343 |
push @{ $row_set }, create_subtotal_row_invoice(\%subtotals2, \@columns, \%column_alignment, \@subtotal_columns, 'listsubsortsubtotal', $ar->{$name}) ; |
340 | 344 |
push @{ $row_set }, insert_empty_row(); |
341 | 345 |
}; |
Auch abrufbar als: Unified diff
VK Bericht um Filter nach Kundennummer erweitert
Kundennummer kann zusätzlich als Spalte ausgegeben werden.