From 7a46658a1ac93eaf45ac548e4700b49b8c4b8834 Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@cafedered.com>
Date: Tue, 22 Nov 2011 15:52:59 +0100
Subject: [PATCH] [Bug #1246] Added sorting for Customer field

FEA: ItEr75S04BugFixing
---
 .../externalcompanies/entities/ExternalCompany.java       | 8 +++++++-
 .../main/java/org/libreplan/web/orders/OrderModel.java    | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java
index a3a4644ae..a9274516f 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java
@@ -36,7 +36,8 @@ import org.libreplan.business.users.entities.User;
  *
  * @author Jacobo Aragunde Perez <jaragunde@igalia.com>
  */
-public class ExternalCompany extends BaseEntity implements IHumanIdentifiable{
+public class ExternalCompany extends BaseEntity implements IHumanIdentifiable,
+        Comparable<ExternalCompany> {
 
     private String name;
 
@@ -195,4 +196,9 @@ public class ExternalCompany extends BaseEntity implements IHumanIdentifiable{
         return name;
     }
 
+    @Override
+    public int compareTo(ExternalCompany company) {
+        return this.getName().compareToIgnoreCase(company.getName());
+    }
+
 }
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 07ae06d17..136897c8e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -26,6 +26,7 @@ import static org.libreplan.web.I18nHelper._;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -659,6 +660,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
     private void loadExternalCompaniesAreClient() {
         this.externalCompanies = externalCompanyDAO
                 .getExternalCompaniesAreClient();
+        Collections.sort(this.externalCompanies);
     }
 
     @Override