midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Bug in MergeEntities - ID: 2354120 

Bug and solution reported by Susanne Calderon
This commit is contained in:
Carlos Ruiz 2008-11-28 06:41:45 +00:00
parent bf6e355ec9
commit f2d16bd8a3
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/src/org/compiere/apps/form/VMerge.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution * * Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. * * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -16,15 +16,32 @@
*****************************************************************************/ *****************************************************************************/
package org.compiere.apps.form; package org.compiere.apps.form;
import java.awt.*; import java.awt.BorderLayout;
import java.awt.event.*; import java.awt.Cursor;
import java.sql.*; import java.awt.Font;
import java.util.logging.*; import java.awt.GridLayout;
import org.compiere.apps.*; import java.awt.event.ActionEvent;
import org.compiere.grid.ed.*; import java.awt.event.ActionListener;
import org.compiere.model.*; import java.sql.PreparedStatement;
import org.compiere.swing.*; import java.sql.ResultSet;
import org.compiere.util.*; import java.util.logging.Level;
import org.compiere.apps.ADialog;
import org.compiere.apps.ConfirmPanel;
import org.compiere.grid.ed.VLookup;
import org.compiere.model.MBPartner;
import org.compiere.model.MInvoice;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPayment;
import org.compiere.model.X_M_Cost;
import org.compiere.swing.CLabel;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Trx;
/** /**
* Merge Dialog. * Merge Dialog.
@ -300,7 +317,7 @@ public class VMerge extends CPanel
+ "WHERE t.IsView='N'" + "WHERE t.IsView='N'"
+ " AND t.TableName NOT IN ('C_TaxDeclarationAcct')" + " AND t.TableName NOT IN ('C_TaxDeclarationAcct')"
+ " AND (" + " AND ("
+ "(c.ColumnName=? AND c.IsKey='N')" // #1 - direct + "(c.ColumnName=? AND c.IsKey='N' AND c.ColumnSQL IS NULL)" // #1 - direct
+ " OR " + " OR "
+ "c.AD_Reference_Value_ID IN " // Table Reference + "c.AD_Reference_Value_ID IN " // Table Reference
+ "(SELECT rt.AD_Reference_ID FROM AD_Ref_Table rt" + "(SELECT rt.AD_Reference_ID FROM AD_Ref_Table rt"