Revision 030cf0d5
Von Bernd Bleßmann vor fast 9 Jahren hinzugefügt
SL/CT.pm | ||
---|---|---|
75 | 75 |
"zipcode" => "ct.zipcode", |
76 | 76 |
"city" => "ct.city", |
77 | 77 |
"country" => "ct.country", |
78 |
"gln" => "ct.gln", |
|
78 | 79 |
"discount" => "ct.discount", |
79 | 80 |
"insertdate" => "ct.itime", |
80 | 81 |
"salesman" => "e.name", |
... | ... | |
143 | 144 |
push @values, ('%' . $form->{addr_country} . '%') x 2; |
144 | 145 |
} |
145 | 146 |
|
147 |
if ($form->{addr_gln}) { |
|
148 |
$where .= " AND ((lower(ct.gln) LIKE lower(?)) |
|
149 |
OR |
|
150 |
(ct.id IN ( |
|
151 |
SELECT so.trans_id |
|
152 |
FROM shipto so |
|
153 |
WHERE (so.module = 'CT') |
|
154 |
AND (lower(so.shiptogln) LIKE lower(?)) |
|
155 |
)) |
|
156 |
)"; |
|
157 |
push @values, ('%' . $form->{addr_gln} . '%') x 2; |
|
158 |
} |
|
159 |
|
|
146 | 160 |
if ( $form->{status} eq 'orphaned' ) { |
147 | 161 |
$where .= |
148 | 162 |
qq| AND ct.id NOT IN | . |
bin/mozilla/ct.pl | ||
---|---|---|
145 | 145 |
push @options, $locale->text('Billing/shipping address (zipcode)') . " : $form->{zipcode}" if $form->{addr_zipcode}; |
146 | 146 |
push @options, $locale->text('Billing/shipping address (street)') . " : $form->{street}" if $form->{addr_street}; |
147 | 147 |
push @options, $locale->text('Billing/shipping address (country)') . " : $form->{country}" if $form->{addr_country}; |
148 |
push @options, $locale->text('Billing/shipping address (GLN)') . " : $form->{addr_gln}" if $form->{addr_gln}; |
|
148 | 149 |
|
149 | 150 |
if ($form->{business_id}) { |
150 | 151 |
my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id}); |
... | ... | |
170 | 171 |
'id', 'name', "$form->{db}number", 'contact', 'phone', 'discount', |
171 | 172 |
'fax', 'email', 'taxnumber', 'street', 'zipcode' , 'city', |
172 | 173 |
'business', 'payment', 'invnumber', 'ordnumber', 'quonumber', 'salesman', |
173 |
'country', 'insertdate', 'pricegroup' |
|
174 |
'country', 'gln', 'insertdate', 'pricegroup'
|
|
174 | 175 |
); |
175 | 176 |
|
176 | 177 |
my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; |
... | ... | |
197 | 198 |
'zipcode' => { 'text' => $locale->text('Zipcode'), }, |
198 | 199 |
'city' => { 'text' => $locale->text('City'), }, |
199 | 200 |
'country' => { 'text' => $locale->text('Country'), }, |
201 |
'gln' => { 'text' => $locale->text('GLN'), }, |
|
200 | 202 |
'salesman' => { 'text' => $locale->text('Salesman'), }, |
201 | 203 |
'discount' => { 'text' => $locale->text('Discount'), }, |
202 | 204 |
'payment' => { 'text' => $locale->text('Payment Terms'), }, |
... | ... | |
209 | 211 |
|
210 | 212 |
my @hidden_variables = ( qw( |
211 | 213 |
db status obsolete name contact email cp_name addr_street addr_zipcode |
212 |
addr_city addr_country business_id salesman_id insertdateto insertdatefrom |
|
214 |
addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom
|
|
213 | 215 |
), "$form->{db}number", |
214 | 216 |
map({ "cvar_$_->{name}" } @searchable_custom_variables), |
215 | 217 |
map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)), |
locale/de/all | ||
---|---|---|
389 | 389 |
'Billed extra expenses' => 'Abgerechnete Nebenkosten', |
390 | 390 |
'Billing Address' => 'Rechnungsadresse', |
391 | 391 |
'Billing Periodicity' => 'Abrechnungsperiodizität', |
392 |
'Billing/shipping address (GLN)' => 'Rechnungsadresse (GLN)', |
|
392 | 393 |
'Billing/shipping address (city)' => 'Rechnungsadresse (Stadt)', |
393 | 394 |
'Billing/shipping address (country)' => 'Rechnungsadresse (Land)', |
394 | 395 |
'Billing/shipping address (street)' => 'Rechnungsadresse (Straße)', |
... | ... | |
1284 | 1285 |
'GL Transaction (abbreviation)' => 'DB', |
1285 | 1286 |
'GL search' => 'FiBu Suche', |
1286 | 1287 |
'GL transactions changeable' => 'Änderbarkeit von Dialogbuchungen', |
1288 |
'GLN' => 'GLN', |
|
1287 | 1289 |
'Gegenkonto' => 'Gegenkonto', |
1288 | 1290 |
'Gender' => 'Geschlecht', |
1289 | 1291 |
'General Ledger' => 'Finanzbuchhaltung', |
locale/en/all | ||
---|---|---|
306 | 306 |
'Bestandskonto' => '', |
307 | 307 |
'Bilanz' => '', |
308 | 308 |
'Billing Address' => '', |
309 |
'Billing/shipping address (GLN)' => '', |
|
309 | 310 |
'Billing/shipping address (city)' => '', |
310 | 311 |
'Billing/shipping address (country)' => '', |
311 | 312 |
'Billing/shipping address (street)' => '', |
... | ... | |
1035 | 1036 |
'Fwd' => 'Forward', |
1036 | 1037 |
'GL Transaction' => '', |
1037 | 1038 |
'GL transactions changeable' => '', |
1039 |
'GLN' => '', |
|
1038 | 1040 |
'Gegenkonto' => '', |
1039 | 1041 |
'Gender' => '', |
1040 | 1042 |
'General Ledger' => '', |
templates/webpages/ct/search.html | ||
---|---|---|
47 | 47 |
<th align="right" nowrap>[% 'Billing/shipping address (country)' | $T8 %]</th> |
48 | 48 |
<td><input name="addr_country" size="35"></td> |
49 | 49 |
</tr> |
50 |
<tr> |
|
51 |
<th align="right" nowrap>[% 'Billing/shipping address (GLN)' | $T8 %]</th> |
|
52 |
<td><input name="addr_gln" size="35"></td> |
|
53 |
</tr> |
|
50 | 54 |
|
51 | 55 |
[% IF SHOW_BUSINESS_TYPES %] |
52 | 56 |
<tr> |
... | ... | |
187 | 191 |
<input name="l_insertdate" id="l_insertdate" class="checkbox" type="checkbox" value="Y"> |
188 | 192 |
<label for="l_insertdate">[% 'Insert Date' | $T8 %]</label> |
189 | 193 |
</td> |
194 |
<td> |
|
195 |
<input name="l_gln" id="l_gln" type="checkbox" class="checkbox" value="Y" checked> |
|
196 |
<label for="l_gln">[% 'GLN' | $T8 %]</label> |
|
197 |
</td> |
|
198 |
</tr> |
|
190 | 199 |
[% IF IS_CUSTOMER %] |
200 |
<tr> |
|
191 | 201 |
<td> |
192 | 202 |
<input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y"> |
193 | 203 |
<label for="l_salesman">[% 'Salesman' | $T8 %]</label> |
194 | 204 |
</td> |
195 |
</tr> |
|
196 |
<tr> |
|
197 | 205 |
<td> |
198 | 206 |
<input name="l_pricegroup" id="l_pricegroup" type="checkbox" class="checkbox" value="Y"> |
199 | 207 |
<label for="l_pricegroup">[% 'Pricegroup' | $T8 %]</label> |
200 | 208 |
</td> |
201 |
[% END %] |
|
202 | 209 |
</tr> |
210 |
[% END %] |
|
203 | 211 |
|
204 | 212 |
[% CUSTOM_VARIABLES_INCLUSION_CODE %] |
205 | 213 |
|
Auch abrufbar als: Unified diff
GLN: In Bericht Kunden/Lieferanten anzeigen und danach suchen können.