diff --git a/base/src/org/compiere/model/I_C_DocType.java b/base/src/org/compiere/model/I_C_DocType.java index 991045d6d0..930f08cda2 100644 --- a/base/src/org/compiere/model/I_C_DocType.java +++ b/base/src/org/compiere/model/I_C_DocType.java @@ -80,6 +80,19 @@ public interface I_C_DocType */ public int getC_DocTypeDifference_ID(); + /** Column name C_DocType_ID */ + public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID"; + + /** Set Document Type. + * Document type or rules + */ + public void setC_DocType_ID (int C_DocType_ID); + + /** Get Document Type. + * Document type or rules + */ + public int getC_DocType_ID(); + /** Column name C_DocTypeInvoice_ID */ public static final String COLUMNNAME_C_DocTypeInvoice_ID = "C_DocTypeInvoice_ID"; @@ -119,19 +132,6 @@ public interface I_C_DocType */ public int getC_DocTypeShipment_ID(); - /** Column name C_DocType_ID */ - public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID"; - - /** Set Document Type. - * Document type or rules - */ - public void setC_DocType_ID (int C_DocType_ID); - - /** Get Document Type. - * Document type or rules - */ - public int getC_DocType_ID(); - /** Column name DefiniteSequence_ID */ public static final String COLUMNNAME_DefiniteSequence_ID = "DefiniteSequence_ID"; @@ -312,19 +312,6 @@ public interface I_C_DocType */ public boolean isDocNoControlled(); - /** Column name IsInTransit */ - public static final String COLUMNNAME_IsInTransit = "IsInTransit"; - - /** Set In Transit. - * Movement is in transit - */ - public void setIsInTransit (boolean IsInTransit); - - /** Get In Transit. - * Movement is in transit - */ - public boolean isInTransit(); - /** Column name IsIndexed */ public static final String COLUMNNAME_IsIndexed = "IsIndexed"; @@ -338,6 +325,19 @@ public interface I_C_DocType */ public boolean isIndexed(); + /** Column name IsInTransit */ + public static final String COLUMNNAME_IsInTransit = "IsInTransit"; + + /** Set In Transit. + * Movement is in transit + */ + public void setIsInTransit (boolean IsInTransit); + + /** Get In Transit. + * Movement is in transit + */ + public boolean isInTransit(); + /** Column name IsOverwriteDateOnComplete */ public static final String COLUMNNAME_IsOverwriteDateOnComplete = "IsOverwriteDateOnComplete"; @@ -369,19 +369,6 @@ public interface I_C_DocType */ public boolean isPickQAConfirm(); - /** Column name IsSOTrx */ - public static final String COLUMNNAME_IsSOTrx = "IsSOTrx"; - - /** Set Sales Transaction. - * This is a Sales Transaction - */ - public void setIsSOTrx (boolean IsSOTrx); - - /** Get Sales Transaction. - * This is a Sales Transaction - */ - public boolean isSOTrx(); - /** Column name IsShipConfirm */ public static final String COLUMNNAME_IsShipConfirm = "IsShipConfirm"; @@ -395,6 +382,19 @@ public interface I_C_DocType */ public boolean isShipConfirm(); + /** Column name IsSOTrx */ + public static final String COLUMNNAME_IsSOTrx = "IsSOTrx"; + + /** Set Sales Transaction. + * This is a Sales Transaction + */ + public void setIsSOTrx (boolean IsSOTrx); + + /** Get Sales Transaction. + * This is a Sales Transaction + */ + public boolean isSOTrx(); + /** Column name IsSplitWhenDifference */ public static final String COLUMNNAME_IsSplitWhenDifference = "IsSplitWhenDifference"; diff --git a/base/src/org/compiere/model/MSetup.java b/base/src/org/compiere/model/MSetup.java index 3ed7c01c50..7e5183b904 100644 --- a/base/src/org/compiere/model/MSetup.java +++ b/base/src/org/compiere/model/MSetup.java @@ -16,12 +16,22 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.process.*; -import org.compiere.util.*; +import java.io.File; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.process.DocumentTypeVerify; +import org.compiere.util.AdempiereUserError; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.KeyNamePair; +import org.compiere.util.Msg; +import org.compiere.util.Trx; /** * Initial Setup Model @@ -571,7 +581,7 @@ public final class MSetup int GL_API = createGLCategory("AP Invoice", MGLCategory.CATEGORYTYPE_Document, false); int GL_APP = createGLCategory("AP Payment", MGLCategory.CATEGORYTYPE_Document, false); int GL_CASH = createGLCategory("Cash/Payments", MGLCategory.CATEGORYTYPE_Document, false); - int GL_Manufacturing = createGLCategory("Manufactuing", MGLCategory.CATEGORYTYPE_Document, false); + int GL_Manufacturing = createGLCategory("Manufacturing", MGLCategory.CATEGORYTYPE_Document, false); int GL_Distribution = createGLCategory("Distribution", MGLCategory.CATEGORYTYPE_Document, false); int GL_Payroll = createGLCategory("Payroll", MGLCategory.CATEGORYTYPE_Document, false); diff --git a/base/src/org/compiere/model/X_C_DocType.java b/base/src/org/compiere/model/X_C_DocType.java index 65e0ca29e4..69ff6d638a 100644 --- a/base/src/org/compiere/model/X_C_DocType.java +++ b/base/src/org/compiere/model/X_C_DocType.java @@ -52,11 +52,11 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent setIsDefaultCounterDoc (false); setIsDocNoControlled (true); // Y - setIsInTransit (false); setIsIndexed (false); + setIsInTransit (false); setIsPickQAConfirm (false); - setIsSOTrx (false); setIsShipConfirm (false); + setIsSOTrx (false); setIsSplitWhenDifference (false); // N setName (null); @@ -156,6 +156,28 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return ii.intValue(); } + /** Set Document Type. + @param C_DocType_ID + Document type or rules + */ + public void setC_DocType_ID (int C_DocType_ID) + { + if (C_DocType_ID < 0) + throw new IllegalArgumentException ("C_DocType_ID is mandatory."); + set_ValueNoCheck (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID)); + } + + /** Get Document Type. + @return Document type or rules + */ + public int getC_DocType_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** C_DocTypeInvoice_ID AD_Reference_ID=170 */ public static final int C_DOCTYPEINVOICE_ID_AD_Reference_ID=170; /** Set Document Type for Invoice. @@ -231,28 +253,6 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return ii.intValue(); } - /** Set Document Type. - @param C_DocType_ID - Document type or rules - */ - public void setC_DocType_ID (int C_DocType_ID) - { - if (C_DocType_ID < 0) - throw new IllegalArgumentException ("C_DocType_ID is mandatory."); - set_ValueNoCheck (COLUMNNAME_C_DocType_ID, Integer.valueOf(C_DocType_ID)); - } - - /** Get Document Type. - @return Document type or rules - */ - public int getC_DocType_ID () - { - Integer ii = (Integer)get_Value(COLUMNNAME_C_DocType_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - /** DefiniteSequence_ID AD_Reference_ID=128 */ public static final int DEFINITESEQUENCE_ID_AD_Reference_ID=128; /** Set Definite Sequence. @@ -660,30 +660,6 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return false; } - /** Set In Transit. - @param IsInTransit - Movement is in transit - */ - public void setIsInTransit (boolean IsInTransit) - { - set_Value (COLUMNNAME_IsInTransit, Boolean.valueOf(IsInTransit)); - } - - /** Get In Transit. - @return Movement is in transit - */ - public boolean isInTransit () - { - Object oo = get_Value(COLUMNNAME_IsInTransit); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Indexed. @param IsIndexed Index the document for the internal search engine @@ -708,6 +684,30 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return false; } + /** Set In Transit. + @param IsInTransit + Movement is in transit + */ + public void setIsInTransit (boolean IsInTransit) + { + set_Value (COLUMNNAME_IsInTransit, Boolean.valueOf(IsInTransit)); + } + + /** Get In Transit. + @return Movement is in transit + */ + public boolean isInTransit () + { + Object oo = get_Value(COLUMNNAME_IsInTransit); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Overwrite Date on Complete. @param IsOverwriteDateOnComplete Overwrite Date on Complete */ public void setIsOverwriteDateOnComplete (boolean IsOverwriteDateOnComplete) @@ -774,30 +774,6 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return false; } - /** Set Sales Transaction. - @param IsSOTrx - This is a Sales Transaction - */ - public void setIsSOTrx (boolean IsSOTrx) - { - set_Value (COLUMNNAME_IsSOTrx, Boolean.valueOf(IsSOTrx)); - } - - /** Get Sales Transaction. - @return This is a Sales Transaction - */ - public boolean isSOTrx () - { - Object oo = get_Value(COLUMNNAME_IsSOTrx); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set Ship/Receipt Confirmation. @param IsShipConfirm Require Ship or Receipt Confirmation before processing @@ -822,6 +798,30 @@ public class X_C_DocType extends PO implements I_C_DocType, I_Persistent return false; } + /** Set Sales Transaction. + @param IsSOTrx + This is a Sales Transaction + */ + public void setIsSOTrx (boolean IsSOTrx) + { + set_Value (COLUMNNAME_IsSOTrx, Boolean.valueOf(IsSOTrx)); + } + + /** Get Sales Transaction. + @return This is a Sales Transaction + */ + public boolean isSOTrx () + { + Object oo = get_Value(COLUMNNAME_IsSOTrx); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Split when Difference. @param IsSplitWhenDifference Split document when there is a difference