From e2eff9f41304eb05f83fdf62693b40b81907b91f Mon Sep 17 00:00:00 2001
From: Prakash M <prakash@qualiantech.com>
Date: Mon, 23 Nov 2020 20:21:12 +0530
Subject: [PATCH] Fixes addition of store name to the new roles created

---
 .../copystore/process/DefaultPropertiesHandler.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/org/openbravo/retail/copystore/process/DefaultPropertiesHandler.java b/src/org/openbravo/retail/copystore/process/DefaultPropertiesHandler.java
index adcd8ba..5bbcc76 100644
--- a/src/org/openbravo/retail/copystore/process/DefaultPropertiesHandler.java
+++ b/src/org/openbravo/retail/copystore/process/DefaultPropertiesHandler.java
@@ -918,7 +918,18 @@ public class DefaultPropertiesHandler {
       @Override
       public void handleProperty(BaseOBObject originalObject, BaseOBObject newObject,
           CopyStoreProcess process) {
-        newObject.set("name", originalObject.get("name") + "-" + process.getParam("name"));
+        Role originalEvent = (Role) originalObject;
+        String newName;
+        if (originalEvent.getName().contains(process.originalStore.getSearchKey())) {
+          newName = originalEvent.getName()
+              .replace(process.originalStore.getSearchKey(), process.getParam("searchKey"));
+        } else if (originalEvent.getName().contains(process.originalStore.getName())) {
+          newName = originalEvent.getName()
+              .replace(process.originalStore.getName(), process.getParam("name"));
+        } else {
+          newName = originalEvent.getName();
+        }
+        newObject.set("name", newName);
       }
     }
   }
-- 
2.20.1