// Merge -> revision 8076

admin-dev/tabs/AdminAddresses.php

@@ -75,8 +75,7 @@ class AdminAddresses extends AdminTab
 			{
 				if (Validate::isEmail(Tools::getValue('email')))
 				{
-					$customer = new Customer;
-					$customer = $customer->getByemail(Tools::getValue('email'));
+					$customer = new Customer(Tools::getValue('id_customer'));
 					if (Validate::isLoadedObject($customer))
 						$_POST['id_customer'] = $customer->id;
 					else

admin-dev/tabs/AdminCategories.php

@@ -222,7 +222,7 @@ class AdminCategories extends AdminTab
 					 'Collapse All' => $this->l('Collapse All'), 
 					 'Expand All' => $this->l('Expand All')
 				);
-				echo Helper::renderAdminCategorieTree($trads, array(isset($obj->id_parent) ? $obj->id_parent : 1), 'id_parent', true);
+				echo Helper::renderAdminCategorieTree($trads, array(isset($obj->id_parent) ? $obj->id_parent : Tools::getValue('id_parent', 1)), 'id_parent', true);
 				echo '</div>
 				<label>'.$this->l('Description:').' </label>
 				<div class="margin-form translatable">';

admin-dev/tabs/AdminProducts.php

@@ -1583,12 +1583,17 @@ class AdminProducts extends AdminTab
 		{
 			echo ' 	if (toload[id]) {
 							toload[id] = false;
-							$.post(
-								"'.dirname(self::$currentIndex).'/ajax.php", {
+
+							$.ajax({
+								url: "'.dirname(self::$currentIndex).'/ajax.php",
+								data: {
 									ajaxProductTab: id, id_product: '.$obj->id.',
 									token: \''.Tools::getValue('token').'\',
-									id_category: '.(int)(Tools::getValue('id_category')).'},
-								function(rep) {
+									id_category: '.(int)(Tools::getValue('id_category')).'
+								},
+								cache: false,
+								type: \'POST\',
+								success: function(rep) {
 									$("#step" + id).html(rep);var languages = new Array();
 									if (id == 3)
 										populate_attrs();
@@ -1607,7 +1612,7 @@ class AdminProducts extends AdminTab
 										});
 									}
 								}
-							)
+							})
 						}';
 		}
 		echo '	}