diff --git a/themes/hotel-reservation-theme/js/tools/vatManagement.js b/themes/hotel-reservation-theme/js/tools/vatManagement.js
new file mode 100644
index 000000000..eb2602058
--- /dev/null
+++ b/themes/hotel-reservation-theme/js/tools/vatManagement.js
@@ -0,0 +1,44 @@
+/*
+* 2007-2017 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
+* @copyright 2007-2017 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+$(document).ready(function(){
+ vat_number();
+
+ $(document).on('input', '#company, #company_invoice', function(){
+ vat_number();
+ });
+});
+
+function vat_number()
+{
+ if ($('#company').length && ($('#company').val() != ''))
+ $('#vat_number, #vat_number_block').show();
+ else
+ $('#vat_number, #vat_number_block').hide();
+
+ if ($('#company_invoice').length && ($('#company_invoice').val() != ''))
+ $('#vat_number_block_invoice').show();
+ else
+ $('#vat_number_block_invoice').hide();
+}
diff --git a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
index ad1aacaf9..314f2e3ad 100644
--- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
+++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
@@ -316,8 +316,5 @@
{if isset($countries)}
{addJsDef countries=$countries}
{/if}
- {if isset($vatnumber_ajax_call) && $vatnumber_ajax_call}
- {addJsDef vatnumber_ajax_call=$vatnumber_ajax_call}
- {/if}
{addJsDef PS_CUSTOMER_ADDRESS_CREATION=$PS_CUSTOMER_ADDRESS_CREATION|intval}
{/strip}