Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

controllers/admin/AdminInvoicesController.php

@@ -273,11 +273,14 @@ class AdminInvoicesControllerCore extends AdminController
 
 	protected function getInvoicesModelsFromDir($directory)
 	{
-		$templates = array();
+		$templates = false;
 
 		if (is_dir($directory))
 			$templates = glob($directory.'invoice-*.tpl');
 
+		if (!$templates)
+			$templates = array();
+
 		return $templates;
 	}
 }

js/admin-products.js

@@ -63,9 +63,9 @@ product_tabs['Combinations'] = new function(){
 					self.removeButtonCombination('update');
 					$.scrollTo('#add_new_combination', 1200, { offset: -100 });
 					var wholesale_price = Math.abs(data[0]['wholesale_price']);
-					var price = Math.abs(data[0]['price']);
-					var weight = Math.abs(data[0]['weight']);
-					var unit_impact = Math.abs(data[0]['unit_price_impact']);
+					var price = data[0]['price'];
+					var weight = data[0]['weight'];
+					var unit_impact = data[0]['unit_price_impact'];
 					var reference = data[0]['reference'];
 					var ean = data[0]['ean13'];
 					var quantity = data[0]['quantity'];