update patches after server upgrade. change order of client search results to use display name.

api-docs/apiLive.htm

@@ -873,7 +873,7 @@ Request Body:
                 <table class=matrixHeading>
                     <tr class="matrixHeadingBG"><td><div class="mifosXHeading2">Field Descriptions</div></td></tr>
                     <tr class=alt><td>principal</td></tr>
-                    <tr><td class=fielddesc>Loan amount.</td></tr>
+                    <tr><td class=fielddesc>The amount to be provided in the loan.</td></tr>
                     <tr class=alt><td>externalId</td></tr>
                     <tr><td class=fielddesc>A place to put an external reference for this loan e.g. The ID another system uses.<br>
                     If provided, it must be unique.</td></tr>

mifosng-provider/src/main/java/org/mifosplatform/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java

@@ -1,4 +1,4 @@
-package org.mifosplatform.portfolio.client.service;
+package org.mifosplatform.commands.exception;
 
 public class RollbackTransactionAsCommandIsNotApprovedByCheckerException extends RuntimeException {
 

mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java

@@ -4,11 +4,11 @@ import org.apache.commons.lang.StringUtils;
 import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.domain.CommandSourceRepository;
 import org.mifosplatform.commands.domain.CommandWrapper;
+import org.mifosplatform.commands.exception.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.mifosplatform.infrastructure.core.api.JsonCommand;
 import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
 import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java

@@ -6,6 +6,7 @@ import org.joda.time.DateTime;
 import org.mifosplatform.commands.domain.CommandSource;
 import org.mifosplatform.commands.domain.CommandSourceRepository;
 import org.mifosplatform.commands.domain.CommandWrapper;
+import org.mifosplatform.commands.exception.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.mifosplatform.commands.exception.UnsupportedCommandException;
 import org.mifosplatform.commands.handler.NewCommandSourceHandler;
 import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService;
@@ -14,7 +15,6 @@ import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
 import org.mifosplatform.infrastructure.core.data.CommandProcessingResultBuilder;
 import org.mifosplatform.infrastructure.core.serialization.ToApiJsonSerializer;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.portfolio.client.service.RollbackTransactionAsCommandIsNotApprovedByCheckerException;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java

@@ -66,7 +66,7 @@ public class GenericDataServiceImpl implements GenericDataService {
 
     @Override
     public void updateSQL(final String sql, final String sqlErrorMsg) {
-        
+
         // long startTime = System.currentTimeMillis();
         Connection db_connection = null;
         Statement db_statement = null;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java

@@ -65,7 +65,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 
         if (StringUtils.isNotBlank(extraCriteria)) sql += " and (" + extraCriteria + ")";
 
-        sql += " order by c.lastname ASC, c.firstname ASC";
+        sql += " order by c.display_name ASC, c.account_no ASC";
 
         return this.jdbcTemplate.query(sql, rm, new Object[] { hierarchySearchString });
     }