diff --git a/base/src/org/compiere/acct/DocLine.java b/base/src/org/compiere/acct/DocLine.java
index 69a2f4f75a..1f5680dd6f 100644
--- a/base/src/org/compiere/acct/DocLine.java
+++ b/base/src/org/compiere/acct/DocLine.java
@@ -16,11 +16,19 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCharge;
+import org.compiere.model.MCostDetail;
+import org.compiere.model.MProduct;
+import org.compiere.model.PO;
+import org.compiere.model.ProductCost;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Standard Document Line
diff --git a/base/src/org/compiere/acct/DocLine_Allocation.java b/base/src/org/compiere/acct/DocLine_Allocation.java
index 3005fb2c2f..32305a78b4 100644
--- a/base/src/org/compiere/acct/DocLine_Allocation.java
+++ b/base/src/org/compiere/acct/DocLine_Allocation.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+
+import org.compiere.model.MAllocationLine;
+import org.compiere.util.DB;
 
 /**
  *	Allocation Line
diff --git a/base/src/org/compiere/acct/DocLine_Bank.java b/base/src/org/compiere/acct/DocLine_Bank.java
index 112a24997b..e0896e68b2 100644
--- a/base/src/org/compiere/acct/DocLine_Bank.java
+++ b/base/src/org/compiere/acct/DocLine_Bank.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
-//import org.compiere.model.*;
+import java.math.BigDecimal;
+
+import org.compiere.model.MBankStatementLine;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Bank Statement Line
diff --git a/base/src/org/compiere/acct/DocLine_Cash.java b/base/src/org/compiere/acct/DocLine_Cash.java
index d25c260d48..3056309072 100644
--- a/base/src/org/compiere/acct/DocLine_Cash.java
+++ b/base/src/org/compiere/acct/DocLine_Cash.java
@@ -16,10 +16,11 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
+import java.math.BigDecimal;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MCashLine;
+import org.compiere.model.MInvoice;
+import org.compiere.util.Env;
 
 /**
  *  Cash Journal Line
diff --git a/base/src/org/compiere/acct/DocLine_Payroll.java b/base/src/org/compiere/acct/DocLine_Payroll.java
index a188b6deb1..6ec57f787b 100644
--- a/base/src/org/compiere/acct/DocLine_Payroll.java
+++ b/base/src/org/compiere/acct/DocLine_Payroll.java
@@ -15,12 +15,12 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
+import java.math.BigDecimal;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
-import org.compiere.acct.*;
-import org.eevolution.model.*;
+import org.compiere.model.MBPartner;
+import org.compiere.util.Env;
+import org.eevolution.model.MHRConcept;
+import org.eevolution.model.MHRMovement;
 
 /**
  *  Payroll Line
diff --git a/base/src/org/compiere/acct/DocTax.java b/base/src/org/compiere/acct/DocTax.java
index 24bee13c08..7f41007349 100644
--- a/base/src/org/compiere/acct/DocTax.java
+++ b/base/src/org/compiere/acct/DocTax.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Level;
+
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Document Tax Line
diff --git a/base/src/org/compiere/acct/Doc_Bank.java b/base/src/org/compiere/acct/Doc_Bank.java
index 31e2e8c97f..1390c7a338 100644
--- a/base/src/org/compiere/acct/Doc_Bank.java
+++ b/base/src/org/compiere/acct/Doc_Bank.java
@@ -16,12 +16,17 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MBankAccount;
+import org.compiere.model.MBankStatement;
+import org.compiere.model.MBankStatementLine;
+import org.compiere.model.MPeriod;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_Cash.java b/base/src/org/compiere/acct/Doc_Cash.java
index f89a8875f3..297d26d49c 100644
--- a/base/src/org/compiere/acct/Doc_Cash.java
+++ b/base/src/org/compiere/acct/Doc_Cash.java
@@ -16,13 +16,16 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCash;
+import org.compiere.model.MCashBook;
+import org.compiere.model.MCashLine;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_GLJournal.java b/base/src/org/compiere/acct/Doc_GLJournal.java
index d7fa2da090..5fcfbc3ad4 100644
--- a/base/src/org/compiere/acct/Doc_GLJournal.java
+++ b/base/src/org/compiere/acct/Doc_GLJournal.java
@@ -16,13 +16,16 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MJournal;
+import org.compiere.model.MJournalLine;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_InOut.java b/base/src/org/compiere/acct/Doc_InOut.java
index 6438f428a9..1589dd52c4 100644
--- a/base/src/org/compiere/acct/Doc_InOut.java
+++ b/base/src/org/compiere/acct/Doc_InOut.java
@@ -16,14 +16,21 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCostDetail;
+import org.compiere.model.MInOut;
+import org.compiere.model.MInOutLine;
+import org.compiere.model.MOrderLine;
+import org.compiere.model.MProduct;
+import org.compiere.model.ProductCost;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Post Shipment/Receipt Documents.
diff --git a/base/src/org/compiere/acct/Doc_Inventory.java b/base/src/org/compiere/acct/Doc_Inventory.java
index 3bca157308..bd97cfba01 100644
--- a/base/src/org/compiere/acct/Doc_Inventory.java
+++ b/base/src/org/compiere/acct/Doc_Inventory.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MInventory;
+import org.compiere.model.MInventoryLine;
+import org.compiere.model.ProductCost;
+import org.compiere.util.Env;
 
 /**
  *  Post Inventory Documents.
diff --git a/base/src/org/compiere/acct/Doc_Invoice.java b/base/src/org/compiere/acct/Doc_Invoice.java
index 2564323409..7043ed1250 100644
--- a/base/src/org/compiere/acct/Doc_Invoice.java
+++ b/base/src/org/compiere/acct/Doc_Invoice.java
@@ -16,12 +16,26 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.logging.Level;
+
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MClientInfo;
+import org.compiere.model.MConversionRate;
+import org.compiere.model.MCostDetail;
+import org.compiere.model.MCurrency;
+import org.compiere.model.MInvoice;
+import org.compiere.model.MInvoiceLine;
+import org.compiere.model.MLandedCostAllocation;
+import org.compiere.model.MTax;
+import org.compiere.model.ProductCost;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_MatchPO.java b/base/src/org/compiere/acct/Doc_MatchPO.java
index 9c69f7ab53..f7823dfa33 100644
--- a/base/src/org/compiere/acct/Doc_MatchPO.java
+++ b/base/src/org/compiere/acct/Doc_MatchPO.java
@@ -16,13 +16,26 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MAcctSchemaElement;
+import org.compiere.model.MConversionRate;
+import org.compiere.model.MInOut;
+import org.compiere.model.MInOutLine;
+import org.compiere.model.MMatchPO;
+import org.compiere.model.MOrder;
+import org.compiere.model.MOrderLine;
+import org.compiere.model.MProduct;
+import org.compiere.model.ProductCost;
+import org.compiere.model.X_M_InOut;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Post MatchPO Documents.
diff --git a/base/src/org/compiere/acct/Doc_Movement.java b/base/src/org/compiere/acct/Doc_Movement.java
index b4f716251f..b9efda139a 100644
--- a/base/src/org/compiere/acct/Doc_Movement.java
+++ b/base/src/org/compiere/acct/Doc_Movement.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCostDetail;
+import org.compiere.model.MMovement;
+import org.compiere.model.MMovementLine;
+import org.compiere.model.ProductCost;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_Payment.java b/base/src/org/compiere/acct/Doc_Payment.java
index 766c357f74..1d1ff844c9 100644
--- a/base/src/org/compiere/acct/Doc_Payment.java
+++ b/base/src/org/compiere/acct/Doc_Payment.java
@@ -16,13 +16,17 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MBankAccount;
+import org.compiere.model.MCharge;
+import org.compiere.model.MPayment;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_Payroll.java b/base/src/org/compiere/acct/Doc_Payroll.java
index fb4b53f1b0..7b81ab8745 100644
--- a/base/src/org/compiere/acct/Doc_Payroll.java
+++ b/base/src/org/compiere/acct/Doc_Payroll.java
@@ -15,15 +15,18 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import org.eevolution.model.*;
-
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
 import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.eevolution.model.MHRMovement;
+import org.eevolution.model.MHRProcess;
 
 
 /**
diff --git a/base/src/org/compiere/acct/Doc_Production.java b/base/src/org/compiere/acct/Doc_Production.java
index 64c386ca47..2fbf6db335 100644
--- a/base/src/org/compiere/acct/Doc_Production.java
+++ b/base/src/org/compiere/acct/Doc_Production.java
@@ -16,14 +16,21 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MCostDetail;
+import org.compiere.model.ProductCost;
+import org.compiere.model.X_M_Production;
+import org.compiere.model.X_M_ProductionLine;
+import org.compiere.model.X_M_ProductionPlan;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Post Invoice Documents.
diff --git a/base/src/org/compiere/acct/Doc_ProjectIssue.java b/base/src/org/compiere/acct/Doc_ProjectIssue.java
index 12a0a2daf0..465ef6f967 100644
--- a/base/src/org/compiere/acct/Doc_ProjectIssue.java
+++ b/base/src/org/compiere/acct/Doc_ProjectIssue.java
@@ -16,14 +16,19 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import java.util.*;
-import java.util.logging.*;
-
-import org.compiere.util.*;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MProduct;
+import org.compiere.model.MProject;
+import org.compiere.model.MProjectIssue;
+import org.compiere.model.ProductCost;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Project Issue.
diff --git a/base/src/org/compiere/acct/Doc_Requisition.java b/base/src/org/compiere/acct/Doc_Requisition.java
index 75e6065ca2..32faf4066c 100644
--- a/base/src/org/compiere/acct/Doc_Requisition.java
+++ b/base/src/org/compiere/acct/Doc_Requisition.java
@@ -16,13 +16,17 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.util.*;
-import java.util.logging.*;
-import java.sql.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.logging.Level;
 
-import org.compiere.model.*;
-import org.compiere.util.*;
+import org.compiere.model.MAccount;
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MRequisition;
+import org.compiere.model.MRequisitionLine;
+import org.compiere.model.ProductCost;
+import org.compiere.util.Env;
 
 /**
  * Post Order Documents.
diff --git a/base/src/org/compiere/acct/Matcher.java b/base/src/org/compiere/acct/Matcher.java
index cf050faf05..6dcf635834 100644
--- a/base/src/org/compiere/acct/Matcher.java
+++ b/base/src/org/compiere/acct/Matcher.java
@@ -16,10 +16,16 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Automatic Matching.
diff --git a/base/src/org/compiere/acct/ProductInfo.java b/base/src/org/compiere/acct/ProductInfo.java
index ce7be27db2..738361fefc 100644
--- a/base/src/org/compiere/acct/ProductInfo.java
+++ b/base/src/org/compiere/acct/ProductInfo.java
@@ -16,11 +16,19 @@
  *****************************************************************************/
 package org.compiere.acct;
 
-import java.math.*;
-import java.sql.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.logging.Level;
+
+import org.compiere.model.MAcctSchema;
+import org.compiere.model.MConversionRate;
+import org.compiere.model.MProduct;
+import org.compiere.model.MUOMConversion;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Product Costing Information.