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

IDEMPIERE-1762 Ability to set a validation rule on fields for Payments

This commit is contained in:
Nicolas Micoud 2014-03-20 10:28:19 -05:00
parent 94610a51ac
commit 8e0d71a6ad
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/adempiere/base/DefaultLookupFactory.java
View File

@ -54,7 +54,7 @@ public class DefaultLookupFactory implements ILookupFactory{
} }
else if (gridFieldVO.displayType == Payment) else if (gridFieldVO.displayType == Payment)
{ {
lookup = new MPaymentLookup (gridFieldVO.ctx, gridFieldVO.WindowNo, gridFieldVO.AD_Column_ID); lookup = new MPaymentLookup (gridFieldVO.ctx, gridFieldVO.WindowNo, gridFieldVO.ValidationCode);
} }
else if (DisplayType.isLookup(gridFieldVO.displayType) && gridFieldVO.lookupInfo != null) else if (DisplayType.isLookup(gridFieldVO.displayType) && gridFieldVO.lookupInfo != null)
{ {

22
org.adempiere.base/src/org/compiere/model/MPaymentLookup.java
View File

@ -27,6 +27,7 @@ import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.NamePair; import org.compiere.util.NamePair;
import org.compiere.util.Util;
import org.compiere.util.ValueNamePair; import org.compiere.util.ValueNamePair;
/** /**
@ -35,24 +36,23 @@ import org.compiere.util.ValueNamePair;
* *
*/ */
public class MPaymentLookup extends Lookup implements Serializable { public class MPaymentLookup extends Lookup implements Serializable {
/** /**
* *
*/ */
private static final long serialVersionUID = -6863672221350217533L; private static final long serialVersionUID = 6505672741140583659L;
/** Context */ /** Context */
private Properties m_ctx; private Properties m_ctx;
/** IsSOTrx */ /** IsSOTrx */
private boolean m_isSOTrx = false; private boolean m_isSOTrx = false;
/** AD_Column_ID */ /** Validation Code */
private int m_AD_Column_ID; private String m_validationCode;
public MPaymentLookup(Properties ctx, int windowNo, int columnID) { public MPaymentLookup(Properties ctx, int windowNo, String validationCode) {
super(DisplayType.TableDir, windowNo); super(DisplayType.TableDir, windowNo);
m_ctx = ctx; m_ctx = ctx;
m_AD_Column_ID = columnID;
m_isSOTrx = "Y".equals(Env.getContext(Env.getCtx(), windowNo, "IsSOTrx")); m_isSOTrx = "Y".equals(Env.getContext(Env.getCtx(), windowNo, "IsSOTrx"));
m_validationCode = validationCode;
} }
@Override @Override
@ -159,15 +159,9 @@ public class MPaymentLookup extends Lookup implements Serializable {
public String getValidation() public String getValidation()
{ {
StringBuilder sb = new StringBuilder(); if (Util.isEmpty(m_validationCode, true))
sb.append("SELECT vr.Code ");
sb.append("FROM AD_Column c");
sb.append(" LEFT OUTER JOIN AD_Val_Rule vr ON (c.AD_Val_Rule_ID=vr.AD_Val_Rule_ID) ");
sb.append("WHERE c.AD_Column_ID=?");
String validation = DB.getSQLValueString(null, sb.toString(), m_AD_Column_ID);
if (validation == null)
return ""; return "";
return validation.trim(); return m_validationCode.trim();
} }
private String getWhereClause() private String getWhereClause()