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 2008/10/06 21:16:47 UTC
svn commit: r702232 - in /ofbiz/trunk/applications/product:
script/org/ofbiz/shipment/shipment/ShipmentServices.xml
servicedef/services_shipment.xml
Author: jleroux
Date: Mon Oct 6 12:16:47 2008
New Revision: 702232
URL: http://svn.apache.org/viewvc?rev=702232&view=rev
Log:
A patch from Nicolas Malin "createShipment parameters : add a shipmentId in IN parameters" (https://issues.apache.org/jira/browse/OFBIZ-1978) - OFBIZ-1978
Reported by Charles STELTZLEN
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/product/servicedef/services_shipment.xml
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=702232&r1=702231&r2=702232&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Mon Oct 6 12:16:47 2008
@@ -30,7 +30,12 @@
<make-value value-name="newEntity" entity-name="Shipment"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/>
+ <if-not-empty field="parameters.shipmentId">
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <else>
+ <sequenced-id-to-env sequence-name="Shipment" env-name="newEntity.shipmentId"/>
+ </else>
+ </if-not-empty>
<field-to-result field-name="newEntity.shipmentId" result-name="shipmentId"/>
<!-- set the created and lastModified info -->
Modified: ofbiz/trunk/applications/product/servicedef/services_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_shipment.xml?rev=702232&r1=702231&r2=702232&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_shipment.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_shipment.xml Mon Oct 6 12:16:47 2008
@@ -133,6 +133,7 @@
location="org/ofbiz/shipment/shipment/ShipmentServices.xml" invoke="createShipment" auth="true">
<description>Create Shipment</description>
<auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true">
<exclude field-name="createdDate"/>
<exclude field-name="createdByUserLogin"/>