refactor; QA

#5380
metasfresh · Jul 15, 2019 · 65bd761 · 65bd761
1 parent 83db0c7
commit 65bd761
Show file tree

Hide file tree

Showing 332 changed files with 705 additions and 613 deletions.
diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java
@@ -39,7 +39,6 @@
 import org.adempiere.model.InterfaceWrapperHelper;
 import org.adempiere.service.ClientId;
 import org.adempiere.service.ISysConfigBL;
-import org.adempiere.service.OrgId;
 import org.adempiere.util.logging.LoggingHelper;
 import org.adempiere.warehouse.WarehouseId;
 import org.compiere.model.I_C_BP_BankAccount;
@@ -81,6 +80,7 @@
 import de.metas.logging.LogManager;
 import de.metas.money.CurrencyConversionTypeId;
 import de.metas.money.CurrencyId;
+import de.metas.organization.OrgId;
 import de.metas.product.ProductId;
 import de.metas.product.acct.api.ActivityId;
 import de.metas.user.UserId;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java
@@ -27,7 +27,6 @@
 import org.adempiere.mm.attributes.AttributeSetInstanceId;
 import org.adempiere.model.InterfaceWrapperHelper;
 import org.adempiere.service.ClientId;
-import org.adempiere.service.OrgId;
 import org.compiere.model.I_C_UOM;
 import org.compiere.model.I_M_Product;
 import org.compiere.model.I_M_Product_Acct;
@@ -56,6 +55,7 @@
 import de.metas.money.CurrencyConversionTypeId;
 import de.metas.money.CurrencyId;
 import de.metas.order.OrderLineId;
+import de.metas.organization.OrgId;
 import de.metas.product.IProductBL;
 import de.metas.product.IProductDAO;
 import de.metas.product.ProductId;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java
@@ -26,7 +26,6 @@
 import org.adempiere.exceptions.DBException;
 import org.adempiere.invoice.service.IInvoiceBL;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.service.OrgId;
 import org.compiere.model.I_C_AllocationLine;
 import org.compiere.model.I_C_Cash;
 import org.compiere.model.I_C_CashLine;
@@ -41,6 +40,7 @@
 import de.metas.currency.ICurrencyBL;
 import de.metas.currency.CurrencyConversionContext;
 import de.metas.money.CurrencyConversionTypeId;
+import de.metas.organization.OrgId;
 import de.metas.util.Check;
 import de.metas.util.Services;
 

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java
@@ -2,7 +2,6 @@
 
 import org.adempiere.ad.trx.api.ITrx;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.service.OrgId;
 import org.compiere.Adempiere;
 import org.compiere.model.I_C_OrderLine;
 import org.compiere.model.I_M_InOutLine;
@@ -17,6 +16,7 @@
 import de.metas.costing.CostingDocumentRef;
 import de.metas.costing.ICostingService;
 import de.metas.order.OrderLineId;
