Author: jleroux
Revision: 1757973
Modified property: svn:log
Modified: svn:log at Sat Aug 27 08:53:58 2016
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Aug 27 08:53:58 2016
@@ -1,2 +1,11 @@
-"Applied fix from trunk for revision: "
-
+"Applied fix from trunk for revision: 1757968 " (Tree conflict handled by hand)
+------------------------------------------------------------------------
+r1757968 | jleroux | 2016-08-27 10:30:39 +0200 (sam. 27 août 2016) | 6 lignes
+
+A patch from Deepak Nigam for "Warning related to 'InventoryItemAndLocation' entity on server start "
https://issues.apache.org/jira/browse/OFBIZ-7986+
+On starting ofbiz server following error is coming at console :
+
+2016-08-27 11:53:54,084 |delegator-startup-1 |ModelViewEntity |I| [InventoryItemAndLocation]: Throwing out field alias in view entity because one already exists with the alias name [inventoryItemTypeId] and field name [PR(Product).inventoryItemTypeId], existing field name is [II.inventoryItemTypeId] 2016-08-27 11:53:54,088 |delegator-startup-1 |ModelViewEntity |I| [ProductInventoryItem]: Throwing out field alias in view entity because one already exists with the alias name [inventoryItemTypeId] and field name [II(InventoryItem).inventoryItemTypeId], existing field name is [PR.inventoryItemTypeId]
+
+------------------------------------------------------------------------