// merge 1.4 => 6117

This commit is contained in:
fBrignoli
2011-04-29 09:09:38 +00:00
parent eb254814c0
commit b8f460ed46
29 changed files with 199 additions and 217 deletions
+1 -1
View File
@@ -305,7 +305,7 @@ class CustomerCore extends ObjectModel
public function getAddresses($id_lang)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT a.*, cl.`name` AS country, s.name AS state
SELECT a.*, cl.`name` AS country, s.name AS state, s.iso_code AS state_iso
FROM `'._DB_PREFIX_.'address` a
LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`)
LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`)