// 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
@@ -66,7 +66,7 @@
 				<th>{l s='UPC'}</th>
 				{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
 			</tr>
-			{foreach $product->combinaison AS $id_product_attribute => $product_attribute}
+			{foreach $product->combination AS $id_product_attribute => $product_attribute}
 				<tr {if $id_product_attribute %2}class="alt_row"{/if} >
 					<td>{$product_attribute.attributes}</td>
 					<td>{$product_attribute.product_supplier_reference}</td>