First start at retiring Affiliate in favour of RTM

modules/adsl/classes/ADSL.php

@@ -32,7 +32,7 @@ class ADSL {
 		if (preg_match('/^a:/',$data))
 			throw new Kohana_Exception('Data shouldnt be a serialized array');
 
-		$ao = ORM::factory('Adsl_Plan',$data);
+		$ao = ORM::factory('ADSL_Plan',$data);
 		$output = View::factory('adsl/contract_view')
 			->set('record',$ao)
 			->set('price_base',$price_base)

modules/adsl/classes/Model/ADSL/Plan.php

@@ -9,7 +9,7 @@
  * @copyright  (c) 2009-2013 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Model_Adsl_Plan extends ORM_OSB {
+class Model_ADSL_Plan extends ORM_OSB {
 	// Relationships
 	// @todo This model should probably be joined with product_plugin_adsl
 	protected $_belongs_to = array(

modules/adsl/classes/Model/Service/Plugin/Adsl.php

@@ -19,7 +19,7 @@ class Model_Service_Plugin_Adsl extends Model_Service_Plugin {
 	);
 
 	protected $_has_one = array(
-		'adsl_plan'=>array('far_key'=>'provided_adsl_plan_id','foreign_key'=>'id'),
+		'adsl_plan'=>array('model'=>'ADSL_Plan','far_key'=>'provided_adsl_plan_id','foreign_key'=>'id'),
 	);
 
 	protected $_display_filters = array(