Revision 1c181c11
Von Bernd Bleßmann vor fast 9 Jahren hinzugefügt
SL/DB/Helper/FlattenToForm.pm | ||
---|---|---|
28 | 28 |
$form->{vc} = $vc if ref($self) =~ m{^SL::DB::(?:.*Invoice|Order)}; |
29 | 29 |
|
30 | 30 |
my @vc_fields = (qw(account_number bank bank_code bic business city contact country creditlimit |
31 |
department_1 department_2 discount email fax homepage iban language name |
|
31 |
department_1 department_2 discount email fax gln homepage iban language name
|
|
32 | 32 |
payment_terms phone street taxnumber ustid zipcode), |
33 | 33 |
"${vc}number", |
34 | 34 |
($vc eq 'customer')? 'c_vendor_id': 'v_customer_id'); |
SL/DB/Manager/Customer.pm | ||
---|---|---|
22 | 22 |
sub _sort_spec { |
23 | 23 |
return ( default => [ 'name', 1 ], |
24 | 24 |
columns => { SIMPLE => 'ALL', |
25 |
map { ( $_ => "lower(customer.$_)" ) } qw(customernumber vendornumber name contact phone fax email street taxnumber business invnumber ordnumber quonumber) |
|
25 |
map { ( $_ => "lower(customer.$_)" ) } qw(customernumber vendornumber name contact phone fax email street gln taxnumber business invnumber ordnumber quonumber)
|
|
26 | 26 |
}); |
27 | 27 |
} |
28 | 28 |
|
SL/DB/Manager/Vendor.pm | ||
---|---|---|
24 | 24 |
default => [ 'name', 1 ], |
25 | 25 |
columns => { |
26 | 26 |
SIMPLE => 'ALL', |
27 |
map { ( $_ => "lower(vendor.$_)" ) } qw(account_number bank bank_code bcc bic cc city contact country department_1 department_2 depositor email fax greeting homepage iban language |
|
27 |
map { ( $_ => "lower(vendor.$_)" ) } qw(account_number bank bank_code bcc bic cc city contact country department_1 department_2 depositor email fax gln greeting homepage iban language
|
|
28 | 28 |
name notes phone street taxnumber user_password username ustid v_customer_id vendornumber zipcode) |
29 | 29 |
}); |
30 | 30 |
} |
SL/Form.pm | ||
---|---|---|
1858 | 1858 |
my $shipto; |
1859 | 1859 |
my @values; |
1860 | 1860 |
|
1861 |
foreach my $item (qw(name department_1 department_2 street zipcode city country |
|
1861 |
foreach my $item (qw(name department_1 department_2 street zipcode city country gln
|
|
1862 | 1862 |
contact cp_gender phone fax email)) { |
1863 | 1863 |
if ($self->{"shipto$item"}) { |
1864 | 1864 |
$shipto = 1 if ($self->{$item} ne $self->{"shipto$item"}); |
... | ... | |
1876 | 1876 |
shiptozipcode = ?, |
1877 | 1877 |
shiptocity = ?, |
1878 | 1878 |
shiptocountry = ?, |
1879 |
shiptogln = ?, |
|
1879 | 1880 |
shiptocontact = ?, |
1880 | 1881 |
shiptocp_gender = ?, |
1881 | 1882 |
shiptophone = ?, |
... | ... | |
1892 | 1893 |
shiptozipcode = ? AND |
1893 | 1894 |
shiptocity = ? AND |
1894 | 1895 |
shiptocountry = ? AND |
1896 |
shiptogln = ? AND |
|
1895 | 1897 |
shiptocontact = ? AND |
1896 | 1898 |
shiptocp_gender = ? AND |
1897 | 1899 |
shiptophone = ? AND |
... | ... | |
1903 | 1905 |
if(!$insert_check){ |
1904 | 1906 |
$query = |
1905 | 1907 |
qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2, |
1906 |
shiptostreet, shiptozipcode, shiptocity, shiptocountry, |
|
1908 |
shiptostreet, shiptozipcode, shiptocity, shiptocountry, shiptogln,
|
|
1907 | 1909 |
shiptocontact, shiptocp_gender, shiptophone, shiptofax, shiptoemail, module) |
1908 |
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; |
|
1910 |
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
|
|
1909 | 1911 |
do_query($self, $dbh, $query, $id, @values, $module); |
1910 | 1912 |
} |
1911 | 1913 |
} |
SL/IS.pm | ||
---|---|---|
591 | 591 |
$ref->{street} = $customer->street; |
592 | 592 |
$ref->{zipcode} = $customer->zipcode; |
593 | 593 |
$ref->{country} = $customer->country; |
594 |
$ref->{gln} = $customer->gln; |
|
594 | 595 |
} |
595 | 596 |
my $contact = SL::DB::Manager::Contact->find_by(cp_id => $::form->{cp_id}); |
596 | 597 |
if ($contact) { |
bin/mozilla/io.pl | ||
---|---|---|
1643 | 1643 |
map { $::form->{$_} = $::form->parse_amount(\%::myconfig, $::form->{$_}) } qw(exchangerate creditlimit creditremaining); |
1644 | 1644 |
|
1645 | 1645 |
# get details for customer/vendor |
1646 |
call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country contact email phone fax), $::form->{vc} . "number"); |
|
1647 |
|
|
1646 |
call_sub($::form->{vc} . "_details", qw(name department_1 department_2 street zipcode city country gln contact email phone fax), $::form->{vc} . "number"); |
|
1648 | 1647 |
$::form->{rowcount}--; |
1649 | 1648 |
|
1650 |
my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry |
|
1649 |
my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln
|
|
1651 | 1650 |
shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail |
1652 | 1651 |
shiptodepartment_1 shiptodepartment_2); |
1653 | 1652 |
my $previous_form = $::auth->save_form_in_session(skip_keys => [ @shipto_vars, qw(header shipto_id) ]); |
bin/mozilla/ir.pl | ||
---|---|---|
335 | 335 |
id action type media format queued printed emailed title vc discount |
336 | 336 |
title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id |
337 | 337 |
max_dunning_level dunning_amount |
338 |
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax |
|
338 |
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
|
|
339 | 339 |
shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus |
340 | 340 |
convert_from_do_ids convert_from_oe_ids show_details gldate useasnew |
341 | 341 |
), @custom_hiddens, |
bin/mozilla/is.pl | ||
---|---|---|
385 | 385 |
id action type media format queued printed emailed title vc discount |
386 | 386 |
title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id |
387 | 387 |
max_dunning_level dunning_amount dunning_description |
388 |
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax |
|
388 |
shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
|
|
389 | 389 |
shiptoemail shiptodepartment_1 shiptodepartment_2 shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus |
390 | 390 |
convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew |
391 | 391 |
invoice_id |
bin/mozilla/oe.pl | ||
---|---|---|
477 | 477 |
qw(id action type vc formname media format proforma queued printed emailed |
478 | 478 |
title creditlimit creditremaining tradediscount business |
479 | 479 |
max_dunning_level dunning_amount shiptoname shiptostreet shiptozipcode |
480 |
CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptocontact shiptophone shiptofax |
|
480 |
CFDD_shipto CFDD_shipto_id shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
|
|
481 | 481 |
shiptodepartment_1 shiptodepartment_2 shiptoemail shiptocp_gender |
482 | 482 |
message email subject cc bcc taxpart taxservice taxaccounts cursor_fokus |
483 | 483 |
show_details useasnew), |
templates/webpages/common/show_vc_details.html | ||
---|---|---|
66 | 66 |
<td>[% HTML.escape(country) %]</td> |
67 | 67 |
</tr> |
68 | 68 |
|
69 |
<tr> |
|
70 |
<td align="right">[% 'GLN' | $T8 %]</td> |
|
71 |
<td>[% HTML.escape(gln) %]</td> |
|
72 |
</tr> |
|
73 |
|
|
69 | 74 |
<tr> |
70 | 75 |
<td align="right">[% 'Contact Person' | $T8 %]</td> |
71 | 76 |
<td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td> |
... | ... | |
213 | 218 |
<td>[% HTML.escape(row.shiptocountry) %]</td> |
214 | 219 |
</tr> |
215 | 220 |
|
221 |
<tr> |
|
222 |
<td align="right">[% 'GLN' | $T8 %]</td> |
|
223 |
<td>[% HTML.escape(row.shiptogln) %]</td> |
|
224 |
</tr> |
|
225 |
|
|
216 | 226 |
<tr> |
217 | 227 |
<td align="right">[% 'Contact Person' | $T8 %]</td> |
218 | 228 |
<td>[% HTML.escape(row.shiptocontact) %]</td> |
templates/webpages/do/form_header.html | ||
---|---|---|
92 | 92 |
<input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]"> |
93 | 93 |
<input type="hidden" name="shiptocp_gender" value="[% HTML.escape(shiptocp_gender) %]"> |
94 | 94 |
<input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]"> |
95 |
<input type="hidden" name="shiptogln" value="[% HTML.escape(shiptogln) %]"> |
|
95 | 96 |
<input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]"> |
96 | 97 |
<input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]"> |
97 | 98 |
<input type="hidden" name="shiptoemail" value="[% HTML.escape(shiptoemail) %]"> |
templates/webpages/io/ship_to.html | ||
---|---|---|
9 | 9 |
shiptozipcode: "[% JavaScript.escape(vc_obj.zipcode) %]", |
10 | 10 |
shiptocity: "[% JavaScript.escape(vc_obj.city) %]", |
11 | 11 |
shiptocountry: "[% JavaScript.escape(vc_obj.country) %]", |
12 |
shiptogln: "[% JavaScript.escape(vc_obj.gln) %]", |
|
12 | 13 |
shiptocontact: "[% JavaScript.escape(vc_obj.contact) %]", |
13 | 14 |
shiptocp_gender: "[% JavaScript.escape(vc_obj.cp_gender) %]", |
14 | 15 |
shiptophone: "[% JavaScript.escape(vc_obj.phone) %]", |
... | ... | |
25 | 26 |
shiptozipcode: "[% JavaScript.escape(shipto.shiptozipcode) %]", |
26 | 27 |
shiptocity: "[% JavaScript.escape(shipto.shiptocity) %]", |
27 | 28 |
shiptocountry: "[% JavaScript.escape(shipto.shiptocountry) %]", |
29 |
shiptogln: "[% JavaScript.escape(shipto.shiptogln) %]", |
|
28 | 30 |
shiptocontact: "[% JavaScript.escape(shipto.shiptocontact) %]", |
29 | 31 |
shiptocp_gender: "[% JavaScript.escape(shipto.shiptocp_gender) %]", |
30 | 32 |
shiptophone: "[% JavaScript.escape(shipto.shiptophone) %]", |
... | ... | |
122 | 124 |
<td>[% HTML.escape(country) %]</td> |
123 | 125 |
<td>[% L.input_tag("shiptocountry", shiptocountry, "size", "35") %]</td> |
124 | 126 |
</tr> |
127 |
<tr> |
|
128 |
<th align="right" nowrap>[% LxERP.t8('GLN') %]</th> |
|
129 |
<td>[% HTML.escape(gln) %]</td> |
|
130 |
<td>[% L.input_tag("shiptogln", shiptogln, "size", "35") %]</td> |
|
131 |
</tr> |
|
125 | 132 |
<tr> |
126 | 133 |
<th align="right" nowrap>[% LxERP.t8('Contact') %]</th> |
127 | 134 |
<td>[% HTML.escape(contact) %]</td> |
templates/webpages/oe/check_for_direct_delivery.html | ||
---|---|---|
41 | 41 |
<td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td> |
42 | 42 |
</tr> |
43 | 43 |
|
44 |
<tr> |
|
45 |
<th align="right" valign="top">[% 'GLN' | $T8 %]:</th> |
|
46 |
<td valign="top">[% HTML.escape(CFDD_shiptogln) %]</td> |
|
47 |
</tr> |
|
48 |
|
|
44 | 49 |
<tr> |
45 | 50 |
<th align="right" valign="top">[% 'Contact' | $T8 %]:</th> |
46 | 51 |
<td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td> |
Auch abrufbar als: Unified diff
GLN: Berücksichtigung in Belegmasken