dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminAddresses.php
+3 -3
View File
@@ -349,7 +349,7 @@ class AdminAddresses extends AdminTab
{
echo '
<label>'.$this->l('Address').' (2):</label>
<label>'.$this->l('Address').' (2)</label>
<div class="margin-form">
<input type="text" size="33" name="address2" value="'.htmlentities($this->getFieldValue($obj, 'address2'), ENT_COMPAT, 'UTF-8').'" />
</div>';
@@ -480,8 +480,8 @@ class AdminAddresses extends AdminTab
$selectedCountry = ($tmp_addr && $tmp_addr->id_country) ? $tmp_addr->id_country :
(int)(Configuration::get('PS_COUNTRY_DEFAULT'));
$inv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry);
$dlv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry);
$inv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry, false, true);
$dlv_adr_fields = AddressFormat::getOrderedAddressFields($selectedCountry, false, true);
$inv_all_fields = array();
$dlv_all_fields = array();