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
This commit is contained in:
parent
679bb893b7
commit
015f0f44f3
|
|
@ -57,7 +57,7 @@ public class VMerge extends CPanel
|
||||||
|
|
||||||
/** Tables to delete (not update) for AD_Org */
|
/** Tables to delete (not update) for AD_Org */
|
||||||
static private String[] s_delete_Org = new String[]
|
static private String[] s_delete_Org = new String[]
|
||||||
{"AD_OrgInfo"};
|
{"AD_OrgInfo", "AD_Role_OrgAccess"};
|
||||||
/** Tables to delete (not update) for AD_User */
|
/** Tables to delete (not update) for AD_User */
|
||||||
static private String[] s_delete_User = new String[]
|
static private String[] s_delete_User = new String[]
|
||||||
{"AD_User_Roles"};
|
{"AD_User_Roles"};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue