diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 00af3227e..731991f2b 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -59,7 +59,7 @@
{/if}
{if $use_multishop}
- {l s='Uncheck / check all'} {l s='(uncheck boxes if you want to set a custom value for this shop or group shop context)'}
+ {l s='Check / uncheck all'} {l s='(check boxes if you want to set a custom value for this shop or group shop context)'}
{if ($field['multishop_default'])}
-
+
{/if}
{block name="label"}
diff --git a/cache/class_index.php b/cache/class_index.php
index 4f04a9e16..12dbb6ba7 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -23,7 +23,6 @@
'AdminAccountingRegisteredNumberControllerCore' => 'controllers/admin/AdminAccountingRegisteredNumberController.php',
'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php',
'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php',
- 'AdminAddonsMyAccountController' => 'override/controllers/admin/AdminAddonsMyAccountController.php',
'AdminAddressesController' => 'override/controllers/admin/AdminAddressesController.php',
'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php',
'AdminAdminPreferencesController' => 'override/controllers/admin/AdminAdminPreferencesController.php',
@@ -164,7 +163,6 @@
'AdminSpecificPriceRuleControllerCore' => 'controllers/admin/AdminSpecificPriceRuleController.php',
'AdminStatesController' => 'override/controllers/admin/AdminStatesController.php',
'AdminStatesControllerCore' => 'controllers/admin/AdminStatesController.php',
- 'AdminStatsConfController' => 'override/controllers/admin/AdminStatsConfController.php',
'AdminStatsController' => 'override/controllers/admin/AdminStatsController.php',
'AdminStatsControllerCore' => 'controllers/admin/AdminStatsController.php',
'AdminStatsTabController' => 'override/controllers/admin/AdminStatsTabController.php',
@@ -183,7 +181,6 @@
'AdminStockMvtControllerCore' => 'controllers/admin/AdminStockMvtController.php',
'AdminStoresController' => 'override/controllers/admin/AdminStoresController.php',
'AdminStoresControllerCore' => 'controllers/admin/AdminStoresController.php',
- 'AdminSubDomainsController' => 'override/controllers/admin/AdminSubDomainsController.php',
'AdminSuppliersController' => 'override/controllers/admin/AdminSuppliersController.php',
'AdminSuppliersControllerCore' => 'controllers/admin/AdminSuppliersController.php',
'AdminSupplyOrdersController' => 'override/controllers/admin/AdminSupplyOrdersController.php',
@@ -327,7 +324,6 @@
'DispatcherCore' => 'classes/Dispatcher.php',
'Employee' => 'override/classes/Employee.php',
'EmployeeCore' => 'classes/Employee.php',
- 'FB' => 'override/classes/fb.php',
'Feature' => 'override/classes/Feature.php',
'FeatureCore' => 'classes/Feature.php',
'FeatureValue' => 'override/classes/FeatureValue.php',
@@ -581,7 +577,6 @@
'StoreCore' => 'classes/Store.php',
'StoresController' => 'override/controllers/front/StoresController.php',
'StoresControllerCore' => 'controllers/front/StoresController.php',
- 'SubDomain' => 'override/classes/SubDomain.php',
'Supplier' => 'override/classes/Supplier.php',
'SupplierController' => 'override/controllers/front/SupplierController.php',
'SupplierControllerCore' => 'controllers/front/SupplierController.php',
diff --git a/js/admin.js b/js/admin.js
index 57ca38cfd..b0a0985c7 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -616,7 +616,7 @@ function checkAllMultishopDefaultValue(item)
function checkMultishopDefaultValue(obj, key)
{
- if ($(obj).attr('checked') || $('#'+key).hasClass('isInvisible'))
+ if (!$(obj).attr('checked') || $('#'+key).hasClass('isInvisible'))
{
$('#conf_id_'+key+' input, #conf_id_'+key+' textarea, #conf_id_'+key+' select').attr('disabled', true);
$('#conf_id_'+key+' label.conf_title').addClass('isDisabled');