From 020458f56d527691bc60d7f3d886bc17ee3b5bcc Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 29 Feb 2012 11:58:29 -0500 Subject: [PATCH] IDEMPIERE-137 Enhancement of GL Reconciliation minor improvements, generate model class with new column, organize imports --- .../compiere/model/I_Fact_Reconciliation.java | 13 +++++++- .../compiere/model/X_Fact_Reconciliation.java | 30 +++++++++++++++++-- .../compiere/apps/form/VFactReconcile.java | 8 ----- .../webui/apps/form/WFactReconcile.java | 5 ++-- .../org/compiere/apps/form/FactReconcile.java | 6 +--- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java index 8eb2d38a9a..47918c3d7b 100644 --- a/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java +++ b/org.adempiere.base/src/org/compiere/model/I_Fact_Reconciliation.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for Fact_Reconciliation * @author Adempiere (generated) - * @version 360LTS.013 + * @version 360LTS.015 */ public interface I_Fact_Reconciliation { @@ -143,6 +143,17 @@ public interface I_Fact_Reconciliation /** Get Accounting Fact */ public int getFact_Acct_ID(); + public I_Fact_Acct getFact_Acct() throws RuntimeException; + + /** Column name Fact_Reconciliation_ID */ + public static final String COLUMNNAME_Fact_Reconciliation_ID = "Fact_Reconciliation_ID"; + + /** Set Accounting Fact Reconciliation */ + public void setFact_Reconciliation_ID (int Fact_Reconciliation_ID); + + /** Get Accounting Fact Reconciliation */ + public int getFact_Reconciliation_ID(); + /** Column name IsActive */ public static final String COLUMNNAME_IsActive = "IsActive"; diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java index 3274450695..e8fdd8ff38 100644 --- a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java +++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java @@ -26,14 +26,14 @@ import org.compiere.util.KeyNamePair; /** Generated Model for Fact_Reconciliation * @author Adempiere (generated) - * @version 360LTS.013 - $Id$ */ + * @version 360LTS.015 - $Id$ */ public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, I_Persistent { /** * */ - private static final long serialVersionUID = 20111102L; + private static final long serialVersionUID = 20120229L; /** Standard Constructor */ public X_Fact_Reconciliation (Properties ctx, int Fact_Reconciliation_ID, String trxName) @@ -42,6 +42,7 @@ public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, /** if (Fact_Reconciliation_ID == 0) { setFact_Acct_ID (0); + setFact_Reconciliation_ID (0); } */ } @@ -156,6 +157,11 @@ public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, return (Timestamp)get_Value(COLUMNNAME_DateAcct); } + public I_Fact_Acct getFact_Acct() throws RuntimeException + { + return (I_Fact_Acct)MTable.get(getCtx(), I_Fact_Acct.Table_Name) + .getPO(getFact_Acct_ID(), get_TrxName()); } + /** Set Accounting Fact. @param Fact_Acct_ID Accounting Fact */ public void setFact_Acct_ID (int Fact_Acct_ID) @@ -184,6 +190,26 @@ public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, return new KeyNamePair(get_ID(), String.valueOf(getFact_Acct_ID())); } + /** Set Accounting Fact Reconciliation. + @param Fact_Reconciliation_ID Accounting Fact Reconciliation */ + public void setFact_Reconciliation_ID (int Fact_Reconciliation_ID) + { + if (Fact_Reconciliation_ID < 1) + set_ValueNoCheck (COLUMNNAME_Fact_Reconciliation_ID, null); + else + set_ValueNoCheck (COLUMNNAME_Fact_Reconciliation_ID, Integer.valueOf(Fact_Reconciliation_ID)); + } + + /** Get Accounting Fact Reconciliation. + @return Accounting Fact Reconciliation */ + public int getFact_Reconciliation_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_Fact_Reconciliation_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Match Code. @param MatchCode String identifying related accounting facts diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VFactReconcile.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VFactReconcile.java index d65af3c4bb..f5567eb855 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VFactReconcile.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VFactReconcile.java @@ -9,9 +9,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; import java.beans.VetoableChangeListener; import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Timestamp; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -38,19 +35,14 @@ import org.compiere.grid.ed.VCheckBox; import org.compiere.grid.ed.VComboBox; import org.compiere.grid.ed.VDate; import org.compiere.grid.ed.VLookup; -import org.compiere.minigrid.IDColumn; import org.compiere.minigrid.MiniTable; import org.compiere.model.MClient; -import org.compiere.model.MFactReconciliation; import org.compiere.model.MLookup; import org.compiere.model.MLookupFactory; -import org.compiere.model.MRole; -import org.compiere.model.Query; import org.compiere.swing.CLabel; import org.compiere.swing.CPanel; import org.compiere.swing.CTextField; 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; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java index bab9c52b6c..6d134a5f15 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java @@ -8,8 +8,10 @@ import java.util.Calendar; import java.util.Vector; import java.util.logging.Level; +import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.component.Button; import org.adempiere.webui.component.Checkbox; +import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.GridFactory; import org.adempiere.webui.component.Label; @@ -22,7 +24,6 @@ import org.adempiere.webui.component.Row; import org.adempiere.webui.component.Rows; import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.WListbox; -import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.editor.WDateEditor; import org.adempiere.webui.editor.WSearchEditor; import org.adempiere.webui.editor.WTableDirEditor; @@ -34,9 +35,7 @@ import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.CustomForm; import org.adempiere.webui.panel.IFormController; import org.adempiere.webui.session.SessionManager; -import org.adempiere.webui.apps.AEnv; import org.compiere.apps.form.FactReconcile; -import org.compiere.minigrid.IDColumn; import org.compiere.model.MClient; import org.compiere.model.MLookup; import org.compiere.model.MLookupFactory; diff --git a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java index 2bf64b7160..d6e57dce9d 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java @@ -5,13 +5,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Vector; import java.util.logging.Level; -import javax.swing.table.DefaultTableModel; - import org.compiere.minigrid.IMiniTable; import org.compiere.model.MFactReconciliation; import org.compiere.model.MRole; @@ -25,7 +21,7 @@ import org.compiere.util.Msg; public class FactReconcile { /** Logger */ - public static CLogger log = CLogger.getCLogger(MFactReconciliation.class); + public static CLogger log = CLogger.getCLogger(FactReconcile.class); public int m_AD_Client_ID = 0; public int m_AD_Org_ID = 0;