From 27dc2a96503015bc74ab190ab2852ace027a6ae8 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Thu, 23 May 2013 16:46:49 +0100
Subject: [PATCH 1/4] MIFOSX-387: currency should not be included in response
 of list of product options for loan template.

---
 .../portfolio/loanproduct/data/LoanProductData.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
index 173149150..d654a0342 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/data/LoanProductData.java
@@ -153,7 +153,7 @@ public class LoanProductData {
         final Long id = null;
         final String name = null;
         final String description = null;
-        final CurrencyData currency = null;
+        final CurrencyData currency = CurrencyData.blank();
         final BigDecimal principal = null;
         final BigDecimal minPrincipal = null;
         final BigDecimal maxPrincipal = null;
@@ -204,19 +204,10 @@ public class LoanProductData {
             final EnumOptionData interestCalculationPeriodType, final Long fundId, final String fundName,
             final Long transactionProcessingStrategyId, final String transactionProcessingStrategyName,
             final Collection<ChargeData> charges, final EnumOptionData accountingType) {
-
         this.id = id;
         this.name = name;
         this.description = description;
-        if (currency == null) {
-            if (this.currencyOptions != null && this.currencyOptions.size() == 1) {
-                this.currency = new ArrayList<CurrencyData>(this.currencyOptions).get(0);
-            } else {
-                this.currency = CurrencyData.blank();
-            }
-        } else {
-            this.currency = currency;
-        }
+        this.currency = currency;
         this.principal = principal;
         this.minPrincipal = minPrincipal;
         this.maxPrincipal = maxPrincipal;

From 5f5074a768ca03f7950fce0953086d811e6c01a2 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Thu, 23 May 2013 16:49:03 +0100
Subject: [PATCH 2/4] bump up release version for bug release.

---
 api-docs/apiLive.htm               | 2 +-
 mifosng-provider/gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 95527acb9..12748a28d 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -90,7 +90,7 @@
 <body>
 	<div id="page-wrapper">
 		<div id="flybar">
-			<div id="nav-logo">1.1.3.RELEASE API</div>
+			<div id="nav-logo">1.1.4.RELEASE API</div>
 			<div class="flybar-nav">
 				<h2 class="flybar-button">Overview</h2>
 				<div class="flybar-menu-overview">
diff --git a/mifosng-provider/gradle.properties b/mifosng-provider/gradle.properties
index d5e929497..200c4b2c9 100644
--- a/mifosng-provider/gradle.properties
+++ b/mifosng-provider/gradle.properties
@@ -1 +1 @@
-releaseVersion=1.1.3.RELEASE
+releaseVersion=1.1.4.RELEASE

From 3d69e7fe559b46e5250e6333ea81ec12dd750855 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Fri, 24 May 2013 14:33:06 +0200
Subject: [PATCH 3/4] udpate for 1.1.4 release

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cab5f0486..f6752e09b 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ The mifos-platform (project named 'Mifos X') has reached <b>public release versi
 
 That means there is a published and stable API. This API is documented in the api-docs under <b>Full API Matrix</b>.
 
-Latest stable release: <a target="_blank" href="https://github.com/openMF/mifosx/tree/mifosplatform-1.1.3" title="mifosplatform-1.1.3">mifosplatform-1.1.3</a>
+Latest stable release: <a target="_blank" href="https://github.com/openMF/mifosx/tree/mifosplatform-1.1.4" title="mifosplatform-1.1.4">mifosplatform-1.1.4</a>
 
 License
 =============

From 07f4f1430dbfca495b02461198edcbd01c0f6933 Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Fri, 24 May 2013 14:36:41 +0200
Subject: [PATCH 4/4] udpate for 1.1.4 release

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2b0f8c35..5332ff1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for
 Releases
 ===============
 
+1. 24 May 2013 - 1.1.4.RELEASE
 1. 22 May 2013 - 1.1.3.RELEASE
 1. 19 May 2013 - 1.1.2.RELEASE
 1. 12 May 2013 - 1.1.1.RELEASE
@@ -20,6 +21,18 @@ Releases
 1. 05 April 2013 - 0.11.1.beta
 1. 05 April 2013 - 0.11.0.beta
 
+1.1.4.RELEASE
+=============
+Bug Release
+
+Platform & API
+ - [MIFOSX-387] - Loans template for Client not showing currencies
+
+Reference App
+ - [MIFOSX-382] - In Change Loan Application by changing the "Product" name, Details are not getting updated (ie, in Terms & settings),since "currencies" of two loan products are different
+ - [MIFOSX-390] - Regression in ability to associate a fund with a loan application through reference app
+
+
 1.1.3.RELEASE
 =============
 Bug Release