// Fix multishop checkbox on theme selection

admin-dev/themes/default/template/helpers/options/options.tpl

@@ -58,7 +58,7 @@
 			<p>{$categoryData['info']}</p>
 		{/if}
 
-		{if $use_multishop}
+		{if !$categoryData['hide_multishop_checkbox'] && $use_multishop}
 			<input type="checkbox" style="vertical-align: text-top" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check / uncheck all'}</b> {l s='(check boxes if you want to set a custom value for this shop or group shop context)'}
 			<div class="separation"></div>
 		{/if}
@@ -68,7 +68,7 @@
 					<input type="hidden" name="{$key}" value="{$field['value']}" />
 				{else}
 					<div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>
-					{if ($field['multishop_default'])}
+					{if $field['multishop_default'] && empty($field['no_multishop_checkbox'])}
 						<div class="preference_default_multishop">
 							<input type="checkbox" name="multishopOverrideOption[{$key}]" value="1" {if !$field['is_disabled']}checked="checked"{/if} onclick="checkMultishopDefaultValue(this, '{$key}')" />
 						</div>