// Removing some id_warehouse

// Adding some checks with advanced_stock_management product attribute

admin-dev/themes/template/orders/view.tpl

@@ -54,39 +54,6 @@
 			statesShipped.push({$state['id_order_state']});
 		{/if}
 	{/foreach}
-
-	{literal}
-		function showWarehouseList()
-		{
-			{/literal}{if (count($warehouse_list) > 1)}{literal}
-				$('#warehouse').show();
-			{/literal}{/if}{literal}
-		}
-
-		function hideWarehouseList()
-		{
-			$('#warehouse').hide();
-		}
-
-		$(document).ready(function() {
-			hideWarehouseList();
-			$("input.datepicker").datepicker({
-				prevText: '',
-				nextText: '',
-				dateFormat: 'yy-mm-dd'
-			});
-			$('#id_order_state').change(function() {
-				if ($.inArray(parseInt($(this).val()), statesShipped) >= 0)
-				{
-					showWarehouseList();
-				}
-				else
-				{
-					hideWarehouseList();
-				}
-			});
-		});
-	{/literal}
 	</script>
 
 	{if ($HOOK_INVOICE)}
@@ -130,11 +97,6 @@
 					<option value="{$state['id_order_state']}" {if $state['id_order_state'] == $currentState->id}selected="selected"{/if}>{$state['name']|stripslashes}</option>
 				{/foreach}
 				</select>
-				<select name="id_warehouse" id="warehouse">
-				{foreach from=$warehouse_list item=warehouse}
-					<option value="{$warehouse['id_warehouse']}">{$warehouse['name']}</option>
-				{/foreach}
-				</select>
 				<input type="hidden" name="id_order" value="{$order->id}" />
 				<input type="submit" name="submitState" value="{l s='Add'}" class="button" />
 			</form>

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

@@ -61,7 +61,7 @@
 					<td valign="top" style="vertical-align:top;">
 						<input {if $product->advanced_stock_management == 1 && $stock_management_active == 1}value="on" checked="checked" {/if} {if $stock_management_active == 0}disabled="disabled" {/if} 
 								type="checkbox" name="advanced_stock_management" class="advanced_stock_management" id="advanced_stock_management" />
-						<label style="float:none;font-weight:normal" for="depends_on_stock_1">{l s='I want to use the advanced stock management system for this product'} {if $stock_management_active == 0}&nbsp;-&nbsp;<b>{l s='Not possible if stock management is not enabled'}</b>{/if}</label>
+						<label style="float:none;font-weight:normal" for="advanced_stock_management">{l s='I want to use the advanced stock management system for this product'} {if $stock_management_active == 0}&nbsp;-&nbsp;<b>{l s='Not possible if stock management is not enabled'}</b>{/if}</label>
 						<br /><br />
 					</td>
 				</tr>