Merge remote-tracking branch 'refs/remotes/origin/master' into gh2038

ReleaseNotes.md

@@ -17,7 +17,7 @@ Here come the actual release notes:
 ## Features
 * metasfresh-app
   * [#1993](https://github.com/metasfresh/metasfresh/issues/1993) Set default Widget width for certain Columns
-    * Refining and Harmonizing the Widget width of columns in GridView for those, where generic width according to their widget type does not match to the user requirement or field content. 
+    * Refining and Harmonizing the Widget width of columns in GridView for those, where generic width according to their widget type does not match to the user requirement or field content.
   * [#1995](https://github.com/metasfresh/metasfresh/issues/1995) Language Names too Long
     * Ranaming of Language Names, avoiding them to get too long because of Country Name. Now added the 2-digit iso country code instead.
   * [#1996](https://github.com/metasfresh/metasfresh/issues/1996) Take out all AD_Client_ID from GridView in WebUI
@@ -28,6 +28,7 @@ Here come the actual release notes:
     * Adjustments to various CRM windows. Adding missing Fields, Optimizing Column widths.
   * [#2009](https://github.com/metasfresh/metasfresh/issues/2009) Feedback WebUI Prices
     * Further Layout Adjustments to Pricelist and Product Price window in WebUI.
+  * [#2012](https://github.com/metasfresh/metasfresh/issues/2012) import messages
   * [#2015](https://github.com/metasfresh/metasfresh/issues/2015) Create Window Price List Schema in WebUI
     * Adjusting the Layout for Price List Schema Window in WebUI
   * [#2017](https://github.com/metasfresh/metasfresh/issues/2017) Create Window Pricing Rule in WebUI
@@ -40,21 +41,34 @@ Here come the actual release notes:
     * New Window in WebUI thats allows the user to maintain the valid Account Combinations.
 
 * metasfresh-webui-api
+  * [#506](https://github.com/metasfresh/metasfresh-webui-api/issues/506) view: accept included referencing documents when creating a new view
 
 * metasfresh-webui-frontend
+  * [#999](https://github.com/metasfresh/metasfresh-webui-frontend/issues/999) grid view: use keyboard + and - to expand/collapse included rows
+  * [#1007](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1007) eMail Icon in Action Menu
+  * [#1029](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1029) keyboard shortcut and tooltip for button in filters
+  * [#1030](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1030) Directly display quick actions for the first row of a modal window
+  * [#1038](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1038) Flickering effect in Picking Terminal
+
 
 ## Fixes
 * metasfresh-app
   * [#2013](https://github.com/metasfresh/metasfresh/issues/2013) Broken Included Tabs to be redone
     * Fixes a broken Included Tab in the Manufacturing Order Window
 
 * metasfresh-webui-api
+  * [#1982](https://github.com/metasfresh/metasfresh/issues/1982) partial issue problem
 
 * metasfresh-webui-frontend
   * [#1009](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1009) Window Name missing in Action Menu
     * Fixes a Bug not showing the Window Name in Action Menu nor the possibility to set a Bookmark for the window.
+  * [#1015](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1015) Uncaught TypeError: Cannot read property 'className' of null
+  * [#1028](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1028) Tooltip when hovering GridView Header
   * [#1030](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1030) Directly display quick actions for the first row of a modal window
     * Bugfix for the Quickaction behavior in modal overlay when opened and first row is initially selected.
+  * [#1040](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1040) Readonly field Contact looks editable
+  * [#1041](https://github.com/metasfresh/metasfresh-webui-frontend/issues/1041) included tab: when zoom into the new window opens with error
+
 
 # metasfresh 5.18 (2017-29)
 

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/I_M_Packageable_V.java

@@ -249,6 +249,35 @@ public interface I_M_Packageable_V
     /** Column name C_Order_ID */
     public static final String COLUMNNAME_C_Order_ID = "C_Order_ID";
 
+	/**
+	 * Set Maßeinheit.
+	 * Maßeinheit
+	 *
+	 * <br>Type: TableDir
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public void setC_UOM_ID (int C_UOM_ID);
+
+	/**
+	 * Get Maßeinheit.
+	 * Maßeinheit
+	 *
+	 * <br>Type: TableDir
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public int getC_UOM_ID();
+
+	public org.compiere.model.I_C_UOM getC_UOM();
+
+	public void setC_UOM(org.compiere.model.I_C_UOM C_UOM);
+
+    /** Column definition for C_UOM_ID */
+    public static final org.adempiere.model.ModelColumn<I_M_Packageable_V, org.compiere.model.I_C_UOM> COLUMN_C_UOM_ID = new org.adempiere.model.ModelColumn<I_M_Packageable_V, org.compiere.model.I_C_UOM>(I_M_Packageable_V.class, "C_UOM_ID", org.compiere.model.I_C_UOM.class);
+    /** Column name C_UOM_ID */
+    public static final String COLUMNNAME_C_UOM_ID = "C_UOM_ID";
+
 	/**
 	 * Get Erstellt.
 	 * Datum, an dem dieser Eintrag erstellt wurde
@@ -484,7 +513,7 @@ public interface I_M_Packageable_V
 	/**
 	 * Set Lieferdisposition.
 	 *
-	 * <br>Type: Search
+	 * <br>Type: ID
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
@@ -493,18 +522,14 @@ public interface I_M_Packageable_V
 	/**
 	 * Get Lieferdisposition.
 	 *
-	 * <br>Type: Search
+	 * <br>Type: ID
 	 * <br>Mandatory: false
 	 * <br>Virtual Column: false
 	 */
 	public int getM_ShipmentSchedule_ID();
 
-	public de.metas.inoutcandidate.model.I_M_ShipmentSchedule getM_ShipmentSchedule();
-
-	public void setM_ShipmentSchedule(de.metas.inoutcandidate.model.I_M_ShipmentSchedule M_ShipmentSchedule);
-
     /** Column definition for M_ShipmentSchedule_ID */
-    public static final org.adempiere.model.ModelColumn<I_M_Packageable_V, de.metas.inoutcandidate.model.I_M_ShipmentSchedule> COLUMN_M_ShipmentSchedule_ID = new org.adempiere.model.ModelColumn<I_M_Packageable_V, de.metas.inoutcandidate.model.I_M_ShipmentSchedule>(I_M_Packageable_V.class, "M_ShipmentSchedule_ID", de.metas.inoutcandidate.model.I_M_ShipmentSchedule.class);
+    public static final org.adempiere.model.ModelColumn<I_M_Packageable_V, Object> COLUMN_M_ShipmentSchedule_ID = new org.adempiere.model.ModelColumn<I_M_Packageable_V, Object>(I_M_Packageable_V.class, "M_ShipmentSchedule_ID", null);
     /** Column name M_ShipmentSchedule_ID */
     public static final String COLUMNNAME_M_ShipmentSchedule_ID = "M_ShipmentSchedule_ID";
 
@@ -664,6 +689,29 @@ public interface I_M_Packageable_V
     /** Column name ProductName */
     public static final String COLUMNNAME_ProductName = "ProductName";
 
+	/**
+	 * Set Qty picked (planned).
+	 *
+	 * <br>Type: Quantity
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public void setQtyPickedPlanned (java.math.BigDecimal QtyPickedPlanned);
+
+	/**
+	 * Get Qty picked (planned).
+	 *
+	 * <br>Type: Quantity
+	 * <br>Mandatory: false
+	 * <br>Virtual Column: false
+	 */
+	public java.math.BigDecimal getQtyPickedPlanned();
+
+    /** Column definition for QtyPickedPlanned */
+    public static final org.adempiere.model.ModelColumn<I_M_Packageable_V, Object> COLUMN_QtyPickedPlanned = new org.adempiere.model.ModelColumn<I_M_Packageable_V, Object>(I_M_Packageable_V.class, "QtyPickedPlanned", null);
+    /** Column name QtyPickedPlanned */
+    public static final String COLUMNNAME_QtyPickedPlanned = "QtyPickedPlanned";
+
 	/**
 	 * Set Ausliefermenge.
 	 *

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/I_M_ReceiptSchedule.java

@@ -870,7 +870,7 @@ public interface I_M_ReceiptSchedule
     public static final String COLUMNNAME_M_Warehouse_Override_ID = "M_Warehouse_Override_ID";
 
 	/**
-	 * Set Bewegungs-Datum.
+	 * Set Bewegungsdatum.
 	 * Datum, an dem eine Produkt in oder aus dem Bestand bewegt wurde
 	 *
 	 * <br>Type: Date
@@ -880,7 +880,7 @@ public interface I_M_ReceiptSchedule
 	public void setMovementDate (java.sql.Timestamp MovementDate);
 
 	/**
-	 * Get Bewegungs-Datum.
+	 * Get Bewegungsdatum.
 	 * Datum, an dem eine Produkt in oder aus dem Bestand bewegt wurde
 	 *
 	 * <br>Type: Date

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/X_M_Packageable_V.java

@@ -4,7 +4,6 @@
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.Env;
 
 /** Generated Model for M_Packageable_V
  *  @author Adempiere (generated) 
@@ -16,7 +15,7 @@ public class X_M_Packageable_V extends org.compiere.model.PO implements I_M_Pack
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = -1962050959L;
+	private static final long serialVersionUID = -1519378230L;
 
     /** Standard Constructor */
     public X_M_Packageable_V (Properties ctx, int M_Packageable_V_ID, String trxName)
@@ -220,6 +219,43 @@ public int getC_Order_ID ()
 		return ii.intValue();
 	}
 
+	@Override
+	public org.compiere.model.I_C_UOM getC_UOM() throws RuntimeException
+	{
+		return get_ValueAsPO(COLUMNNAME_C_UOM_ID, org.compiere.model.I_C_UOM.class);
+	}
+
+	@Override
+	public void setC_UOM(org.compiere.model.I_C_UOM C_UOM)
+	{
+		set_ValueFromPO(COLUMNNAME_C_UOM_ID, org.compiere.model.I_C_UOM.class, C_UOM);
+	}
+
+	/** Set Maßeinheit.
+		@param C_UOM_ID 
+		Maßeinheit
+	  */
+	@Override
+	public void setC_UOM_ID (int C_UOM_ID)
+	{
+		if (C_UOM_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_C_UOM_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_C_UOM_ID, Integer.valueOf(C_UOM_ID));
+	}
+
+	/** Get Maßeinheit.
+		@return Maßeinheit
+	  */
+	@Override
+	public int getC_UOM_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_C_UOM_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Auftragsdatum.
 		@param DateOrdered 
 		Datum des Auftrags
@@ -465,18 +501,6 @@ public int getM_Product_ID ()
 		return ii.intValue();
 	}
 
-	@Override
-	public de.metas.inoutcandidate.model.I_M_ShipmentSchedule getM_ShipmentSchedule() throws RuntimeException
-	{
-		return get_ValueAsPO(COLUMNNAME_M_ShipmentSchedule_ID, de.metas.inoutcandidate.model.I_M_ShipmentSchedule.class);
-	}
-
-	@Override
-	public void setM_ShipmentSchedule(de.metas.inoutcandidate.model.I_M_ShipmentSchedule M_ShipmentSchedule)
-	{
-		set_ValueFromPO(COLUMNNAME_M_ShipmentSchedule_ID, de.metas.inoutcandidate.model.I_M_ShipmentSchedule.class, M_ShipmentSchedule);
-	}
-
 	/** Set Lieferdisposition.
 		@param M_ShipmentSchedule_ID Lieferdisposition	  */
 	@Override
@@ -662,6 +686,25 @@ public java.lang.String getProductName ()
 		return (java.lang.String)get_Value(COLUMNNAME_ProductName);
 	}
 
+	/** Set Qty picked (planned).
+		@param QtyPickedPlanned Qty picked (planned)	  */
+	@Override
+	public void setQtyPickedPlanned (java.math.BigDecimal QtyPickedPlanned)
+	{
+		set_ValueNoCheck (COLUMNNAME_QtyPickedPlanned, QtyPickedPlanned);
+	}
+
+	/** Get Qty picked (planned).
+		@return Qty picked (planned)	  */
+	@Override
+	public java.math.BigDecimal getQtyPickedPlanned () 
+	{
+		BigDecimal bd = (BigDecimal)get_Value(COLUMNNAME_QtyPickedPlanned);
+		if (bd == null)
+			 return BigDecimal.ZERO;
+		return bd;
+	}
+
 	/** Set Ausliefermenge.
 		@param QtyToDeliver Ausliefermenge	  */
 	@Override

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/X_M_ReceiptSchedule.java

@@ -4,7 +4,6 @@
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.Env;
 
 /** Generated Model for M_ReceiptSchedule
  *  @author Adempiere (generated) 
@@ -16,7 +15,7 @@ public class X_M_ReceiptSchedule extends org.compiere.model.PO implements I_M_Re
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 253169369L;
+	private static final long serialVersionUID = 678568494L;
 
     /** Standard Constructor */
     public X_M_ReceiptSchedule (Properties ctx, int M_ReceiptSchedule_ID, String trxName)
@@ -29,17 +28,13 @@ public X_M_ReceiptSchedule (Properties ctx, int M_ReceiptSchedule_ID, String trx
 			setC_DocType_ID (0);
 			setDeliveryRule (null);
 			setDeliveryViaRule (null);
-			setIsBPartnerAddress_Override (false);
-// N
-			setIsPackagingMaterial (false);
-// N
+			setIsBPartnerAddress_Override (false); // N
+			setIsPackagingMaterial (false); // N
 			setM_Product_ID (0);
 			setM_ReceiptSchedule_ID (0);
 			setM_Warehouse_ID (0);
-			setProcessed (false);
-// N
-			setQtyMovedWithIssues (BigDecimal.ZERO);
-// 0
+			setProcessed (false); // N
+			setQtyMovedWithIssues (BigDecimal.ZERO); // 0
         } */
     }
 
@@ -945,7 +940,7 @@ public int getM_Warehouse_Override_ID ()
 		return ii.intValue();
 	}
 
-	/** Set Bewegungs-Datum.
+	/** Set Bewegungsdatum.
 		@param MovementDate 
 		Datum, an dem eine Produkt in oder aus dem Bestand bewegt wurde
 	  */
@@ -955,7 +950,7 @@ public void setMovementDate (java.sql.Timestamp MovementDate)
 		set_Value (COLUMNNAME_MovementDate, MovementDate);
 	}
 
-	/** Get Bewegungs-Datum.
+	/** Get Bewegungsdatum.
 		@return Datum, an dem eine Produkt in oder aus dem Bestand bewegt wurde
 	  */
 	@Override

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/X_M_ReceiptSchedule_Alloc.java

@@ -4,7 +4,6 @@
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.Env;
 
 /** Generated Model for M_ReceiptSchedule_Alloc
  *  @author Adempiere (generated) 
@@ -16,7 +15,7 @@ public class X_M_ReceiptSchedule_Alloc extends org.compiere.model.PO implements
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 895140231L;
+	private static final long serialVersionUID = 1325249708L;
 
     /** Standard Constructor */
     public X_M_ReceiptSchedule_Alloc (Properties ctx, int M_ReceiptSchedule_Alloc_ID, String trxName)
@@ -26,8 +25,7 @@ public X_M_ReceiptSchedule_Alloc (Properties ctx, int M_ReceiptSchedule_Alloc_ID
         {
 			setM_ReceiptSchedule_Alloc_ID (0);
 			setM_ReceiptSchedule_ID (0);
-			setQtyWithIssues (BigDecimal.ZERO);
-// 0
+			setQtyWithIssues (BigDecimal.ZERO); // 0
         } */
     }
 

de.metas.swat/de.metas.swat.base/src/main/java-gen/de/metas/inoutcandidate/model/X_M_ShipmentSchedule.java

@@ -4,7 +4,6 @@
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.compiere.util.Env;
 
 /** Generated Model for M_ShipmentSchedule
  *  @author Adempiere (generated) 
@@ -16,7 +15,7 @@ public class X_M_ShipmentSchedule extends org.compiere.model.PO implements I_M_S
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = -1601343268L;
+	private static final long serialVersionUID = -2014321599L;
 
     /** Standard Constructor */
     public X_M_ShipmentSchedule (Properties ctx, int M_ShipmentSchedule_ID, String trxName)
@@ -30,16 +29,12 @@ public X_M_ShipmentSchedule (Properties ctx, int M_ShipmentSchedule_ID, String t
 			setC_BPartner_Location_ID (0);
 			setDeliveryRule (null);
 			setDeliveryViaRule (null);
-			setIsBPartnerAddress_Override (false);
-// N
-			setIsDisplayed (true);
-// Y
-			setIsDropShip (false);
-// N
+			setIsBPartnerAddress_Override (false); // N
+			setIsDisplayed (true); // Y
+			setIsDropShip (false); // N
 			setM_ShipmentSchedule_ID (0);
 			setM_Warehouse_ID (0);
-			setProcessed (false);
-// N
+			setProcessed (false); // N
 			setRecord_ID (0);
         } */
     }