svn commit: r1799768 - in /ofbiz/branches/release16.11: ./ applications/product/minilang/shipment/shipment/ShipmentServices.xml

Author: jleroux
Date: Sat Jun 24 12:01:00 2017
New Revision: 1799768

URL: http://svn.apache.org/viewvc?rev=1799768&view=rev
Log:
"Applied fix from trunk framework for revision: 1799767"
------------------------------------------------------------------------
r1799767 | jleroux | 2017-06-24 14:00:25 +0200 (sam. 24 juin 2017) | 20 lignes

Fixed: CreateShipment code logic error
(OFBIZ-9425)

Service createShipment can create both sales and purchase shipment with
workeffort.
For sales shipment it creates SHIPMENT_OUTBOUND type work effort
For purchase shipment it creates SHIPMENT_INBOUND type work effort.

The maps used are shipWorkEffortMap to create outbound work effort and
arrivalWorkEffortMap to create inbound shipment.

Which work effort will be created decided by the condition whether parameters.
estimatedShipDate is coming or parameters.estimatedArrivalDate is coming.

With existing logic the workEffort.workEffortTypeId, workEffort.currentStatusId
and workEffort.workEffortPurposeTypeId is not persist into db as values set
into the wrong map.


Thanks: Wai for report and patch, Rishi Solanki for clear explanation
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 24 12:01:00 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1799768&r1=1799767&r2=1799768&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml Sat Jun 24 12:01:00 2017
@@ -81,10 +81,10 @@ under the License.
                         <if-compare field="shipmentTypeId" operator="equals" value="SALES_RETURN"/>
                     </or>
                 </condition>
-                <then><set field="shipWorkEffortMap.workEffortTypeId" value="SHIPMENT_INBOUND"/></then>
+                <then><set field="arrivalWorkEffortMap.workEffortTypeId" value="SHIPMENT_INBOUND"/></then>
             </if>
-            <set value="CAL_TENTATIVE" field="shipWorkEffortMap.currentStatusId"/>
-            <set value="WEPT_WAREHOUSING" field="shipWorkEffortMap.workEffortPurposeTypeId"/>
+            <set value="CAL_TENTATIVE" field="arrivalWorkEffortMap.currentStatusId"/>
+            <set value="WEPT_WAREHOUSING" field="arrivalWorkEffortMap.workEffortPurposeTypeId"/>
             <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedStartDate"/>
             <set from-field="parameters.estimatedArrivalDate" field="arrivalWorkEffortMap.estimatedCompletionDate"/>
             <set from-field="parameters.destinationFacilityId" field="arrivalWorkEffortMap.facilityId"/>