diff --git a/admin/themes/default/template/controllers/products/associations.tpl b/admin/themes/default/template/controllers/products/associations.tpl
index d2167e874..ae5881b12 100644
--- a/admin/themes/default/template/controllers/products/associations.tpl
+++ b/admin/themes/default/template/controllers/products/associations.tpl
@@ -22,93 +22,95 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div id="product-associations" class="panel product-tab">
-	<input type="hidden" name="submitted_tabs[]" value="Associations" />
-	<h3>{l s='Associations'}</h3>
-	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
-	<div id="no_default_category" class="alert alert-info">
-		{l s='Please select a default category.'}
-	</div>
-	<div class="form-group">
-		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
-		<label class="control-label col-lg-2" for="category_block">
-			{l s='Associated categories'}
-		</label>
-		<div class="col-lg-9">
-			<div id="category_block">
-				{$category_tree}
+{if isset($product)}
+	<div id="product-associations" class="panel product-tab">
+		<input type="hidden" name="submitted_tabs[]" value="Associations" />
+		<h3>{l s='Associations'}</h3>
+		{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
+		<div id="no_default_category" class="alert alert-info">
+			{l s='Please select a default category.'}
+		</div>
+		<div class="form-group">
+			<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
+			<label class="control-label col-lg-2" for="category_block">
+				{l s='Associated categories'}
+			</label>
+			<div class="col-lg-9">
+				<div id="category_block">
+					{$category_tree}
+				</div>
+				{* <a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'html':'UTF-8'}&amp;addcategory">
+					<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
+				</a> *}
 			</div>
-			{* <a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'html':'UTF-8'}&amp;addcategory">
-				<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
-			</a> *}
 		</div>
-	</div>
-	<div class="form-group">
-		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}</span></div>
-		<label class="control-label col-lg-2" for="id_category_default">
-			<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your room type, and is displayed by default.'}">
-				{l s='Default category'}
-			</span>
-		</label>
-		<div class="col-lg-5">
-			<select id="id_category_default" name="id_category_default">
-				{foreach from=$selected_cat item=cat}
-					<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
-				{/foreach}
-			</select>
+		<div class="form-group">
+			<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}</span></div>
+			<label class="control-label col-lg-2" for="id_category_default">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='The default category is the main category for your room type, and is displayed by default.'}">
+					{l s='Default category'}
+				</span>
+			</label>
+			<div class="col-lg-5">
+				<select id="id_category_default" name="id_category_default">
+					{foreach from=$selected_cat item=cat}
+						<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
+					{/foreach}
+				</select>
+			</div>
 		</div>
-	</div>
-	<!-- By webkul to hide unneccessary fields -->
-	<!-- <div class="form-group">
-		<label class="control-label col-lg-3" for="product_autocomplete_input">
-			<span class="label-tooltip" data-toggle="tooltip"
-			title="{l s='You can indicate existing products as accessories for this product.'}{l s='Start by typing the first letters of the product\'s name, then select the product from the drop-down list.'}{l s='Do not forget to save the product afterwards!'}">
-			{l s='Accessories'}
-			</span>
-		</label>
-		<div class="col-lg-5">
-			<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
-			<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'html':'UTF-8'}¤{/foreach}" />
-			<div id="ajax_choose_product">
-				<div class="input-group">
-					<input type="text" id="product_autocomplete_input" name="product_autocomplete_input" />
-					<span class="input-group-addon"><i class="icon-search"></i></span>
+		<!-- By webkul to hide unneccessary fields -->
+		<!-- <div class="form-group">
+			<label class="control-label col-lg-3" for="product_autocomplete_input">
+				<span class="label-tooltip" data-toggle="tooltip"
+				title="{l s='You can indicate existing products as accessories for this product.'}{l s='Start by typing the first letters of the product\'s name, then select the product from the drop-down list.'}{l s='Do not forget to save the product afterwards!'}">
+				{l s='Accessories'}
+				</span>
+			</label>
+			<div class="col-lg-5">
+				<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
+				<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'html':'UTF-8'}¤{/foreach}" />
+				<div id="ajax_choose_product">
+					<div class="input-group">
+						<input type="text" id="product_autocomplete_input" name="product_autocomplete_input" />
+						<span class="input-group-addon"><i class="icon-search"></i></span>
+					</div>
 				</div>
