From 6c327d40ca955a388da072e7d8923df9166f2163 Mon Sep 17 00:00:00 2001
From: Kenji Tanaka <k.tanaka@cgiar.org>
Date: Tue, 16 Jan 2024 09:38:47 -0500
Subject: [PATCH 1/2] :wrench: chore(Hibernate mapping): Update Tip parameters
 generator mapping

---
 marlo-data/src/main/resources/xmls/TipParameters.hbm.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml b/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml
index 086e30205f..4689b84f42 100644
--- a/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml
+++ b/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml
@@ -6,7 +6,7 @@
     optimistic-lock="none">
       <id name="id" type="java.lang.Long">
       <column name="id" />
-     <generator class="assigned" />
+     <generator class="identity" />
     </id>
     <property name="tipTokenService" type="string">
       <column name="tip_token_service"/>

From d69616f4c1d61b61985cafee95070f5866f94850 Mon Sep 17 00:00:00 2001
From: Kenji Tanaka <k.tanaka@cgiar.org>
Date: Tue, 16 Jan 2024 14:21:32 -0500
Subject: [PATCH 2/2] :art: style(labels): Update leverage section labels

---
 .../webapp/WEB-INF/crp/views/projects/projectLeverages.ftl    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl
index 409af177ab..359c0240e3 100644
--- a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl
@@ -134,9 +134,9 @@
       [#-- Type select --]
       <div class="col-md-8">
         [#if (leverage.isPhaseOneLeverage())!false ]
-          [@customForm.select name="${leverageCustomName}.ipProgram.id" label=""  i18nkey="Flagship" listName="flagshipsPhaseOne" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
+          [@customForm.select name="${leverageCustomName}.ipProgram.id" label=""  i18nkey="global.flagship" listName="flagshipsPhaseOne" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
         [#else]
-          [@customForm.select name="${leverageCustomName}.crpProgram.id" label=""  i18nkey="Flagship" listName="flagshipsPhaseTwo" keyFieldName="id"  displayFieldName="composedName"   multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
+          [@customForm.select name="${leverageCustomName}.crpProgram.id" label=""  i18nkey="global.flagship" listName="flagshipsPhaseTwo" keyFieldName="id"  displayFieldName="composedName"   multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
         [/#if]
       </div> 
       [#-- Budget select --]