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

IDEMPIERE-3159 Importing Orders / Invoices implicitly creating BPs fail to see BPs already created in the same import process / integrate patch contributed by Daniel Haag (dhdx)

This commit is contained in:
Carlos Ruiz 2016-08-24 15:03:55 +02:00
parent eb581aa70e
commit 5cfb8bce61
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base.process/src/org/compiere/process/ImportInvoice.java
View File

@ -525,7 +525,7 @@ public class ImportInvoice extends SvrProcess
imp.setName (imp.getBPartnerValue ()); imp.setName (imp.getBPartnerValue ());
} }
// BPartner // BPartner
MBPartner bp = MBPartner.get (getCtx(), imp.getBPartnerValue()); MBPartner bp = MBPartner.get (getCtx(), imp.getBPartnerValue(), get_TrxName());
if (bp == null) if (bp == null)
{ {
bp = new MBPartner (getCtx (), -1, get_TrxName()); bp = new MBPartner (getCtx (), -1, get_TrxName());

2
org.adempiere.base.process/src/org/compiere/process/ImportOrder.java
View File

@ -525,7 +525,7 @@ public class ImportOrder extends SvrProcess
imp.setName (imp.getBPartnerValue ()); imp.setName (imp.getBPartnerValue ());
} }
// BPartner // BPartner
MBPartner bp = MBPartner.get (getCtx(), imp.getBPartnerValue()); MBPartner bp = MBPartner.get (getCtx(), imp.getBPartnerValue(), get_TrxName());
if (bp == null) if (bp == null)
{ {
bp = new MBPartner (getCtx (), -1, get_TrxName()); bp = new MBPartner (getCtx (), -1, get_TrxName());

32
org.adempiere.base/src/org/compiere/model/MBPartner.java
View File

@ -47,7 +47,7 @@ public class MBPartner extends X_C_BPartner
/** /**
* *
*/ */
private static final long serialVersionUID = -5503105554864289337L; private static final long serialVersionUID = -803727877324075871L;
/** /**
* Get Empty Template Business Partner * Get Empty Template Business Partner
@ -110,12 +110,23 @@ public class MBPartner extends X_C_BPartner
* @param Value value * @param Value value
* @return BPartner or null * @return BPartner or null
*/ */
public static MBPartner get (Properties ctx, String Value) public static MBPartner get (Properties ctx, String Value) {
return get(ctx,Value,null);
}
/**
* Get BPartner with Value in a transaction
* @param ctx context
* @param Value value
* @param trxName transaction
* @return BPartner or null
*/
public static MBPartner get (Properties ctx, String Value, String trxName)
{ {
if (Value == null || Value.length() == 0) if (Value == null || Value.length() == 0)
return null; return null;
final String whereClause = "Value=? AND AD_Client_ID=?"; final String whereClause = "Value=? AND AD_Client_ID=?";
MBPartner retValue = new Query(ctx, I_C_BPartner.Table_Name, whereClause, null) MBPartner retValue = new Query(ctx, I_C_BPartner.Table_Name, whereClause, trxName)
.setParameters(Value,Env.getAD_Client_ID(ctx)) .setParameters(Value,Env.getAD_Client_ID(ctx))
.firstOnly(); .firstOnly();
return retValue; return retValue;
@ -128,9 +139,22 @@ public class MBPartner extends X_C_BPartner
* @return BPartner or null * @return BPartner or null
*/ */
public static MBPartner get (Properties ctx, int C_BPartner_ID) public static MBPartner get (Properties ctx, int C_BPartner_ID)
{
return get(ctx,C_BPartner_ID,null);
}
/**
* Get BPartner with Value in a transaction
* @param ctx context
* @param Value value
* @param trxName transaction
* @return BPartner or null
*/
public static MBPartner get (Properties ctx, int C_BPartner_ID, String trxName)
{ {
final String whereClause = "C_BPartner_ID=? AND AD_Client_ID=?"; final String whereClause = "C_BPartner_ID=? AND AD_Client_ID=?";
MBPartner retValue = new Query(ctx,I_C_BPartner.Table_Name,whereClause,null) MBPartner retValue = new Query(ctx,I_C_BPartner.Table_Name,whereClause,trxName)
.setParameters(C_BPartner_ID,Env.getAD_Client_ID(ctx)) .setParameters(C_BPartner_ID,Env.getAD_Client_ID(ctx))
.firstOnly(); .firstOnly();
return retValue; return retValue;