-			</div>
 
-			<div id="divAccessories">
-			{foreach from=$accessories item=accessory}
-			<div class="form-control-static">
-				<button type="button" class="btn btn-default delAccessory" name="{$accessory.id_product}">
-					<i class="icon-remove text-danger"></i>
-				</button>
-				{$accessory.name|escape:'html':'UTF-8'}{if !empty($accessory.reference)}&nbsp;{l s='(ref: %s)' sprintf=$accessory.reference}{/if}
+				<div id="divAccessories">
+				{foreach from=$accessories item=accessory}
+				<div class="form-control-static">
+					<button type="button" class="btn btn-default delAccessory" name="{$accessory.id_product}">
+						<i class="icon-remove text-danger"></i>
+					</button>
+					{$accessory.name|escape:'html':'UTF-8'}{if !empty($accessory.reference)}&nbsp;{l s='(ref: %s)' sprintf=$accessory.reference}{/if}
+				</div>
+				{/foreach}
+				</div>
 			</div>
-			{/foreach}
+		</div> -->
+		<!-- By webkul to hide unneccessary fields -->
+		<!-- <div class="form-group">
+			<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer'}</label>
+			<div class="col-lg-5">
+				<select name="id_manufacturer" id="id_manufacturer">
+					<option value="0">- {l s='Choose (optional)'} -</option>
+					{if $product->id_manufacturer}
+					<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
+					{/if}
+					<option disabled="disabled">-</option>
+				</select>
 			</div>
+			<div class="col-lg-4">
+				<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'html':'UTF-8'}&amp;addmanufacturer">
+					<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
+				</a>
+			</div>
+		</div> -->
+		<div class="panel-footer">
+			<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default"><i class="process-icon-cancel"></i> {l s='Cancel'}</a>
+			<button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save'}</button>
+			<button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save and stay'}</button>
 		</div>
-	</div> -->
-	<!-- By webkul to hide unneccessary fields -->
-	<!-- <div class="form-group">
-		<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer'}</label>
-		<div class="col-lg-5">
-			<select name="id_manufacturer" id="id_manufacturer">
-				<option value="0">- {l s='Choose (optional)'} -</option>
-				{if $product->id_manufacturer}
-				<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
-				{/if}
-				<option disabled="disabled">-</option>
-			</select>
-		</div>
-		<div class="col-lg-4">
-			<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'html':'UTF-8'}&amp;addmanufacturer">
-				<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
-			</a>
-		</div>
-	</div> -->
-	<div class="panel-footer">
-		<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default"><i class="process-icon-cancel"></i> {l s='Cancel'}</a>
-		<button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save'}</button>
-		<button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled"><i class="process-icon-loading"></i> {l s='Save and stay'}</button>
 	</div>
-</div>
+{/if}
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index 1a056e99e..875b55e5c 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -3,33 +3,6 @@
 		<input type="hidden" name="submitted_tabs[]" value="Configuration" />
 		<h3 class="tab"> <i class="icon-AdminAdmin"></i> {l s='Configuration'}</h3>
 
-		{if isset($htl_room_type)}
-			<input type="hidden" value="{$htl_room_type['id']}" name="wk_id_room_type">
-		{/if}
-
-		<div class="form-group">
-			{if isset($htl_room_type)}
-				<label class="control-label col-sm-2" for="hotel_place">
-					{l s='Hotel'}
-				</label>
-				<div class="col-sm-4">
-					<input type="text" class="form-control" value="{$htl_full_info['hotel_name']}" readonly>
-					<input type="hidden" name="id_hotel" value="{$htl_room_type['id_hotel']}">
-				</div>
-			{else}
-				<label class="control-label col-sm-2" for="hotel_place">
-					{l s='Select Hotel'}
-				</label>
-				<div class="col-sm-4">
-					<select name="id_hotel" id="hotel_place" class="form-control">
-						{foreach from=$htl_info item=htl_dtl}
-							<option value="{$htl_dtl['id']}" >{$htl_dtl['hotel_name']}</option>
-						{/foreach}
-					</select>
-				</div>
-			{/if}
-		</div>
-
 		<input type="hidden" id="checkConfSubmit" value="0" name="checkConfSubmit">
 
 		<div class="from-group table-responsive-row clearfix">
diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl
index 18697a83d..7ffafa646 100644
--- a/admin/themes/default/template/controllers/products/informations.tpl
+++ b/admin/themes/default/template/controllers/products/informations.tpl
@@ -147,6 +147,35 @@
 		</div>
 	</div>
 
+	{if isset($htl_room_type)}
+		<input type="hidden" value="{$htl_room_type['id']}" name="wk_id_room_type">
+	{/if}
+
+	<div class="form-group">
+		{if isset($htl_room_type)}
+			<label class="control-label col-sm-3 required" for="hotel_place">
+				{l s='Hotel'}
+			</label>
+			<div class="col-sm-5">
+				<input type="text" class="form-control" value="{$htl_full_info['hotel_name']}" readonly>
+				<input type="hidden" name="id_hotel" value="{$htl_room_type['id_hotel']}">
+				<p class="help-block">{l s='Hotel once assigned cannot be reassigned'}</p>
+			</div>
+		{else}
+			<label class="control-label col-sm-3 required" for="hotel_place">
+				{l s='Select Hotel'}
+			</label>
+			<div class="col-sm-5">
+				<select name="id_hotel" id="hotel_place" class="form-control">
+					{foreach from=$htl_info item=htl_dtl}
+						<option value="{$htl_dtl['id']}" >{$htl_dtl['hotel_name']}</option>
+					{/foreach}
+				</select>
+				<p class="help-block">{l s='Hotel once assigned cannot be reassigned'}</p>
+			</div>
+		{/if}
+	</div>
+
 	<div class="form-group hidden">
 		<label class="control-label col-lg-3" for="reference">
 			<span class="label-tooltip" data-toggle="tooltip"
diff --git a/classes/helper/HelperTreeCategories.php b/classes/helper/HelperTreeCategories.php
index b812f90d1..7b9e04b0a 100644
--- a/classes/helper/HelperTreeCategories.php
+++ b/classes/helper/HelperTreeCategories.php
@@ -38,9 +38,11 @@ class HelperTreeCategoriesCore extends TreeCore
     private $_full_tree = false;
     private $_shop;
     private $_use_checkbox;
+    private $_use_bulk_actions = true;
     private $_use_search;
     private $_use_shop_restriction;
     private $_children_only = false;
+    private $_disable_all_categories = false;
 
     public function __construct($id, $title = null, $root_category = null,
         $lang = null, $use_shop_restriction = true)
@@ -181,11 +183,22 @@ public function setDisabledCategories($value)
         return $this;
     }
 
+    public function setDisablAllCategories($value)
+    {
+        $this->_disable_all_categories = $value;
+        return $this;
+    }
+
     public function getDisabledCategories()
     {
         return $this->_disabled_categories;
     }
 
+    public function getDisablAllCategories()
+    {
+        return $this->_disable_all_categories;
+    }
+
     public function setInputName($value)
     {
         $this->_input_name = $value;
@@ -306,6 +319,12 @@ public function setUseCheckBox($value)
         return $this;
     }
 
+    public function setUseBulkActions($value)
+    {
+        $this->_use_bulk_actions = (bool)$value;
+        return $this;
+    }
+
     public function setUseSearch($value)
     {
         $this->_use_search = (bool)$value;
@@ -323,6 +342,11 @@ public function useCheckBox()
         return (isset($this->_use_checkbox) && $this->_use_checkbox);
     }
 
+    public function useBulkActions()
+    {
+        return (isset($this->_use_bulk_actions) && $this->_use_bulk_actions);
+    }
+
     public function useSearch()
     {
         return (isset($this->_use_search) && $this->_use_search);
@@ -344,6 +368,10 @@ public function render($data = null)
             $this->_disableCategories($data, $this->getDisabledCategories());
         }
 
