diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index 3298e9739..b0f8cc0f8 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -873,7 +873,7 @@ Request Body: - + diff --git a/mifosng-db/patches/patch-01-add-update-loan-officer-permission.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-01-add-update-loan-officer-permission.sql similarity index 100% rename from mifosng-db/patches/patch-01-add-update-loan-officer-permission.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-01-add-update-loan-officer-permission.sql diff --git a/mifosng-db/patches/patch-02-audit-indexes.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-02-audit-indexes.sql similarity index 100% rename from mifosng-db/patches/patch-02-audit-indexes.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-02-audit-indexes.sql diff --git a/mifosng-db/patches/patch-03-add-loan-status-enums-to-report-table.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-03-add-loan-status-enums-to-report-table.sql similarity index 100% rename from mifosng-db/patches/patch-03-add-loan-status-enums-to-report-table.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-03-add-loan-status-enums-to-report-table.sql diff --git a/mifosng-db/patches/patch-04-add-account-identifier-to-client.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-04-add-account-identifier-to-client.sql similarity index 100% rename from mifosng-db/patches/patch-04-add-account-identifier-to-client.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-04-add-account-identifier-to-client.sql diff --git a/mifosng-db/patches/patch-05-restructure-command-audit-table.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-05-restructure-command-audit-table.sql similarity index 100% rename from mifosng-db/patches/patch-05-restructure-command-audit-table.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-05-restructure-command-audit-table.sql diff --git a/mifosng-db/patches/patch-06-create-global-configuration-table.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-06-create-global-configuration-table.sql similarity index 100% rename from mifosng-db/patches/patch-06-create-global-configuration-table.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-06-create-global-configuration-table.sql diff --git a/mifosng-db/patches/patch-07-map-loan-products-to-gl-accounts.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-07-map-loan-products-to-gl-accounts.sql old mode 100755 new mode 100644 similarity index 100% rename from mifosng-db/patches/patch-07-map-loan-products-to-gl-accounts.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-07-map-loan-products-to-gl-accounts.sql diff --git a/mifosng-db/patches/patch-08-add-fullname-or-businessname-field.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-08-add-fullname-or-businessname-field.sql similarity index 100% rename from mifosng-db/patches/patch-08-add-fullname-or-businessname-field.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-08-add-fullname-or-businessname-field.sql diff --git a/mifosng-db/patches/patch-09-add-account-identifier-to-loan.sql b/mifosng-db/patchesPutOnDemoServier20130113/patch-09-add-account-identifier-to-loan.sql similarity index 100% rename from mifosng-db/patches/patch-09-add-account-identifier-to-loan.sql rename to mifosng-db/patchesPutOnDemoServier20130113/patch-09-add-account-identifier-to-loan.sql diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java similarity index 91% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java rename to mifosng-provider/src/main/java/org/mifosplatform/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java index e8bcbd9eb..303e3eb0e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java +++ b/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 { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java index d3c686e56..a760dbb64 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java +++ b/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; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java b/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java index 35c01ff63..487d48c3a 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/commands/service/SynchronousCommandProcessingService.java +++ b/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; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java index 9268cebe2..3139e0106 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/GenericDataServiceImpl.java +++ b/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; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java index 1691d351e..b8e050279 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/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 }); }
Field Descriptions
principal
Loan amount.
The amount to be provided in the loan.
externalId
A place to put an external reference for this loan e.g. The ID another system uses.
If provided, it must be unique.