From 1934798cd40425359cb1fbe4dce74069ad650ef5 Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Fri, 5 Mar 2021 16:15:50 +0200
Subject: [PATCH 1/2] Fix 3.5 patch

---
 .../patch/rm-patch-v35-context.xml                       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
index cc54b588ad..6f33953408 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
@@ -5,16 +5,15 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
    <!-- RM v3.5 Patches -->
-   <!-- fixesFromSchema must be 3201 because we apply this patch over RMv32HoldChildAssocPatch  -->
-   <bean id="rm.holdChildAssocPatch"
+   <bean id="rm.holdNewChildAssocPatch"
          parent="rm.parentModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch">
       <property name="description" value="Create new hold child association to link the record to the hold"/>
-      <property name="fixesFromSchema" value="3201" />
-      <property name="fixesToSchema" value="3500"/>
+      <property name="fixesToSchema" value="3300"/>
+      <property name="targetSchema" value="3500" />
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
       <property name="filePlanService" ref="filePlanService" />
       <property name="holdService" ref="holdService" />
       <property name="nodeService" ref="nodeService" />
    </bean>
-</beans>
\ No newline at end of file
+</beans>

From ce12582d27ee51454941511ed65b8a392f42149b Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Fri, 5 Mar 2021 17:39:29 +0200
Subject: [PATCH 2/2] code review comment

---
 .../org_alfresco_module_rm/patch/rm-patch-v35-context.xml     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
index 6f33953408..6159adab5f 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
@@ -9,7 +9,9 @@
          parent="rm.parentModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch">
       <property name="description" value="Create new hold child association to link the record to the hold"/>
-      <property name="fixesToSchema" value="3300"/>
+      <!-- fixesFromSchema must be 3201 because we apply this patch over RMv32HoldChildAssocPatch  -->
+      <property name="fixesFromSchema" value="3201"/>
+      <property name="fixesToSchema" value="3499"/>
       <property name="targetSchema" value="3500" />
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
       <property name="filePlanService" ref="filePlanService" />