+        if($this->getDisablAllCategories()) {
+            $this->_disableCategories($data);
+        }
+
         if (isset($this->_selected_categories)
             && !empty($this->_selected_categories)) {
             $this->_getSelectedChildNumbers($data, $this->getSelectedCategories());
@@ -374,20 +402,22 @@ public function render($data = null)
         $this->addAction($expand_all);
 
         if ($this->useCheckBox()) {
-            $check_all = new TreeToolbarLink(
-                'Check All',
-                '#',
-                'checkAllAssociatedCategories($(\'#'.$this->getId().'\')); return false;',
-                'icon-check-sign');
-            $check_all->setAttribute('id', 'check-all-'.$this->getId());
-            $uncheck_all = new TreeToolbarLink(
-                'Uncheck All',
-                '#',
-                'uncheckAllAssociatedCategories($(\'#'.$this->getId().'\')); return false;',
-                'icon-check-empty');
-            $uncheck_all->setAttribute('id', 'uncheck-all-'.$this->getId());
-            $this->addAction($check_all);
-            $this->addAction($uncheck_all);
+            if($this->useBulkActions()) {
+                $check_all = new TreeToolbarLink(
+                    'Check All',
+                    '#',
+                    'checkAllAssociatedCategories($(\'#'.$this->getId().'\')); return false;',
+                    'icon-check-sign');
+                $check_all->setAttribute('id', 'check-all-'.$this->getId());
+                $uncheck_all = new TreeToolbarLink(
+                    'Uncheck All',
+                    '#',
+                    'uncheckAllAssociatedCategories($(\'#'.$this->getId().'\')); return false;',
+                    'icon-check-empty');
+                $uncheck_all->setAttribute('id', 'uncheck-all-'.$this->getId());
+                $this->addAction($check_all);
+                $this->addAction($uncheck_all);
+            }
             $this->setNodeFolderTemplate('tree_node_folder_checkbox.tpl');
             $this->setNodeItemTemplate('tree_node_item_checkbox.tpl');
             $this->setAttribute('use_checkbox', $this->useCheckBox());
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index ec291c59e..99a5d2614 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1963,6 +1963,14 @@ public function processAdd()
         $this->_removeTaxFromEcotax();
         $this->copyFromPost($this->object, $this->table);
         if ($this->object->add()) {
+
+            // associateroom type to hotel
+            $id_hotel = Tools::getValue('id_hotel');
+            $objRoomType = new HotelRoomType();
+            $objRoomType->id_product = $this->object->id;
+            $objRoomType->id_hotel = $id_hotel;
+            $objRoomType->save();
+
             PrestaShopLogger::addLog(sprintf($this->l('%s addition', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id);
             $this->addCarriers($this->object);
             $this->updateAccessories($this->object);
@@ -2358,9 +2366,26 @@ public function checkProduct()
             }
         }
 
+        $id_hotel = Tools::getValue('id_hotel');
+        if (!$id_hotel || !Validate::isUnsignedInt($id_hotel)) {
+            $this->errors[] = Tools::displayError('Please select a hotel');
+        } else if (!Validate::isLoadedObject($objHotel = new HotelBranchInformation($id_hotel))) {
+            $this->errors[] = Tools::displayError('Selected Hotel not found');
+        } else {
+            $hotelIdCategory = $objHotel->id_category;
+            if (Validate::isLoadedObject($objCategory = new Category($hotelIdCategory))) {
+                foreach($objCategory->getParentsCategories() as $category) {
+                    $_POST['categoryBox'][] = $category['id_category'];
+                }
+                if(!Tools::getValue('id_category_default')) {
+                    $_POST['id_category_default'] = $hotelIdCategory;
+                }
+            }
+        }
+
         // Categories
         if ($this->isProductFieldUpdated('id_category_default') && (!Tools::isSubmit('categoryBox') || !count(Tools::getValue('categoryBox')))) {
-            $this->errors[] = $this->l('Products must be in at least one category.');
+            $this->errors[] = $this->l('This room type must be in at least one category.');
         }
 
         if ($this->isProductFieldUpdated('id_category_default') && (!is_array(Tools::getValue('categoryBox')) || !in_array(Tools::getValue('id_category_default'), Tools::getValue('categoryBox')))) {
@@ -3476,28 +3501,9 @@ public function processConfiguration()
                         if ($wk_id_room_type) {
                             $objRoomType = new HotelRoomType($wk_id_room_type);
                             $id_hotel = $objRoomType->id_hotel;
-                        } else {
-                            $objRoomType = new HotelRoomType();
-                            $objRoomType->id_product = $id_product;
-                            $objRoomType->id_hotel = $id_hotel;
                         }
-                        $objRoomType->save();
-
-                        $id_rm_type = $objRoomType->id;
 
                         // Associate categories to Room Type
-                        $product = new Product((int) $id_product);
-                        $objHotelInfo = new HotelBranchInformation($id_hotel);
-                        $hotelIdCategory = $objHotelInfo->id_category;
-                        $category = new Category($hotelIdCategory);
-                        $hotelCategories = $category->getParentsCategories();
-                        $categoryIds = array();
-                        foreach ($hotelCategories as $rowCateg) {
-                            $categoryIds[] = $rowCateg['id_category'];
-                        }
-                        $product->updateCategories($categoryIds);
-                        // Associate categories to Room Type
-
                         $id_room_info = Tools::getValue('id_room_info');
                         $objCartBookingData = new HotelCartBookingData();
                         foreach ($room_numbers as $key => $value) {
@@ -3723,70 +3729,77 @@ public function ajaxProcessProductRoomsBookingDetailsOnMonthChange()
      */
     public function initFormAssociations($obj)
     {
-        $product = $obj;
         $data = $this->createTemplate($this->tpl_form);
-        // Prepare Categories tree for display in Associations tab
-        $root = Category::getRootCategory();
-        $default_category = $this->context->cookie->id_category_products_filter ? $this->context->cookie->id_category_products_filter : Context::getContext()->shop->id_category;
-        if (!$product->id || !$product->isAssociatedToShop()) {
-            $selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language);
-        } else {
-            if (Tools::isSubmit('categoryBox')) {
+
+        if ($obj->id) {
+            $product = $obj;
+            // Prepare Categories tree for display in Associations tab
+            $root = Category::getRootCategory();
+            $default_category = $this->context->cookie->id_category_products_filter ? $this->context->cookie->id_category_products_filter : Context::getContext()->shop->id_category;
+            if (!$product->id || !$product->isAssociatedToShop()) {
                 $selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language);
             } else {
-                $selected_cat = Product::getProductCategoriesFull($product->id, $this->default_form_language);
+                if (Tools::isSubmit('categoryBox')) {
+                    $selected_cat = Category::getCategoryInformations(Tools::getValue('categoryBox', array($default_category)), $this->default_form_language);
+                } else {
+                    $selected_cat = Product::getProductCategoriesFull($product->id, $this->default_form_language);
+                }
             }
-        }
 
-        // Multishop block
-        $data->assign('feature_shop_active', Shop::isFeatureActive());
-        $helper = new HelperForm();
-        if ($this->object && $this->object->id) {
-            $helper->id = $this->object->id;
-        } else {
-            $helper->id = null;
-        }
-        $helper->table = $this->table;
-        $helper->identifier = $this->identifier;
+            // Multishop block
+            $data->assign('feature_shop_active', Shop::isFeatureActive());
+            $helper = new HelperForm();
+            if ($this->object && $this->object->id) {
+                $helper->id = $this->object->id;
+            } else {
+                $helper->id = null;
+            }
+            $helper->table = $this->table;
+            $helper->identifier = $this->identifier;
 
-        // Accessories block
-        $accessories = Product::getAccessoriesLight($this->context->language->id, $product->id);
+            // Accessories block
+            $accessories = Product::getAccessoriesLight($this->context->language->id, $product->id);
 
-        if ($post_accessories = Tools::getValue('inputAccessories')) {
-            $post_accessories_tab = explode('-', $post_accessories);
-            foreach ($post_accessories_tab as $accessory_id) {
-                if (!$this->haveThisAccessory($accessory_id, $accessories) && $accessory = Product::getAccessoryById($accessory_id)) {
-                    $accessories[] = $accessory;
+            if ($post_accessories = Tools::getValue('inputAccessories')) {
+                $post_accessories_tab = explode('-', $post_accessories);
+                foreach ($post_accessories_tab as $accessory_id) {
+                    if (!$this->haveThisAccessory($accessory_id, $accessories) && $accessory = Product::getAccessoryById($accessory_id)) {
+                        $accessories[] = $accessory;
+                    }
                 }
             }
-        }
-        $data->assign('accessories', $accessories);
+            $data->assign('accessories', $accessories);
 
-        $product->manufacturer_name = Manufacturer::getNameById($product->id_manufacturer);
+            $product->manufacturer_name = Manufacturer::getNameById($product->id_manufacturer);
 
-        $categories = array();
-        foreach ($selected_cat as $key => $category) {
-            $categories[] = $key;
-        }
+            $categories = array();
+            foreach ($selected_cat as $key => $category) {
+                $categories[] = $key;
+            }
 
-        $tree = new HelperTreeCategories('associated-categories-tree', 'Associated categories');
-        $tree->setTemplate('tree_associated_categories.tpl')
-            ->setHeaderTemplate('tree_associated_header.tpl')
-            ->setRootCategory((int)$root->id)
-            ->setUseCheckBox(true)
-            ->setUseSearch(false)
-            ->setFullTree(0)
-            ->setSelectedCategories($categories);
-
-        $data->assign(array('default_category' => $default_category,
-                    'selected_cat_ids' => implode(',', array_keys($selected_cat)),
-                    'selected_cat' => $selected_cat,
-                    'id_category_default' => $product->getDefaultCategory(),
-                    'category_tree' => $tree->render(),
-                    'product' => $product,
-                    'link' => $this->context->link,
-                    'is_shop_context' => Shop::getContext() == Shop::CONTEXT_SHOP
-        ));
+            $tree = new HelperTreeCategories('associated-categories-tree', 'Associated categories');
+            $tree->setTemplate('tree_associated_categories.tpl')
+                ->setHeaderTemplate('tree_associated_header.tpl')
+                ->setRootCategory((int)$root->id)
+                ->setUseCheckBox(true)
+                ->setUseSearch(false)
+                ->setFullTree(0)
+                ->setSelectedCategories($categories)
+                ->setUseBulkActions(false)
+                ->setDisablAllCategories(true);
+
+            $data->assign(array('default_category' => $default_category,
+                        'selected_cat_ids' => implode(',', array_keys($selected_cat)),
+                        'selected_cat' => $selected_cat,
+                        'id_category_default' => $product->getDefaultCategory(),
+                        'category_tree' => $tree->render(),
+                        'product' => $product,
+                        'link' => $this->context->link,
+                        'is_shop_context' => Shop::getContext() == Shop::CONTEXT_SHOP
+            ));
+        } else {
+            $this->displayWarning($this->l('You must save this room type before updating associations.'));
+        }
 
         $this->tpl_form_vars['custom_form'] = $data->fetch();
     }
@@ -4593,6 +4606,15 @@ public function initFormInformations($product)
         ));
         $data->assign($this->tpl_form_vars);
 
+        $objRoomType = new HotelRoomType();
+        $objHotelInfo = new HotelBranchInformation();
+        $data->assign('htl_info', $objHotelInfo->hotelsNameAndId());
+        if ($hotelRoomType = $objRoomType->getRoomTypeInfoByIdProduct($product->id)) {
+            $data->assign('htl_room_type', $hotelRoomType);
+            $hotelFullInfo = $objHotelInfo->hotelBranchInfoById($hotelRoomType['id_hotel']);
+            $data->assign('htl_full_info', $hotelFullInfo);
+        }
+
         $this->tpl_form_vars['product'] = $product;
         $this->tpl_form_vars['custom_form'] = $data->fetch();
     }