Merge pull request #336 from metasfresh/gh523-metasfresh

#523 metasfresh WIP
metasfresh · May 1, 2017 · 0b0b691 · 0b0b691
2 parents 9134111 + d04f4a3
commit 0b0b691
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/.../metas/ui/web/handlingunits/process/WEBUI_M_ReceiptSchedule_GeneratePlanningHUs_Base.java b/.../metas/ui/web/handlingunits/process/WEBUI_M_ReceiptSchedule_GeneratePlanningHUs_Base.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.uom.api.Quantity;
 import org.adempiere.util.Services;
 import org.adempiere.util.lang.impl.TableRecordReference;
 
@@ -21,6 +20,7 @@
 import de.metas.process.JavaProcess;
 import de.metas.process.ProcessPreconditionsResolution;
 import de.metas.process.RunOutOfTrx;
+import de.metas.quantity.Quantity;
 
 /*
  * #%L

diff --git a/src/main/java/de/metas/ui/web/handlingunits/process/WEBUI_M_ReceiptSchedule_ReceiveCUs.java b/src/main/java/de/metas/ui/web/handlingunits/process/WEBUI_M_ReceiptSchedule_ReceiveCUs.java
@@ -6,7 +6,6 @@
 
 import org.adempiere.ad.trx.api.ITrx;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.uom.api.Quantity;
 import org.adempiere.util.GuavaCollectors;
 import org.adempiere.util.Services;
 import org.adempiere.util.lang.impl.TableRecordReference;
@@ -32,6 +31,7 @@
 import de.metas.process.JavaProcess;
 import de.metas.process.ProcessPreconditionsResolution;
 import de.metas.process.RunOutOfTrx;
+import de.metas.quantity.Quantity;
 import de.metas.ui.web.WebRestApiApplication;
 
 /*

diff --git a/src/main/java/de/metas/ui/web/pporder/PPOrderLinesLoader.java b/src/main/java/de/metas/ui/web/pporder/PPOrderLinesLoader.java
@@ -12,7 +12,6 @@
 import org.compiere.model.I_M_Product;
 import org.compiere.util.Env;
 import org.compiere.util.Util;
-import org.eevolution.api.IPPOrderBOMBL;
 import org.eevolution.api.IPPOrderBOMDAO;
 import org.eevolution.model.X_PP_Order;
 import org.eevolution.model.X_PP_Order_BOMLine;
@@ -27,6 +26,7 @@
 import de.metas.handlingunits.model.I_PP_Order_Qty;
 import de.metas.handlingunits.pporder.api.IHUPPOrderBL;
 import de.metas.handlingunits.pporder.api.IHUPPOrderQtyDAO;
+import de.metas.material.planning.pporder.IPPOrderBOMBL;
 import de.metas.ui.web.handlingunits.HUEditorRow;
 import de.metas.ui.web.handlingunits.HUEditorRowAttributesProvider;
 import de.metas.ui.web.handlingunits.HUEditorViewRepository;

diff --git a/src/main/java/de/metas/ui/web/pporder/process/PackingInfoProcessParams.java b/src/main/java/de/metas/ui/web/pporder/process/PackingInfoProcessParams.java
@@ -10,7 +10,6 @@
 import org.adempiere.exceptions.AdempiereException;
 import org.adempiere.exceptions.FillMandatoryException;
 import org.adempiere.model.InterfaceWrapperHelper;
-import org.adempiere.uom.api.Quantity;
 import org.adempiere.util.Services;
 import org.compiere.util.Env;
 
@@ -25,6 +24,7 @@
 import de.metas.handlingunits.model.X_M_HU_PI_Version;
 import de.metas.process.IProcessDefaultParametersProvider;
 import de.metas.process.Param;
+import de.metas.quantity.Quantity;
 import lombok.Builder;
 import lombok.NonNull;
 

diff --git a/src/main/java/de/metas/ui/web/pporder/process/WEBUI_PP_Order_Receipt.java b/src/main/java/de/metas/ui/web/pporder/process/WEBUI_PP_Order_Receipt.java
@@ -21,6 +21,7 @@
 import de.metas.process.Param;
 import de.metas.process.ProcessPreconditionsResolution;
 import de.metas.process.RunOutOfTrx;
+import de.metas.quantity.Quantity;
 import de.metas.ui.web.pporder.PPOrderLineRow;
 import de.metas.ui.web.pporder.PPOrderLineType;
 import de.metas.ui.web.pporder.PPOrderLinesView;

diff --git a/src/main/java/de/metas/ui/web/session/UserSession.java b/src/main/java/de/metas/ui/web/session/UserSession.java
@@ -117,8 +117,6 @@ public static UserSession getCurrent() throws NotLoggedInException
 	@Autowired
 	public UserSession(final ApplicationEventPublisher eventPublisher)
 	{
-		super();
-
 		this.eventPublisher = eventPublisher;
 	}