Author: jleroux
Date: Wed Jun 14 13:47:25 2017 New Revision: 1798682 URL: http://svn.apache.org/viewvc?rev=1798682&view=rev Log: Fixed: simple methods not terminating on error condition (OFBIZ-OFBIZ-9407) jleroux: adding a <check-errors/> is quite right Thanks: Wai Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1798682&r1=1798681&r2=1798682&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Wed Jun 14 13:47:25 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/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1798682&r1=1798681&r2=1798682&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Wed Jun 14 13:47:25 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/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1798682&r1=1798681&r2=1798682&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Wed Jun 14 13:47:25 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"/> |
Free forum by Nabble | Edit this page |