+import de.metas.organization.OrgId;
 import de.metas.quantity.Quantity;
 
 /*

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java
@@ -5,7 +5,6 @@
 
 import org.adempiere.model.InterfaceWrapperHelper;
 import org.adempiere.service.ClientId;
-import org.adempiere.service.OrgId;
 import org.compiere.Adempiere;
 import org.compiere.model.I_C_Order;
 import org.compiere.model.I_M_InOut;
@@ -31,6 +30,7 @@
 import de.metas.money.CurrencyConversionTypeId;
 import de.metas.order.IOrderDAO;
 import de.metas.order.IOrderLineBL;
+import de.metas.organization.OrgId;
 import de.metas.product.ProductPrice;
 import de.metas.quantity.Quantity;
 import de.metas.uom.IUOMConversionBL;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java
@@ -1,7 +1,6 @@
 package org.compiere.acct;
 
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.service.OrgId;
 import org.adempiere.warehouse.api.IWarehouseDAO;
 import org.compiere.Adempiere;
 import org.compiere.model.I_M_MovementLine;
@@ -15,6 +14,7 @@
 import de.metas.costing.CostElement;
 import de.metas.costing.CostingDocumentRef;
 import de.metas.costing.ICostingService;
+import de.metas.organization.OrgId;
 import de.metas.quantity.Quantity;
 import de.metas.util.Services;
 import lombok.NonNull;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java
@@ -26,7 +26,6 @@
 import org.adempiere.ad.trx.api.ITrx;
 import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.service.OrgId;
 import org.compiere.acct.FactTrxLines.FactTrxLinesType;
 import org.compiere.model.I_C_ElementValue;
 import org.compiere.model.MAccount;
@@ -46,6 +45,7 @@
 import de.metas.currency.CurrencyConversionContext;
 import de.metas.logging.LogManager;
 import de.metas.money.CurrencyId;
+import de.metas.organization.OrgId;
 import de.metas.product.acct.api.ActivityId;
 import de.metas.quantity.Quantity;
 import de.metas.util.Check;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java
@@ -27,7 +27,6 @@
 import org.adempiere.ad.trx.api.ITrx;
 import org.adempiere.exceptions.DBException;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.service.OrgId;
 import org.adempiere.warehouse.api.IWarehouseDAO;
 import org.compiere.model.I_C_BPartner_Location;
 import org.compiere.model.I_C_RevenueRecognition_Plan;
@@ -59,6 +58,7 @@
 import de.metas.location.LocationId;
 import de.metas.money.CurrencyConversionTypeId;
 import de.metas.money.CurrencyId;
+import de.metas.organization.OrgId;
 import de.metas.product.ProductId;
 import de.metas.product.acct.api.ActivityId;
 import de.metas.quantity.Quantity;

diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java
@@ -27,7 +27,6 @@
 import org.compiere.model.MJournal;
 import org.compiere.model.MJournalBatch;
 import org.compiere.model.MJournalLine;
-import org.compiere.model.MOrg;
 import org.compiere.model.Query;
 import org.compiere.model.X_T_InvoiceGL;
 import org.compiere.util.DB;
@@ -38,6 +37,7 @@
 import de.metas.acct.api.IAcctSchemaDAO;
 import de.metas.i18n.Msg;
 import de.metas.logging.LogManager;
+import de.metas.organization.IOrgDAO;
 import de.metas.process.JavaProcess;
 import de.metas.process.ProcessInfoParameter;
 import de.metas.util.Services;
@@ -77,27 +77,45 @@ public class InvoiceNGL extends JavaProcess
 	protected void prepare()
 	{
 		ProcessInfoParameter[] para = getParametersAsArray();
-		for (int i = 0; i < para.length; i++)
+		for (ProcessInfoParameter element : para)
 		{
-			String name = para[i].getParameterName();
-			if (para[i].getParameter() == null)
+			String name = element.getParameterName();
+			if (element.getParameter() == null)
+			{
 				;
+			}
 			else if (name.equals("C_AcctSchema_ID"))
-				p_C_AcctSchema_ID = AcctSchemaId.ofRepoId(para[i].getParameterAsInt());
+			{
+				p_C_AcctSchema_ID = AcctSchemaId.ofRepoId(element.getParameterAsInt());
+			}
 			else if (name.equals("C_ConversionTypeReval_ID"))
-				p_C_ConversionTypeReval_ID = para[i].getParameterAsInt();
+			{
+				p_C_ConversionTypeReval_ID = element.getParameterAsInt();
+			}
 			else if (name.equals("DateReval"))
-				p_DateReval = (Timestamp)para[i].getParameter();
+			{
+				p_DateReval = (Timestamp)element.getParameter();
+			}
 			else if (name.equals("APAR"))
-				p_APAR = (String)para[i].getParameter();
+			{
+				p_APAR = (String)element.getParameter();
+			}
 			else if (name.equals("IsAllCurrencies"))
-				p_IsAllCurrencies = "Y".equals(para[i].getParameter());
+			{
+				p_IsAllCurrencies = "Y".equals(element.getParameter());
+			}
 			else if (name.equals("C_Currency_ID"))
-				p_C_Currency_ID = para[i].getParameterAsInt();
+			{
+				p_C_Currency_ID = element.getParameterAsInt();
+			}
 			else if (name.equals("C_DocTypeReval_ID"))
-				p_C_DocTypeReval_ID = para[i].getParameterAsInt();
+			{
+				p_C_DocTypeReval_ID = element.getParameterAsInt();
+			}
 			else
+			{
 				log.error("Unknown Parameter: " + name);
+			}
 		}
 	}	//	prepare
 
@@ -110,7 +128,9 @@ else if (name.equals("C_DocTypeReval_ID"))
 	protected String doIt () throws Exception
 	{
 		if (p_IsAllCurrencies)
+		{
 			p_C_Currency_ID = 0;
+		}
 		log.info("C_AcctSchema_ID=" + p_C_AcctSchema_ID 
 			+ ",C_ConversionTypeReval_ID=" + p_C_ConversionTypeReval_ID
 			+ ",DateReval=" + p_DateReval 
@@ -121,13 +141,17 @@ protected String doIt () throws Exception
 
 		//	Parameter
 		if (p_DateReval == null)
+		{
 			p_DateReval = new Timestamp(System.currentTimeMillis());
+		}
 
 		//	Delete - just to be sure
 		String sql = "DELETE FROM T_InvoiceGL WHERE AD_PInstance_ID=" + getAD_PInstance_ID();
 		int no = DB.executeUpdate(sql, get_TrxName());
 		if (no > 0)
+		{
 			log.info("Deleted #" + no);
+		}
 
 		//	Insert Trx
 		String dateStr = DB.TO_DATE(p_DateReval, true);
@@ -156,21 +180,35 @@ protected String doIt () throws Exception
 		    	+ "WHERE ev.C_ElementValue_ID=fa.Account_ID AND (ev.AccountType='A' OR ev.AccountType='L'))"
 		    + " AND fa.C_AcctSchema_ID=" + p_C_AcctSchema_ID.getRepoId();
 		if (!p_IsAllCurrencies)
+		{
 			sql += " AND i.C_Currency_ID<>a.C_Currency_ID";
+		}
 		if (ONLY_AR.equals(p_APAR))
+		{
 			sql += " AND i.IsSOTrx='Y'";
+		}
 		else if (ONLY_AP.equals(p_APAR))
+		{
 			sql += " AND i.IsSOTrx='N'";
+		}
 		if (!p_IsAllCurrencies && p_C_Currency_ID != 0)
+		{
 			sql += " AND i.C_Currency_ID=" + p_C_Currency_ID;
+		}
 
 		no = DB.executeUpdate(sql, get_TrxName());
 		if (no != 0)
+		{
 			log.info("Inserted #" + no);
+		}
 		else if (LogManager.isLevelFiner())
+		{
 			log.warn("Inserted #" + no + " - " + sql);
-		else 
+		}
+		else
+		{
 			log.warn("Inserted #" + no);
+		}
 
 		//	Calculate Difference
 		sql = DB.convertSqlToNative("UPDATE T_InvoiceGL gl "
@@ -181,20 +219,26 @@ else if (LogManager.isLevelFiner())
 			+ "WHERE AD_PInstance_ID=" + getAD_PInstance_ID());
 		int noT = DB.executeUpdate(sql, get_TrxName());
 		if (noT > 0)
+		{
 			log.info("Difference #" + noT);
+		}
 
 		//	Percentage
 		sql = "UPDATE T_InvoiceGL SET Percent = 100 "
 			+ "WHERE GrandTotal=OpenAmt AND AD_PInstance_ID=" + getAD_PInstance_ID();
 		no = DB.executeUpdate(sql, get_TrxName());
 		if (no > 0)
+		{
 			log.info("Not Paid #" + no);
+		}
 
 		sql = "UPDATE T_InvoiceGL SET Percent = ROUND(OpenAmt*100/GrandTotal,6) "
 			+ "WHERE GrandTotal<>OpenAmt AND GrandTotal <> 0 AND AD_PInstance_ID=" + getAD_PInstance_ID();
 		no = DB.executeUpdate(sql, get_TrxName());
 		if (no > 0)
+		{
 			log.info("Partial Paid #" + no);
+		}
 
 		sql = "UPDATE T_InvoiceGL SET AmtRevalDr = AmtRevalDr * Percent/100,"
 			+ " AmtRevalCr = AmtRevalCr * Percent/100,"
@@ -203,16 +247,22 @@ else if (LogManager.isLevelFiner())
 			+ "WHERE Percent <> 100 AND AD_PInstance_ID=" + getAD_PInstance_ID();
 		no = DB.executeUpdate(sql, get_TrxName());
 		if (no > 0)
+		{
 			log.info("Partial Calc #" + no);
+		}
 
 		//	Create Document
 		String info = "";
 		if (p_C_DocTypeReval_ID != 0)
 		{
 			if (p_C_Currency_ID != 0)
+			{
 				log.warn("Can create Journal only for all currencies");
+			}
 			else
+			{
 				info = createGLJournal();
+			}
 		}
 		return "#" + noT + info;
 	}	//	doIt
@@ -232,7 +282,9 @@ private String createGLJournal()
 		//FR: [ 2214883 ] Remove SQL code and Replace for Query
 
 		if (list.size() == 0)
+		{
 			return " - No Records found";
+		}
 
 		//
 		final AcctSchema as = Services.get(IAcctSchemaDAO.class).getById(p_C_AcctSchema_ID);
@@ -250,7 +302,9 @@ private String createGLJournal()
 		batch.setDateAcct(p_DateReval);
 		batch.setC_Currency_ID(as.getCurrencyId().getRepoId());
 		if (!batch.save())
+		{
 			return " - Could not create Batch";
+		}
 		//
 		MJournal journal = null;
 		BigDecimal drTotal = BigDecimal.ZERO;
@@ -260,22 +314,30 @@ private String createGLJournal()
 		{
 			X_T_InvoiceGL gl = list.get(i);
 			if (gl.getAmtRevalDrDiff().signum() == 0 && gl.getAmtRevalCrDiff().signum() == 0)
+			{
 				continue;
+			}
 			MInvoice invoice = new MInvoice(getCtx(), gl.getC_Invoice_ID(), null);
 			if (invoice.getC_Currency_ID() == as.getCurrencyId().getRepoId())
+			{
 				continue;
+			}
 			//
 			if (journal == null)
 			{
 				journal = new MJournal (batch);
 				journal.setC_AcctSchema_ID (as.getId().getRepoId());
 				journal.setC_Currency_ID(as.getCurrencyId().getRepoId());
 				journal.setC_ConversionType_ID(p_C_ConversionTypeReval_ID);
-				MOrg org = MOrg.get(getCtx(), gl.getAD_Org_ID());
-				journal.setDescription (getName() + " - " + org.getName());
+
+				final String orgName = Services.get(IOrgDAO.class).retrieveOrgName(gl.getAD_Org_ID());
+				journal.setDescription (getName() + " - " + orgName);
+
 				journal.setGL_Category_ID (cat.getGL_Category_ID());
 				if (!journal.save())
+				{
 					return " - Could not create Journal";
+				}
 			}
 			//
 			MJournalLine line = new MJournalLine(journal);
@@ -295,8 +357,10 @@ private String createGLJournal()
 			line.setAmtAcctCr (cr);
 			line.save();
 			//
-			if (AD_Org_ID == 0)		//	invoice org id
+			if (AD_Org_ID == 0)
+			{
 				AD_Org_ID = gl.getAD_Org_ID();
+			}
 			//	Change in Org
 			if (AD_Org_ID != gl.getAD_Org_ID())
 			{
@@ -326,7 +390,9 @@ private void createBalancing (AcctSchema as, MJournal journal,
 		BigDecimal drTotal, BigDecimal crTotal, int AD_Org_ID, int lineNo)
 	{
 		if (journal == null)
+		{
 			throw new IllegalArgumentException("Jornal is null");
+		}
 
 		final AcctSchemaId acctSchemaId = as.getId();