Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl

@@ -42,7 +42,7 @@
 					</td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) &&  !$form_id) || isset($change_ranges)} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone])} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />
+							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) &&  !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone])} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />
 						</td>
 					{/foreach}
 				</tr>

controllers/admin/AdminCarrierWizardController.php

@@ -62,19 +62,15 @@ class AdminCarrierWizardControllerCore extends AdminController
 			'steps' => array(
 				array(
 					'title' => $this->l('General settings'),
-					'desc' => $this->l('General settings'),
 				),
 				array(
 					'title' => $this->l('Shipping locations and costs'),
-					'desc' => $this->l('Shipping locations and costs'),
 				),
 				array(
                     'title' => $this->l('Size, weight, and group access'),
-					'desc' => $this->l('Size, weight, and group access'),
 				),
 				array(
 					'title' => $this->l('Summary'),
-					'desc' => $this->l('Summary'),
 				),
 
 			));