Merge branch 'hotfix/3.8.0#002' of https://github.com/adempiere/ademp…

…iere into hotfix/3.8.0#002
adempiere · Nov 19, 2015 · cf330e4 · cf330e4
2 parents e3e4ead + 403d9c7
commit cf330e4
Show file tree

Hide file tree

Showing 30 changed files with 691 additions and 266 deletions.
diff --git a/base/src/org/adempiere/engine/AverageInvoiceCostingMethod.java b/base/src/org/adempiere/engine/AverageInvoiceCostingMethod.java
@@ -426,9 +426,9 @@ public void createCostAdjustment() {
 		}
 	}
 
-	@Override
+	/*@Override
 	public void processCostDetail(MCostDetail costDetail) {
-	}
+	}*/
 
 	@Override
 	protected List<CostComponent> getCalculatedCosts() {

diff --git a/base/src/org/adempiere/engine/AveragePOCostingMethod.java b/base/src/org/adempiere/engine/AveragePOCostingMethod.java
@@ -370,9 +370,9 @@ public void createCostAdjustment() {
 		}
 	}
 
-	@Override
+	/*@Override
 	public void processCostDetail(MCostDetail costDetail) {
-	}
+	}*/
 
 	@Override
 	protected List<CostComponent> getCalculatedCosts() {

diff --git a/base/src/org/adempiere/engine/ICostingMethod.java b/base/src/org/adempiere/engine/ICostingMethod.java
@@ -43,5 +43,5 @@ public interface ICostingMethod
 	public void setCostingMethod(MAcctSchema accountSchema, MTransaction transaction, IDocumentLine model,
                                  MCost dimension, BigDecimal costThisLevel, BigDecimal costLowLevel, Boolean isSalesTransaction);
 	public MCostDetail process();
-	public void processCostDetail(MCostDetail costDetail);
+	//public void processCostDetail(MCostDetail costDetail);
 }
diff --git a/base/src/org/adempiere/engine/LastInvoiceCostingMethod.java b/base/src/org/adempiere/engine/LastInvoiceCostingMethod.java
@@ -85,11 +85,11 @@ public MCostDetail process() {
 		return costDetail;
 	}
 
-	@Override
+	/*@Override
 	public void processCostDetail(MCostDetail mCostdetail) {
 		// TODO Auto-generated method stub
 		
-	}
+	}*/
 
 	@Override
 	protected List<CostComponent> getCalculatedCosts() {

diff --git a/base/src/org/adempiere/engine/LastPOPriceCostingMethod.java b/base/src/org/adempiere/engine/LastPOPriceCostingMethod.java
@@ -88,11 +88,11 @@ else if ( costDetail.getM_InOutLine_ID() != 0 // AR Shipment Detail Record
 		return costDetail;
 	}
 
-	@Override
+	/*@Override
 	public void processCostDetail(MCostDetail mCostdetail) {
 		// TODO Auto-generated method stub
 		
-	}
+	}*/
 
 	@Override
 	protected List<CostComponent> getCalculatedCosts() {

diff --git a/base/src/org/adempiere/engine/StandardCostingMethod.java b/base/src/org/adempiere/engine/StandardCostingMethod.java
@@ -310,15 +310,15 @@ public BigDecimal getNewAccumulatedQuantity(MCostDetail cd) {
 		return cd.getCumulatedQty().add(cd.getQty());
 	}
 
-	public void processCostDetail(MCostDetail costDetail) {
+	/*public void processCostDetail(MCostDetail costDetail) {
 		if (!costDetail.isProcessed()) {
 			MAcctSchema as = MAcctSchema.get(costDetail.getCtx(),
 					costDetail.getC_AcctSchema_ID());
 			MClient client = MClient.get(as.getCtx(), as.getAD_Client_ID());
 			if (client.isCostImmediate())
 				costDetail.process();
 		}
-	}
+	}*/
 
 	@Override
 	protected List<CostComponent> getCalculatedCosts() {
@@ -660,7 +660,7 @@ public MCostDetail createVarianceCostDetail(MPPCostCollector costCollector,
 		costDetailVariance.setQty(quantity);
 		costDetailVariance.setDateAcct(costCollector.getDateAcct());
 		costDetailVariance.saveEx();
-		processCostDetail(costDetailVariance);
+		//processCostDetail(costDetailVariance);
 		return costDetailVariance;
 	}
 
@@ -708,7 +708,7 @@ public void createActivityControl(MPPCostCollector costCollector) {
 					costDetail.setDateAcct(costCollector.getDateAcct());
 					costDetail.setCostAmt(costs.negate());
 					costDetail.saveEx();
-					processCostDetail(costDetail);
+					//processCostDetail(costDetail);
 				}
 			}
 		}

diff --git a/base/src/org/compiere/acct/Doc_Invoice.java b/base/src/org/compiere/acct/Doc_Invoice.java
@@ -539,13 +539,13 @@ else if (getDocumentType().equals(DOCTYPE_APInvoice))
 						serviceAmt = serviceAmt.add(amt);
 					}
 					//
-					if (line.getM_Product_ID() != 0
+					/*if (line.getM_Product_ID() != 0
 						&& line.getProduct().isService())	//	otherwise Inv Matching
 						MCostDetail.createInvoice(as, line.getAD_Org_ID(), 
 							line.getM_Product_ID(), line.getM_AttributeSetInstance_ID(),
 							line.get_ID(), 0,		//	No Cost Element
 							line.getAmtSource(), line.getQty(),
-							line.getDescription(), getTrxName());
+							line.getDescription(), getTrxName());*/
 				}
 			}
 			//  Set Locations
