Revision b96c67e5
Von Moritz Bunkus vor fast 11 Jahren hinzugefügt
SL/OE.pm | ||
---|---|---|
83 | 83 |
$query = |
84 | 84 |
qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | . |
85 | 85 |
qq| o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | . |
86 |
qq| o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | . |
|
86 |
qq| o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
|
|
87 | 87 |
qq| o.transaction_description, | . |
88 | 88 |
qq| o.marge_total, o.marge_percent, | . |
89 | 89 |
qq| ex.$rate AS exchangerate, | . |
... | ... | |
175 | 175 |
push(@values, '%' . $form->{$ordnumber} . '%'); |
176 | 176 |
} |
177 | 177 |
|
178 |
if ($form->{cusordnumber}) { |
|
179 |
$query .= qq| AND o.cusordnumber ILIKE ?|; |
|
180 |
push(@values, '%' . $form->{cusordnumber} . '%'); |
|
181 |
} |
|
182 |
|
|
178 | 183 |
if($form->{transdatefrom}) { |
179 | 184 |
$query .= qq| AND o.transdate >= ?|; |
180 | 185 |
push(@values, conv_date($form->{transdatefrom})); |
... | ... | |
222 | 227 |
"reqdate" => "o.reqdate", |
223 | 228 |
"id" => "o.id", |
224 | 229 |
"ordnumber" => "o.ordnumber", |
230 |
"cusordnumber" => "o.cusordnumber", |
|
225 | 231 |
"quonumber" => "o.quonumber", |
226 | 232 |
"name" => "ct.name", |
227 | 233 |
"employee" => "e.name", |
bin/mozilla/oe.pl | ||
---|---|---|
787 | 787 |
my @columns = ( |
788 | 788 |
"transdate", "reqdate", |
789 | 789 |
"id", $ordnumber, |
790 |
"customernumber", |
|
790 |
"cusordnumber", "customernumber",
|
|
791 | 791 |
"name", "netamount", |
792 | 792 |
"tax", "amount", |
793 | 793 |
"curr", "employee", |
... | ... | |
834 | 834 |
my $report = SL::ReportGenerator->new(\%myconfig, $form); |
835 | 835 |
|
836 | 836 |
my @hidden_variables = map { "l_${_}" } @columns; |
837 |
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber |
|
837 |
push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
|
|
838 | 838 |
transaction_description transdatefrom transdateto type vc employee_id salesman_id |
839 | 839 |
reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive |
840 | 840 |
business_id shippingpoint taxzone_id); |
... | ... | |
851 | 851 |
'id' => { 'text' => $locale->text('ID'), }, |
852 | 852 |
'ordnumber' => { 'text' => $locale->text('Order'), }, |
853 | 853 |
'quonumber' => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), }, |
854 |
'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), }, |
|
854 | 855 |
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), }, |
855 | 856 |
'customernumber' => { 'text' => $locale->text('Customer Number'), }, |
856 | 857 |
'netamount' => { 'text' => $locale->text('Amount'), }, |
... | ... | |
874 | 875 |
'taxzone' => { 'text' => $locale->text('Steuersatz'), }, |
875 | 876 |
); |
876 | 877 |
|
877 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) { |
|
878 |
foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) {
|
|
878 | 879 |
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; |
879 | 880 |
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; |
880 | 881 |
} |
... | ... | |
897 | 898 |
push @options, $locale->text('Vendor') . " : $form->{vendor}" if $form->{vendor}; |
898 | 899 |
push @options, $locale->text('Department') . " : $department" if $form->{department}; |
899 | 900 |
push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if $form->{ordnumber}; |
901 |
push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}" if $form->{cusordnumber}; |
|
900 | 902 |
push @options, $locale->text('Notes') . " : $form->{notes}" if $form->{notes}; |
901 | 903 |
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}" if $form->{transaction_description}; |
902 | 904 |
push @options, $locale->text('Shipping Point') . " : $form->{shippingpoint}" if $form->{shippingpoint}; |
templates/webpages/oe/search.html | ||
---|---|---|
53 | 53 |
<th align="right">[% HTML.escape(ordlabel) %]</th> |
54 | 54 |
<td colspan="3"><input name="[% HTML.escape(ordnrname) %]" style="width: 250px"></td> |
55 | 55 |
</tr> |
56 |
[% IF is_order %] |
|
57 |
<tr> |
|
58 |
<th align="right">[% LxERP.t8("Customer Order Number") %]</th> |
|
59 |
<td colspan="3">[% L.input_tag("cusordnumber", '', style="width: 250px") %]</td> |
|
60 |
</tr> |
|
61 |
[% END %] |
|
56 | 62 |
<tr> |
57 | 63 |
<th align="right">[% 'Employee' | $T8 %]</th> |
58 | 64 |
<td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key='safe_name', with_empty=1, style='width:250px') %]</td> |
... | ... | |
161 | 167 |
<input name="l_[% HTML.escape(ordnrname) %]" id="l_[% HTML.escape(ordnrname) %]" class="checkbox" type="checkbox" value="Y" checked> |
162 | 168 |
<label for="l_[% HTML.escape(ordnrname) %]">[% HTML.escape(ordlabel) %]</label> |
163 | 169 |
</td> |
170 |
[% IF is_order %] |
|
171 |
<td> |
|
172 |
<input name="l_cusordnumber" id="l_cusordnumber" class="checkbox" type="checkbox" value="Y" checked> |
|
173 |
<label for="l_cusordnumber">[% LxERP.t8("Customer Order Number") %]</label> |
|
174 |
</td> |
|
175 |
[% END %] |
|
164 | 176 |
</tr> |
165 | 177 |
<tr> |
166 | 178 |
<td> |
Auch abrufbar als: Unified diff
Berichte OE: Bestellnummer des Kunden anzeigen/danach filtern