merging 1.17.1 into develop

CHANGELOG.md

@@ -6,7 +6,8 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for
 Releases
 ===============
 
-1. 17 Dec 2013 - 1.17.0.RELEASE
+1. 21 Feb 2014 - 1.17.1.RELEASE
+1. 17 Jan 2014 - 1.17.0.RELEASE
 1. 29 Dec 2013 - 1.16.1.RELEASE
 1. 15 Dec 2013 - 1.16.0.RELEASE
 1. 12 Dec 2013 - 1.15.2.RELEASE
@@ -56,6 +57,21 @@ Releases
 1. 05 April 2013 - 0.11.1.beta
 1. 05 April 2013 - 0.11.0.beta
 
+1.17.1.RELEASE
+=============
+Bug Release
+
+Bugs
+ - [MIFOSX-827] - Not able to disburse loan with the percentage charges applied while submitting the loan application.
+ - [MIFOSX-860] - NOt able to reject the loan application with status "Submitted and pending for approval"
+ - [MIFOSX-873] - Get clients by office id API is returing HTTP Status 500
+ - [MIFOSX-875] - Attach duplicate mobile number while creating Client results in Unknown Data Integrity Issue
+ - [MIFOSX-876] - Retrieve Loan by Loan account number returns all loan account in API
+ - [MIFOSX-878] - Not able to use created datatable for a client results in Forbidden error
+ - [MIFOSX-882] - API doccument related Issues
+ - [MIFOSX-883] - Additional fields added in Edit datatables (for client) page is not woking as expected
+ - [MIFOSX-912] - Client Loan amount is not getting rounded off even if "Currency in Multiples Of" is set as 100 in loan product.
+ 
 1.17.0.RELEASE
 =============
 Feature Release

api-docs/apiLive.htm

@@ -90,7 +90,7 @@
 <body>
 	<div id="page-wrapper">
 		<div id="flybar">
-			<div id="nav-logo">1.17.0.RELEASE</div>
+			<div id="nav-logo">1.18.0.RELEASE</div>
 			<div class="flybar-nav">
 				<h2 class="flybar-button">Overview</h2>
 				<div class="flybar-menu-overview">
@@ -2507,7 +2507,7 @@ GET https://DomainName/api/v1/clients/{clientId}
 					<p>Example Requests:</p>
 					<div class=apiClick>clients</div>
 					<br>
-					<div class=apiClick>clients?fields=displayName,officeName,joinedDate</div>
+					<div class=apiClick>clients?fields=displayName,officeName,timeline</div>
 					<br>
 					<div class=apiClick>clients?offset=10&limit=50</div>
 					<br>
@@ -3494,7 +3494,7 @@ PUT centers/8
 Content-Type: application/json 
 Request Body:
 {
-	"name": "First Center (No groups)",
+	"name": "First Center (No groups)"
 }
 					</code>
 					<code class="method-response">

mifosng-provider/gradle.properties

@@ -1,4 +1,4 @@
-releaseVersion=1.17.0.RELEASE
+releaseVersion=1.17.1.RELEASE
 
 
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java

@@ -43,9 +43,14 @@ public class ClientApiConstants {
     public static final String hierarchyParamName = "hierarchy";
     public static final String displayNameParamName = "displayName";
     public static final String officeNameParamName = "officeName";
+    public static final String staffNameParamName = "staffName";
     public static final String trasnferOfficeNameParamName = "transferOfficeName";
+    public static final String transferToOfficeNameParamName = "transferToOfficeName";
+    public static final String transferToOfficeIdParamName = "transferToOfficeId";
     public static final String imageKeyParamName = "imageKey";
+    public static final String imageIdParamName = "imageId";
     public static final String imagePresentParamName = "imagePresent";
+    public static final String timelineParamName = "timeline";
 
     // associations related part of response
     public static final String groupsParamName = "groups";
@@ -69,10 +74,10 @@ public class ClientApiConstants {
      * match those of request parameters.
      */
     public static final Set<String> CLIENT_RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(idParamName, accountNoParamName,
-            externalIdParamName, mobileNoParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
-            lastnameParamName, fullnameParamName, displayNameParamName, officeIdParamName, officeNameParamName, transferOfficeIdParamName,
-            trasnferOfficeNameParamName, hierarchyParamName, imageKeyParamName, imagePresentParamName, groupsParamName,
-            officeOptionsParamName, staffOptionsParamName));
+            externalIdParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
+            lastnameParamName, fullnameParamName, displayNameParamName, mobileNoParamName, officeIdParamName, officeNameParamName,
+            transferToOfficeIdParamName, transferToOfficeNameParamName, hierarchyParamName, imageIdParamName, imagePresentParamName,
+            staffIdParamName, staffNameParamName, timelineParamName, groupsParamName, officeOptionsParamName, staffOptionsParamName));
 
     public static final Set<String> ACTIVATION_REQUEST_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(localeParamName,
             dateFormatParamName, activationDateParamName));

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java

@@ -261,8 +261,6 @@ public final class ClientDataValidator {
                     baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
                 }
 
-            } else {
-                baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
             }
         }