@@ -645,13 +645,13 @@ else if (getDocumentType().equals(DOCTYPE_APCredit))
 						serviceAmt = serviceAmt.add(amt);
 					}
 					//
-					if (line.getM_Product_ID() != 0
+					/*if (line.getM_Product_ID() != 0
 						&& line.getProduct().isService())	//	otherwise Inv Matching
 						MCostDetail.createInvoice(as, line.getAD_Org_ID(), 
 							line.getM_Product_ID(), line.getM_AttributeSetInstance_ID(),
 							line.get_ID(), 0,		//	No Cost Element
 							line.getAmtSource().negate(), line.getQty(),
-							line.getDescription(), getTrxName());
+							line.getDescription(), getTrxName());*/
 				}
 			}
 			//  Set Locations
@@ -914,11 +914,11 @@ private boolean landedCost (MAcctSchema as, Fact fact, DocLine line, boolean dr)
 				allocationAmt = allocationAmt.negate();
 			// AZ Goodwill
 			// use createInvoice to create/update non Material Cost Detail
-			MCostDetail.createInvoice(as, lca.getAD_Org_ID(), 
+			/*MCostDetail.createInvoice(as, lca.getAD_Org_ID(),
 					lca.getM_Product_ID(), lca.getM_AttributeSetInstance_ID(),
 					C_InvoiceLine_ID, lca.getM_CostElement_ID(),
 					allocationAmt, lca.getQty(),
-					desc, getTrxName());
+					desc, getTrxName());*/
 			// end AZ
 		}
 

diff --git a/base/src/org/compiere/model/MCost.java b/base/src/org/compiere/model/MCost.java
@@ -447,7 +447,7 @@ else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
 	 *	@return current cost price or null
 	 *	@deprecated
 	 */
