Author: jleroux
Date: Wed Jun 14 13:48:10 2017
New Revision: 1798683
URL: http://svn.apache.org/viewvc?rev=1798683&view=rev
Log:
"Applied 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/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml
ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/branches/release16.11/applications/product/minilang/shipment/shipment/ShipmentServices.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 14 13:48:10 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
+/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,1798682
/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/issuance/IssuanceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1798683&r1=1798682&r2=1798683&view=diff
==============================================================================
---
ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml
(original)
+++
ofbiz/branches/release16.11/applications/product/minilang/shipment/issuance/IssuanceServices.xml
Wed Jun 14 13:48:10 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/minilang/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/minilang/shipment/shipment/ShipmentServices.xml"/>
+ <check-errors/>
<!-- get orderItemShipGrpInvRes -->
<make-value entity-name="OrderItemShipGrpInvRes"
value-field="OrderItemShipGrpInvResLookupPk"/>
Modified:
ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1798683&r1=1798682&r2=1798683&view=diff
==============================================================================
---
ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
(original)
+++
ofbiz/branches/release16.11/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
Wed Jun 14 13:48:10 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/minilang/shipment/shipment/ShipmentServices.xml"/>
+ <check-errors/>
<!-- get orderItem -->
<entity-one entity-name="OrderItem" value-field="orderItem"
auto-field-map="true"/>
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=1798683&r1=1798682&r2=1798683&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
Wed Jun 14 13:48:10 2017
@@ -114,6 +114,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"/>
