Revision 130ba50d
Von David Ohlbrecht vor fast 15 Jahren hinzugefügt
| SL/OE.pm | ||
|---|---|---|
| 90 | 90 |
qq| ex.$rate AS exchangerate, | . |
| 91 | 91 |
qq| pr.projectnumber AS globalprojectnumber, | . |
| 92 | 92 |
qq| e.name AS employee, s.name AS salesman, | . |
| 93 |
qq| ct.customernumber, ct.country, ct.ustid | .
|
|
| 93 |
qq| ct.${vc}number AS vcnumber, ct.country, ct.ustid | .
|
|
| 94 | 94 |
qq|FROM oe o | . |
| 95 | 95 |
qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
|
| 96 | 96 |
qq|LEFT JOIN employee e ON (o.employee_id = e.id) | . |
| bin/mozilla/oe.pl | ||
|---|---|---|
| 745 | 745 |
"shipvia", "globalprojectnumber", |
| 746 | 746 |
"transaction_description", "open", |
| 747 | 747 |
"delivered", "marge_total", "marge_percent", |
| 748 |
"customernumber", "ustid",
|
|
| 748 |
"vcnumber", "ustid",
|
|
| 749 | 749 |
"country", |
| 750 | 750 |
); |
| 751 | 751 |
|
| ... | ... | |
| 808 | 808 |
'delivered' => { 'text' => $locale->text('Delivered'), },
|
| 809 | 809 |
'marge_total' => { 'text' => $locale->text('Ertrag'), },
|
| 810 | 810 |
'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), },
|
| 811 |
'customernumber' => { 'text' => $locale->text('Customer Number'), },
|
|
| 811 |
'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
|
|
| 812 | 812 |
'country' => { 'text' => $locale->text('Country'), },
|
| 813 | 813 |
'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
|
| 814 | 814 |
); |
| templates/webpages/oe/search_de.html | ||
|---|---|---|
| 1 | 1 |
[%- USE HTML %] |
| 2 | 2 |
[%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %] |
| 3 |
[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %] |
|
| 3 | 4 |
<body> |
| 4 | 5 |
|
| 5 | 6 |
<form method="post" action="oe.pl"> |
| ... | ... | |
| 227 | 228 |
</td> |
| 228 | 229 |
</tr> |
| 229 | 230 |
<tr> |
| 230 |
<td colspan=4 align=left><b>Kunde</td>
|
|
| 231 |
<td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
|
|
| 231 | 232 |
</tr> |
| 232 | 233 |
<tr> |
| 233 | 234 |
<td> |
| 234 |
<input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
|
|
| 235 |
<label for="l_customernumber">Kundennummer</label>
|
|
| 235 |
<input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
|
|
| 236 |
<label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
|
|
| 236 | 237 |
</td> |
| 237 | 238 |
<td> |
| 238 | 239 |
<input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y"> |
| templates/webpages/oe/search_master.html | ||
|---|---|---|
| 1 | 1 |
[%- USE HTML %] |
| 2 | 2 |
[%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %] |
| 3 |
[%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %] |
|
| 3 | 4 |
<body> |
| 4 | 5 |
|
| 5 | 6 |
<form method="post" action="oe.pl"> |
| ... | ... | |
| 227 | 228 |
</td> |
| 228 | 229 |
</tr> |
| 229 | 230 |
<tr> |
| 230 |
<td colspan=4 align=left><b><translate>Customer</translate></td>
|
|
| 231 |
<td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
|
|
| 231 | 232 |
</tr> |
| 232 | 233 |
<tr> |
| 233 | 234 |
<td> |
| 234 |
<input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
|
|
| 235 |
<label for="l_customernumber"><translate>Customer Number</translate></label>
|
|
| 235 |
<input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
|
|
| 236 |
<label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
|
|
| 236 | 237 |
</td> |
| 237 | 238 |
<td> |
| 238 | 239 |
<input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y"> |
Auch abrufbar als: Unified diff
Kundennummer in Auftragssuche in vcnumber umbenannt um Lieferantenaufträge mit abzudecken.
Fix für Bugs 1264 und 1266.