diff --git a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php index 44fb273afb..1328dfd18d 100644 --- a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php +++ b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php @@ -123,8 +123,6 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement', 'Class:ProviderContract/Attribute:coverage' => 'Coverage', 'Class:ProviderContract/Attribute:coverage+' => '', - 'Class:ProviderContract/Attribute:customer_list' => 'Customers', - 'Class:ProviderContract/Attribute:customer_list+' => 'Organizations for which this contract is delivering services', )); // @@ -138,6 +136,10 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:CustomerContract/Attribute:org_id+' => '', 'Class:CustomerContract/Attribute:org_name' => 'Customer name', 'Class:CustomerContract/Attribute:org_name+' => '', + 'Class:CustomerContract/Attribute:provider_id' => 'Provider', + 'Class:CustomerContract/Attribute:provider_id+' => '', + 'Class:CustomerContract/Attribute:provider_name' => 'Provider name', + 'Class:CustomerContract/Attribute:provider_name+' => '', 'Class:CustomerContract/Attribute:support_team_id' => 'Support team', 'Class:CustomerContract/Attribute:support_team_id+' => '', 'Class:CustomerContract/Attribute:support_team_name' => 'Support team', @@ -148,23 +150,6 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:CustomerContract/Attribute:sla_list+' => 'List of SLA related to the contract', )); -// -// Class: lnkProviderToCustomer -// - -Dict::Add('EN US', 'English', 'English', array( - 'Class:lnkProviderToCustomer' => 'Provider/Customer', - 'Class:lnkProviderToCustomer+' => '', - 'Class:lnkProviderToCustomer/Attribute:provider_id' => 'Provider', - 'Class:lnkProviderToCustomer/Attribute:provider_id+' => '', - 'Class:lnkProviderToCustomer/Attribute:provider_name' => 'Provider', - 'Class:lnkProviderToCustomer/Attribute:provider_name+' => '', - 'Class:lnkProviderToCustomer/Attribute:org_id' => 'Customer', - 'Class:lnkProviderToCustomer/Attribute:org_id+' => '', - 'Class:lnkProviderToCustomer/Attribute:org_name' => 'Customer', - 'Class:lnkProviderToCustomer/Attribute:org_name+' => '', -)); - // // Class: lnkContractToSLA // diff --git a/modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php b/modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php index 2eddea40a9..3e9f4ced32 100644 --- a/modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php +++ b/modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php @@ -86,9 +86,8 @@ class ProviderContract extends Contract MetaModel::Init_AddAttribute(new AttributeExternalField("provider_name", array("allowed_values"=>null, "extkey_attcode"=>"provider_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("sla", array("allowed_values"=>null, "sql"=>"sla", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("coverage", array("allowed_values"=>null, "sql"=>"coverage", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("customer_list", array("linked_class"=>"lnkProviderToCustomer", "ext_key_to_me"=>"provider_id", "ext_key_to_remote"=>"org_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array()))); - MetaModel::Init_SetZListItems('details', array('name', 'description', 'start_date', 'end_date', 'cost', 'cost_currency', 'cost_unit', 'billing_frequency', 'contact_list', 'document_list', 'ci_list', 'provider_id', 'sla', 'coverage', 'customer_list')); + MetaModel::Init_SetZListItems('details', array('name', 'description', 'start_date', 'end_date', 'cost', 'cost_currency', 'cost_unit', 'billing_frequency', 'contact_list', 'document_list', 'ci_list', 'provider_id', 'sla', 'coverage')); MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'start_date', 'end_date', 'cost', 'cost_currency', 'cost_unit', 'billing_frequency', 'provider_id', 'sla', 'coverage')); MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'start_date', 'end_date', 'cost', 'cost_currency', 'cost_unit', 'billing_frequency', 'provider_id', 'sla', 'coverage')); MetaModel::Init_SetZListItems('list', array('name', 'start_date', 'end_date', 'provider_id', 'sla', 'coverage'));