From f81176b7dd3aea82e2f5326ef4ab19f80088eeb2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 8 Mar 2011 12:19:40 -0500 Subject: [PATCH] FR 3110938 - Mandatory Incorrectly Spelled http://sourceforge.net/support/tracker.php?aid=3110938 --- .../src/org/compiere/model/MAttributeSet.java | 4 ++-- .../src/org/compiere/model/X_M_AttributeSet.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java index 3be494673e..556eaf3605 100644 --- a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java +++ b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java @@ -86,7 +86,7 @@ public class MAttributeSet extends X_M_AttributeSet setIsSerNo (false); setIsSerNoMandatory (false); setIsInstanceAttribute(false); - setMandatoryType (MANDATORYTYPE_NotMandatary); + setMandatoryType (MANDATORYTYPE_NotMandatory); } } // MAttributeSet @@ -185,7 +185,7 @@ public class MAttributeSet extends X_M_AttributeSet */ public boolean isMandatory() { - return !MANDATORYTYPE_NotMandatary.equals(getMandatoryType()) + return !MANDATORYTYPE_NotMandatory.equals(getMandatoryType()) || isLotMandatory() || isSerNoMandatory() || isGuaranteeDateMandatory(); diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java index 4e5ed42966..abc8f232b2 100644 --- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java +++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java @@ -30,7 +30,7 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste /** * */ - private static final long serialVersionUID = 20100614L; + private static final long serialVersionUID = 20110308L; /** Standard Constructor */ public X_M_AttributeSet (Properties ctx, int M_AttributeSet_ID, String trxName) @@ -320,8 +320,8 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste /** MandatoryType AD_Reference_ID=324 */ public static final int MANDATORYTYPE_AD_Reference_ID=324; - /** Not Mandatary = N */ - public static final String MANDATORYTYPE_NotMandatary = "N"; + /** Not Mandatory = N */ + public static final String MANDATORYTYPE_NotMandatory = "N"; /** Always Mandatory = Y */ public static final String MANDATORYTYPE_AlwaysMandatory = "Y"; /** When Shipping = S */ @@ -367,9 +367,9 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste return ii.intValue(); } - public I_M_LotCtl getM_LotCtl() throws RuntimeException + public org.compiere.model.I_M_LotCtl getM_LotCtl() throws RuntimeException { - return (I_M_LotCtl)MTable.get(getCtx(), I_M_LotCtl.Table_Name) + return (org.compiere.model.I_M_LotCtl)MTable.get(getCtx(), org.compiere.model.I_M_LotCtl.Table_Name) .getPO(getM_LotCtl_ID(), get_TrxName()); } /** Set Lot Control. @@ -395,9 +395,9 @@ public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persiste return ii.intValue(); } - public I_M_SerNoCtl getM_SerNoCtl() throws RuntimeException + public org.compiere.model.I_M_SerNoCtl getM_SerNoCtl() throws RuntimeException { - return (I_M_SerNoCtl)MTable.get(getCtx(), I_M_SerNoCtl.Table_Name) + return (org.compiere.model.I_M_SerNoCtl)MTable.get(getCtx(), org.compiere.model.I_M_SerNoCtl.Table_Name) .getPO(getM_SerNoCtl_ID(), get_TrxName()); } /** Set Serial No Control.