Author: jleroux Date: Wed Mar 4 10:03:45 2015 New Revision: 1663914 URL: http://svn.apache.org/r1663914 Log: "Applied fix from trunk for revision: 1663912 " ------------------------------------------------------------------------ r1663912 | jleroux | 2015-03-04 11:02:44 +0100 (mer., 04 mars 2015) | 7 lines
A patch from Christian Carlow for "Error when updating shipment destinationFacilityId" https://issues.apache.org/jira/browse/OFBIZ-6131 The Following Errors Occurred: Error running the simple-method: Primary key map "estimatedArrivalWorkEffortMap" not found Method = updateShipment, File = file:/home/anon/ofbiz/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml, Element = <find-by-primary-key>, Line 215null estimatedArrivalWorkEffortMap is passed to <find-by-primary-key> but never set which causes the error. jleroux: I was curious about this (was weird), it was missed at r889656, anyway gone... ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 4 10:03:45 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912 Modified: ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1663914&r1=1663913&r2=1663914&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Mar 4 10:03:45 2015 @@ -212,7 +212,6 @@ under the License. </or> </condition> <then> - <find-by-primary-key entity-name="WorkEffort" map="estimatedArrivalWorkEffortMap" value-field="estimatedArrivalWorkEffort"/> <entity-one entity-name="WorkEffort" value-field="estimatedArrivalWorkEffort" auto-field-map="false"> <field-map field-name="workEffortId" from-field="lookedUpValue.estimatedArrivalWorkEffId"/> </entity-one>
