From ae4187da034b95e34e73512d4c97c6b8f6aceeeb Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 24 Oct 2011 09:55:39 +0000
Subject: [PATCH] // Removing unused field

---
 admin-dev/themes/template/products/combinations.tpl | 9 +++------
 controllers/admin/AdminProductsController.php       | 5 -----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index dfbea4da5..083bdcb1c 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -228,10 +228,6 @@
 	</td>
 	</tr>
 {/if}
-		  <tr id="initial_stock_attribute">
-				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">{l s='Initial stock:' }</td>
-				<td><input type="text" name="attribute_quantity" size="3" maxlength="6" value="0"/></td>
-		  </tr>
 			<tr id="stock_mvt_attribute" style=";">
 				<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">{l s='Stock movement:' }</td>
 				<td style="padding-bottom:5px;">
@@ -242,8 +238,9 @@
 							rel="{$reason.sign}" value="{$reason.id_stock_mvt_reason}" 
 							{if $ps_stock_mvt_reason_default == $reason.id_stock_mvt_reason}
 								selected="selected"
-							{/if}>{$reason.name}</option>
-					{/foreach}
+							{/if}>{$reason.name}
+						</option>
+						{/foreach}
 			</select>
 					<input type="text" name="attribute_mvt_quantity" size="3" maxlength="6" value="0"/>&nbsp;&nbsp;
 					<span style="display:none;" id="mvt_sign"></span>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index f797fce68..7a260d69c 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2773,11 +2773,6 @@ switch ($this->action)
 								</td>
 							</tr>';
 						}
-						else
-							$content .= '<tr><td class="col-left">'.$this->l('Initial stock:').'</td>
-									<td style="padding-bottom:5px;">
-										<input size="3" maxlength="6" name="quantity" type="text" value="0" />
-									</td>';
 						$content .=  '<tr>
 								<td class="col-left">'.$this->l('Minimum quantity:').'</td>
 									<td style="padding-bottom:5px;">