// replace all uses of "combinaison" by "combination"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13437 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:03:56 +00:00
parent a0857d3573
commit 3ddcf5cfe0
11 changed files with 49 additions and 50 deletions
@@ -159,10 +159,10 @@ class AttributeCore extends ObjectModel
 	}

 	/**
-	 * Get quantity for a given attribute combinaison
+	 * Get quantity for a given attribute combination
 	 * Check if quantity is enough to deserve customer
 	 *
-	 * @param integer $id_product_attribute Product attribute combinaison id
+	 * @param integer $id_product_attribute Product attribute combination id
 	 * @param integer $qty Quantity needed
 	 * @return boolean Quantity is available or not
 	 */