From 015f0f44f397faa306e4834c0307a11110df874f Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 22 Aug 2008 20:32:51 +0000 Subject: [PATCH] Integrate revision 5543 Fix from Paul (phib) [ 2005701 ] Merge orgs fails -- duplicate role org access http://sourceforge.net/tracker/index.php?func=detail&aid=2005701&group_id=176962&atid=879332 --- client/src/org/compiere/apps/form/VMerge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/org/compiere/apps/form/VMerge.java b/client/src/org/compiere/apps/form/VMerge.java index 183d88e9da..8253ddaa5f 100644 --- a/client/src/org/compiere/apps/form/VMerge.java +++ b/client/src/org/compiere/apps/form/VMerge.java @@ -57,7 +57,7 @@ public class VMerge extends CPanel /** Tables to delete (not update) for AD_Org */ static private String[] s_delete_Org = new String[] - {"AD_OrgInfo"}; + {"AD_OrgInfo", "AD_Role_OrgAccess"}; /** Tables to delete (not update) for AD_User */ static private String[] s_delete_User = new String[] {"AD_User_Roles"};