-	public static BigDecimal getCurrentCost (MProduct product,
+	/*public static BigDecimal getCurrentCost (MProduct product,
 		int M_AttributeSetInstance_ID,
 		MAcctSchema as, int AD_Org_ID, int M_Warehouse_ID, String costingMethod,
 		BigDecimal qty, int C_OrderLine_ID,
@@ -481,6 +481,7 @@ else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
 			as, AD_Org_ID, M_Warehouse_ID, as.getM_CostType_ID(), costingMethod, qty,
 			C_OrderLine_ID, zeroCostsOK, trxName);
 	}	//	getCurrentCost
+	*/
 
 	/**
 	 * 	Get Current Cost Price for Costing Level
@@ -1000,7 +1001,7 @@ public static BigDecimal getPOPrice (MProduct product, int C_OrderLine_ID, int C
 	 *	@param client client
 	 */
 	@Deprecated
-	public static void create (MClient client)
+	/*public static void create (MClient client)
 	{
 		MAcctSchema[] ass = MAcctSchema.getClientAcctSchema(client.getCtx(), client.getAD_Client_ID());
 		String trxName = client.get_TrxName();
@@ -1062,6 +1063,7 @@ public static void create (MClient client)
 			trx.close();
 		}
 	}	//	create
+	*/
 
 
 	/**
@@ -2025,7 +2027,7 @@ WHERE EXISTS (SELECT * FROM M_CostElement ce
 
 		Adempiere.startup(true);
 		MClient client = MClient.get(Env.getCtx(), 11);	//	GardenWorld
-		create(client);
+		//create(client);
 
 	}	//	main
 

diff --git a/base/src/org/compiere/model/MCostDetail.java b/base/src/org/compiere/model/MCostDetail.java
@@ -517,7 +517,7 @@ public static List<MCostDetail> getAfterDate (MCostDetail cd, String costingLeve
 	 *	@param trxName transaction
 	 *	@return true if created
 	 */
-	public static boolean createOrder (MAcctSchema as, int AD_Org_ID, 
+	/*public static boolean createOrder (MAcctSchema as, int AD_Org_ID,
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int C_OrderLine_ID, int M_CostElement_ID, 
 		BigDecimal Amt, BigDecimal Qty,
@@ -569,6 +569,7 @@ public static boolean createOrder (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createOrder
+	*/
 
 
 	/**
@@ -586,7 +587,7 @@ public static boolean createOrder (MAcctSchema as, int AD_Org_ID,
 	 *	@param trxName transaction
 	 *	@return true if created
 	 */
-	public static boolean createInvoice (MAcctSchema as, int AD_Org_ID, 
+	/*public static boolean createInvoice (MAcctSchema as, int AD_Org_ID,
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int C_InvoiceLine_ID, int M_CostElement_ID, 
 		BigDecimal Amt, BigDecimal Qty,
@@ -638,6 +639,7 @@ public static boolean createInvoice (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createInvoice
+	*/
 
 	/**
 	 * 	Create New Shipment Cost Detail for SO Shipments.
@@ -655,7 +657,7 @@ public static boolean createInvoice (MAcctSchema as, int AD_Org_ID,
 	 *	@param trxName transaction
 	 *	@return true if no error
 	 */
-	public static boolean createShipment (MAcctSchema as, int AD_Org_ID, 
+	/*public static boolean createShipment (MAcctSchema as, int AD_Org_ID,
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int M_InOutLine_ID, int M_CostElement_ID, 
 		BigDecimal Amt, BigDecimal Qty,
@@ -708,6 +710,7 @@ public static boolean createShipment (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createShipment
+	*/
 
 	/**
 	 * 	Create New Order Cost Detail for Physical Inventory.
@@ -724,6 +727,7 @@ public static boolean createShipment (MAcctSchema as, int AD_Org_ID,
 	 *	@param trxName transaction
 	 *	@return true if no error
 	 */
+	/*
 	public static boolean createInventory (MAcctSchema as, int AD_Org_ID, 
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int M_InventoryLine_ID, int M_CostElement_ID, 
@@ -776,6 +780,7 @@ public static boolean createInventory (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createInventory
+	*/
 
 	/**
 	 * 	Create New Order Cost Detail for Movements.
@@ -793,7 +798,7 @@ public static boolean createInventory (MAcctSchema as, int AD_Org_ID,
 	 *	@param trxName transaction
 	 *	@return true if no error
 	 */
-	public static boolean createMovement (MAcctSchema as, int AD_Org_ID, 
+	/*public static boolean createMovement (MAcctSchema as, int AD_Org_ID,
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int M_MovementLine_ID, int M_CostElement_ID, 
 		BigDecimal Amt, BigDecimal Qty, boolean from,
@@ -848,6 +853,7 @@ public static boolean createMovement (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createMovement
+	*/
 
 	/**
 	 * 	Create New Order Cost Detail for Production.
@@ -864,7 +870,7 @@ public static boolean createMovement (MAcctSchema as, int AD_Org_ID,
 	 *	@param trxName transaction
 	 *	@return true if no error
 	 */
-	public static boolean createProduction (MAcctSchema as, int AD_Org_ID, 
+	/*public static boolean createProduction (MAcctSchema as, int AD_Org_ID,
 		int M_Product_ID, int M_AttributeSetInstance_ID,
 		int M_ProductionLine_ID, int M_CostElement_ID, 
 		BigDecimal Amt, BigDecimal Qty,
@@ -916,6 +922,7 @@ public static boolean createProduction (MAcctSchema as, int AD_Org_ID,
 		s_log.config("(" + ok + ") " + cd);
 		return ok;
 	}	//	createProduction
+	*/
 
 	/**************************************************************************
 	 * 	Get Cost Detail
@@ -993,7 +1000,7 @@ public static MCostDetail get (Properties ctx, String whereClause,
 	 *	@param trxName transaction
 	 *	@return true if no error
 	 */
-	public static boolean processProduct (MProduct product, String trxName)
+	/*public static boolean processProduct (MProduct product, String trxName)
 	{
 		final String whereClause = I_M_CostDetail.COLUMNNAME_M_Product_ID+"=?"
 			+ " AND "+I_M_CostDetail.COLUMNNAME_Processed+"=?";
@@ -1012,6 +1019,7 @@ public static boolean processProduct (MProduct product, String trxName)
 		s_log.config("OK=" + counterOK + ", Errors=" + counterError);
 		return counterError == 0;
 	}	//	processProduct
+	*/
 
 	/**	Logger	*/
 	private static CLogger 	s_log = CLogger.getCLogger (MCostDetail.class);
@@ -1296,6 +1304,7 @@ public String toString ()
 	 * 	The record is saved if processed.
 	 *	@return true if processed
 	 */
+	/*
 	public synchronized boolean process()
 	{
 		if (isProcessed())
@@ -1355,6 +1364,7 @@ else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel)) {
 		log.info(ok + " - " + toString());
 		return ok;
 	}	//	process
+	*/
 
 
     /**
@@ -1629,6 +1639,7 @@ public static BigDecimal getByDocLineMatchInv(MInvoiceLine invoiceLine, MInOutLi
 				invoiceLine.getAD_Client_ID(),
 				acctSchemaId,
 				invoiceLine.getM_Product_ID(),
+				invoiceLine.getM_AttributeSetInstance_ID(),
 				costTypeId,
 				invoiceLine.getC_InvoiceLine_ID(),
 				inOutLine.getM_InOutLine_ID())

diff --git a/base/src/org/compiere/model/MInventory.java b/base/src/org/compiere/model/MInventory.java
@@ -996,7 +996,7 @@ else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel) && M_AttributeSe
 
 	//if isReversal CostDetail is created from CostDetail of original document 
 	// is made a new CostDetail where Amt and Qty are negate
-	private void createCostDetail(MTransaction trx, int reversalLine_ID) {
+	/*private void createCostDetail(MTransaction trx, int reversalLine_ID) {
 			
 		String whereClause = MCostDetail.COLUMNNAME_M_InventoryLine_ID+"=?"
 		                                 +" AND "+MCostDetail.COLUMNNAME_M_AttributeSetInstance_ID+"=?";
@@ -1019,7 +1019,7 @@ private void createCostDetail(MTransaction trx, int reversalLine_ID) {
 			cdnew.process();
 		}
 		
-	}
+	}*/
 
 	/**
 	 * 	Document Status is Complete or Closed

diff --git a/base/src/org/compiere/model/MMatchInv.java b/base/src/org/compiere/model/MMatchInv.java
@@ -468,7 +468,7 @@ else if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel))
 						{
 							final ICostingMethod method = CostingMethodFactory.get().getCostingMethod(ct.getCostingMethod());
 							method.setCostingMethod(as, trx, this, dimension, Env.ZERO, Env.ZERO, false);
-							method.processCostDetail(cd);
+							//method.processCostDetail(cd);
 						}
 					}
 				}

diff --git a/base/src/org/compiere/model/ProductCost.java b/base/src/org/compiere/model/ProductCost.java
@@ -382,15 +382,15 @@ public MAccount getAccountDefault (int AcctType, MAcctSchema as, int AD_Org_ID)
 	 *  @return cost or null, if qty or costs cannot be determined
 	 *  @deprecated
 	 */
-	public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID, int M_Warehouse_ID,
+	/*public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID, int M_Warehouse_ID,
 		String costingMethod, int C_OrderLine_ID, boolean zeroCostsOK)
 	{
 		if (m_qty == null)
 		{
 			log.fine("No Qty");
 			return null;
 		}
-		/**	Old Costing
+		*//**	Old Costing
 		MClient client = MClient.get(as.getCtx(), as.getAD_Client_ID());
 		if (!client.isUseBetaFunctions())
 		{
@@ -400,7 +400,7 @@ public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID, int M_Warehous
 			log.fine("Qty(" + m_qty + ") * Cost(" + itemCost + ") = " + cost);
 			return cost;
 		}
-		**/
+		**//*
 		
 		//	No Product
 		if (m_product == null)
@@ -417,7 +417,8 @@ public BigDecimal getProductCosts (MAcctSchema as, int AD_Org_ID, int M_Warehous
 			return null;
 		}
 		return cost;
-	}   //  getProductCosts
+	}   //  getProductCosts*/
+
 
 
 	/**