svn commit: r1661978 - in /ofbiz/branches/release14.12: ./ applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml

Author: jleroux
Date: Tue Feb 24 15:23:20 2015
New Revision: 1661978

URL: http://svn.apache.org/r1661978
Log:
"Applied fix from trunk for revision: 1661977  "
------------------------------------------------------------------------
r1661977 | jleroux | 2015-02-24 16:21:38 +0100 (mar., 24 févr. 2015) | 5 lines

The real reason of the recent issue while loading demo data was due to r1661612, reverts it here and will reopen OFBIZ-5027

I guess it's due to
require-new-transaction="true"
when calling createProductFacility service, not sure why it was needed
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 15:23:20 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661778,1661853,1661862,1661873,1661940,1661951
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661778,1661853,1661862,1661873,1661940,1661951,1661977

Modified: ofbiz/branches/release14.12/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1661978&r1=1661977&r2=1661978&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/branches/release14.12/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Feb 24 15:23:20 2015
@@ -1274,16 +1274,6 @@ under the License.
         <entity-one value-field="inventoryItem" entity-name="InventoryItem"  auto-field-map="false">
             <field-map field-name="inventoryItemId" from-field="parameters.inventoryItemId"/>
         </entity-one>
-        <if-not-empty field="inventoryItem">
-            <set field="facilityId" from-field="inventoryItem.facilityId"/>
-            <set field="productId" from-field="inventoryItem.productId"/>
-            <entity-one value-field="productFacility" entity-name="ProductFacility"/>
-            <if-empty field="productFacility">
-                <set field="createProductFacilityMap.facilityId" from-field="facilityId"/>
-                <set field="createProductFacilityMap.productId" from-field="productId"/>
-                <call-service service-name="createProductFacility" in-map-name="createProductFacilityMap" require-new-transaction="true"/>
-            </if-empty>
-        </if-not-empty>
         <entity-and list="productFacilities" entity-name="ProductFacility">
             <field-map field-name="productId" from-field="inventoryItem.productId" />
         </entity-and>