0039888: Wrong Cost Adjustment created when Reactivating a Landed Cost

diff --git a/src/org/openbravo/costing/AverageCostAdjustment.java b/src/org/openbravo/costing/AverageCostAdjustment.java
--- a/src/org/openbravo/costing/AverageCostAdjustment.java
+++ b/src/org/openbravo/costing/AverageCostAdjustment.java
@@ -768,7 +768,7 @@
     critLines.add(Restrictions.eq(CostAdjustmentLine.PROPERTY_INVENTORYTRANSACTION, trx));
     critLines.add(Restrictions.or(//
         Restrictions.eq("ca.id", getCostAdj().getId()),//
-        Restrictions.eq("ca." + CostAdjustment.PROPERTY_DOCUMENTSTATUS, "CO")));
+        Restrictions.not(Restrictions.eq("ca." + CostAdjustment.PROPERTY_DOCUMENTSTATUS, "DR"))));
 
     return critLines.list();
   }
diff --git a/src/org/openbravo/costing/CancelCostAdjustment.java b/src/org/openbravo/costing/CancelCostAdjustment.java
--- a/src/org/openbravo/costing/CancelCostAdjustment.java
+++ b/src/org/openbravo/costing/CancelCostAdjustment.java
@@ -23,6 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.ScrollMode;
@@ -40,8 +42,6 @@
 import org.openbravo.model.materialmgmt.cost.CostAdjustment;
 import org.openbravo.model.materialmgmt.cost.CostAdjustmentLine;
 import org.openbravo.service.db.DbUtility;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 
 public class CancelCostAdjustment extends BaseActionHandler {
   private static final Logger log = LogManager.getLogger();
@@ -118,8 +118,7 @@
         lineCancel.setCreatedBy(OBContext.getOBContext().getUser());
         lineCancel.setCostAdjustment(cacProxy);
         lineCancel.setAdjustmentAmount(lineOrig.getAdjustmentAmount().negate());
-        lineCancel.setBackdatedTrx(Boolean.FALSE);
-        lineCancel.setNegativeStockCorrection(Boolean.FALSE);
+
         if (lineOrig.getInventoryTransaction().isCostPermanent()) {
           lineOrig.getInventoryTransaction().setCostPermanent(Boolean.FALSE);
           OBDal.getInstance().save(lineOrig.getInventoryTransaction());