Author: jleroux
Date: Sat Nov 15 21:17:46 2014
New Revision: 1639920
URL: http://svn.apache.org/r1639920
Log:
"Applied fix from trunk for revision: 1639840"
------------------------------------------------------------------------
r1639840 | ashish | 2014-11-15 07:08:59 +0100 (sam. 15 nov. 2014) | 2 lignes
Applied patch from jira issue - OFBIZ-5150 - reserveProductInventory method
looses priority attribute in oisgir for non serialized and non requireInventory.
Thanks Deepak Agarwal for reporting the issue and Thanks Arun for providing the
patch.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/branches/release12.04/applications/product/servicedef/services_facility.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1639840
Modified:
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=1639920&r1=1639919&r2=1639920&view=diff
==============================================================================
---
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
(original)
+++
ofbiz/branches/release12.04/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
Sat Nov 15 21:17:46 2014
@@ -281,6 +281,7 @@ under the License.
<set from-field="parameters.reservedDatetime"
field="reserveOisgirMap.reservedDatetime"/>
<set from-field="promisedDatetime"
field="reserveOisgirMap.promisedDatetime"/>
<set from-field="parameters.sequenceId"
field="reserveOisgirMap.sequenceId"/>
+ <set from-field="parameters.priority"
field="reserveOisgirMap.priority"/>
<call-service
service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
</else>
@@ -363,6 +364,7 @@ under the License.
<if-not-empty field="inventoryItemReservation.sequenceId">
<set field="reserveOisgirMap.sequenceId"
from-field="inventoryItemReservation.sequenceId"/>
</if-not-empty>
+ <set from-field="parameters.priority"
field="reserveOisgirMap.priority"/>
<call-service service-name="reserveProductInventory"
in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
</if-not-empty>
@@ -385,6 +387,7 @@ under the License.
<set field="reserveOisgirMap.sequenceId"
from-field="parameters.sequenceId"/>
</if-not-empty>
<!-- store OrderItemShipGrpInvRes record -->
+ <set from-field="parameters.priority"
field="reserveOisgirMap.priority"/>
<call-service service-name="reserveOrderItemInventory"
in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
<field-to-result field="inventoryItem.inventoryItemId"
result-name="inventoryItemId"/>
Modified:
ofbiz/branches/release12.04/applications/product/servicedef/services_facility.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/servicedef/services_facility.xml?rev=1639920&r1=1639919&r2=1639920&view=diff
==============================================================================
---
ofbiz/branches/release12.04/applications/product/servicedef/services_facility.xml
(original)
+++
ofbiz/branches/release12.04/applications/product/servicedef/services_facility.xml
Sat Nov 15 21:17:46 2014
@@ -315,6 +315,7 @@ under the License.
<attribute name="serialNumber" type="String" mode="IN"
optional="true"/>
<attribute name="sequenceId" type="Long" mode="IN" optional="true"/>
<attribute name="promisedDatetime" type="Timestamp" mode="IN"
optional="false"/>
+ <attribute name="priority" type="String" mode="IN" optional="true"/>
</service>
<service name="reserveProductInventory" engine="simple"
@@ -333,6 +334,7 @@ under the License.
<attribute name="reserveOrderEnumId" type="String" mode="IN"
optional="false"/>
<attribute name="sequenceId" type="Long" mode="IN" optional="true"/>
<attribute name="lotId" mode="IN" type="String" optional="true" />
+ <attribute name="priority" type="String" mode="IN" optional="true"/>
<attribute name="quantityNotReserved" type="BigDecimal" mode="OUT"
optional="false"/>
</service>
<service name="reserveProductInventoryByFacility" engine="simple"
