// Merging multishipping branche on 1.5

admin-dev/themes/template/helper/list/list_action_supplier_order_receipt.tpl

@@ -0,0 +1,27 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<a href="{$href}">
+<img src="../img/admin/delivery.gif" alt="{$action}" title="{$action}" /></a>

admin-dev/themes/template/products/informations.tpl

@@ -429,6 +429,20 @@ $(document).ready(function(){
 				</td>
 			</tr>
 		</table>
+		<table cellpadding="5" cellspacing="0" border="0" style="width: 100%;">
+			<tr>
+				<td class="col-left" style="width:600px">
+					<label>Carriers:</label>
+				</td>
+				<td class="padding-bottom:5px;">
+					<select name="carriers[]" multiple="multiple" size="4">
+						{foreach $carrier_list as $carrier}
+							<option value="{$carrier.id_reference}" {if isset($carrier.selected) && $carrier.selected}selected="selected"{/if}>{$carrier.name}</option>
+						{/foreach}
+					</select>
+				</td>
+			</tr>
+		</table>
 		</div>
 		{* [end] of physical product *}
 		{* [begin] virtual product *}