// Merge -> revision 8206

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd

modules/importerosc/importerosc.php

@@ -307,6 +307,7 @@ class importerosc extends ImportModule
 		{
 			$combination['association'] = array('product_attribute_combination' => array($combination['options_values_id'] => $combination['id_product_attribute']));
 			unset($combination['options_values_price']);
+			unset($combination['options_values_id']);
 		}
 		return $this->autoFormat($combinations, $identifier);
 	}

modules/shopimporter/shopimporter.php

@@ -578,7 +578,10 @@ class shopimporter extends ImportModule
 			foreach($item as $key => $val)
 			{
 				if ($key == 'passwd')
+				{
+					$password = $val;
 					$val = '------';
+				}
 				if (is_array($val) AND $key != 'images')
 				{