// Removed useless option "billing according to the default behavior" in the carrier wizard and carrier options

classes/Carrier.php

@@ -165,6 +165,14 @@ class CarrierCore extends ObjectModel
 	public function __construct($id = null, $id_lang = null)
 	{
 		parent::__construct($id, $id_lang);
+		
+		/**
+		 * keep retrocompatibility SHIPPING_METHOD_DEFAULT
+		 * @deprecated 1.5.5
+		 */
+		if ($this->shipping_method == Carrier::SHIPPING_METHOD_DEFAULT)
+			$this->shipping_method = ((int)Configuration::get('PS_SHIPPING_METHOD') ? Carrier::SHIPPING_METHOD_WEIGHT : Carrier::SHIPPING_METHOD_PRICE);
+
 		/**
 		 * keep retrocompatibility id_tax_rules_group
 		 * @deprecated 1.5.0

controllers/admin/AdminCarrierWizardController.php

@@ -271,11 +271,6 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'class' => 't',
 						'br' => true,
 						'values' => array(
-							array(
-								'id' => 'billing_default',
-								'value' => Carrier::SHIPPING_METHOD_DEFAULT,
-								'label' => $this->l('Default behavior')
-							),
 							array(
 								'id' => 'billing_price',
 								'value' => Carrier::SHIPPING_METHOD_PRICE,

controllers/admin/AdminShippingController.php

@@ -69,22 +69,23 @@ class AdminShippingControllerCore extends AdminController
 					</ul>',
 				'submit' => array()
 			),
-			'billing' => array(
+			// Deprecated since 1.5.5
-				'title' =>	$this->l('Billing'),
+			// 'billing' => array(
-				'icon' => 'money',
+				// 'title' =>	$this->l('Billing'),
-				'fields' =>	array(
+				// 'icon' => 'money',
-					'PS_SHIPPING_METHOD' => array(
+				// 'fields' =>	array(
-						'title' => $this->l('Billing'),
+					// 'PS_SHIPPING_METHOD' => array(
-						'cast' => 'intval',
+						// 'title' => $this->l('Billing'),
-						'type' => 'radio',
+						// 'cast' => 'intval',
-						'choices' => array(
+						// 'type' => 'radio',
-							0 => $this->l('According to total price'),
+						// 'choices' => array(
-							1 => $this->l('According to total weight')
+							// 0 => $this->l('According to total price'),
-						),
+							// 1 => $this->l('According to total weight')
-						'validation' => 'isBool'
+						// ),
-					),
+						// 'validation' => 'isBool'
-				)
+					// ),
-			),
+				// )
+			// ),
 		);
 	}