// BO - carriers / multishipping - Add descriptions

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12556 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 13:48:10 +00:00
parent 5e7d168e5e
commit 6dfdc62f4d
3 changed files with 577 additions and 572 deletions
@@ -84,6 +84,7 @@
 					<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
 				{/foreach}
 			</select>
+			<p class="preference_description">{l s='If no carrier selected, all carriers could be used to ship this product.'}</p>
 		</td>
 	</tr>
 </table>
@@ -113,8 +113,10 @@ class AdminWarehousesControllerCore extends AdminController
 		$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the general default currency used.').'<br />');
 		$this->displayInformation($this->l('Futhermore, for each warehouse, you have to check :'));
 		$this->displayInformation($this->l('the management type (according to the law in your country), the valuation currency, its associated carriers and shops.').'<br />');
-		$this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its valuation, the number of products and quantities stored, ...'));
-
+		$this->displayInformation($this->l('Finally, you can see detailed informations on your stock per warehouse, such as its valuation, the number of products and quantities stored, ...').'<br /><br />');
+		
+		$this->displayInformation($this->l('Be careful, products from different warehouses will need to be shipped in different packages.'));
+		
 		return parent::renderList();
 	}