You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/06/14 13:54:27 UTC
svn commit: r1798687 - in
/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment:
issuance/IssuanceServices.xml receipt/ShipmentReceiptServices.xml
shipment/ShipmentServices.xml
Author: jleroux
Date: Wed Jun 14 13:54:27 2017
New Revision: 1798687
URL: http://svn.apache.org/viewvc?rev=1798687&view=rev
Log:
"Applied BY HAND fix from trunk framework for revision: 1798682 "
------------------------------------------------------------------------
r1798682 | jleroux | 2017-06-14 15:47:25 +0200 (mer. 14 juin 2017) | 6 lignes
Fixed: simple methods not terminating on error condition
(OFBIZ-OFBIZ-9407)
jleroux: adding a <check-errors/> is quite right
Thanks: Wai
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Modified: ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=1798687&r1=1798686&r2=1798687&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Jun 14 13:54:27 2017
@@ -105,6 +105,7 @@ under the License.
<simple-method method-name="issueOrderItemToShipment" short-description="Issue OrderItem to Shipment">
<set value="Issue OrderItem to Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
+ <check-errors/>
<!-- get orderHeader -->
<entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/>
@@ -133,6 +134,7 @@ under the License.
<simple-method method-name="issueOrderItemShipGrpInvResToShipment" short-description="Issue OrderItemShipGrpInvRes to Shipment">
<set value="Issue OrderItemShipGrpInvRes to Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
+ <check-errors/>
<!-- get orderItemShipGrpInvRes -->
<make-value entity-name="OrderItemShipGrpInvRes" value-field="OrderItemShipGrpInvResLookupPk"/>
Modified: ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=1798687&r1=1798686&r2=1798687&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/branches/release14.12/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Wed Jun 14 13:54:27 2017
@@ -363,6 +363,7 @@ under the License.
<simple-method method-name="issueOrderItemToShipmentAndReceiveAgainstPO" short-description="Issues order item quantity specified to the shipment, then receives inventory for that item and quantity">
<set value="Issue OrderItem to Shipment and Receive against PO" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml"/>
+ <check-errors/>
<!-- get orderItem -->
<entity-one entity-name="OrderItem" value-field="orderItem" auto-field-map="true"/>
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=1798687&r1=1798686&r2=1798687&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 Jun 14 13:54:27 2017
@@ -96,6 +96,7 @@ under the License.
<simple-method method-name="updateShipment" short-description="Update Shipment">
<set value="Update Shipment" field="operationName"/>
<call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/>
+ <check-errors/>
<make-value value-field="lookupPKMap" entity-name="Shipment"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>