svn commit: r1533483 - in /ofbiz/branches/release12.04: ./ specialpurpose/ecommerce/data/DemoOrderTestData.xml

Author: jleroux
Date: Fri Oct 18 15:05:52 2013
New Revision: 1533483

URL: http://svn.apache.org/r1533483
Log:
"Applied fix from trunk for revision: 1512376"
------------------------------------------------------------------------
r1512376 | jleroux | 2013-08-09 18:19:16 +0200 (ven. 09 août 2013) | 14 lignes

This should fix https://issues.apache.org/jira/browse/OFBIZ-2574 "Not possible to show the shipment information (packaging slip) in the purchase order approvement screen"

See Purchase Order #DEMO10090 in the Order Managaer application, where the order are to be approved.

Try to click on the link;
Shipments    Nbr 9998  Packing Slip

----------------------------------------------
Then the following error is shown:
----------------------------------------------------------
The Following Errors Occurred:

Problems with the response writer/output stream: org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen [component://product/widget/facility/ShipmentScreens.xml#PackingSlip.fo]: java.lang.IllegalArgumentException: Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL (Operator must be EQUALS or NOT_EQUAL when right/rhs argument is NULL )
-----------------------------------------------------------
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/specialpurpose/ecommerce/data/DemoOrderTestData.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1512376

Modified: ofbiz/branches/release12.04/specialpurpose/ecommerce/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=1533483&r1=1533482&r2=1533483&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/ecommerce/data/DemoOrderTestData.xml Fri Oct 18 15:05:52 2013
@@ -55,7 +55,7 @@ under the License.
     <OrderContactMech orderId="DEMO10090" contactMechPurposeTypeId="ORDER_EMAIL" contactMechId="9026" lastUpdatedStamp="2008-04-23 16:49:32.173" lastUpdatedTxStamp="2008-04-23 16:49:32.164" createdStamp="2008-04-23 16:49:32.173" createdTxStamp="2008-04-23 16:49:32.164"/>
     <OrderContactMech orderId="DEMO10090" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9015" lastUpdatedStamp="2008-04-23 16:49:28.332" lastUpdatedTxStamp="2008-04-23 16:49:27.349" createdStamp="2008-04-23 16:49:28.332" createdTxStamp="2008-04-23 16:49:27.349"/>
 
-    <Shipment shipmentId="9998" shipmentTypeId="SALES_SHIPMENT" statusId="SHIPMENT_INPUT" primaryOrderId="DEMO10090" primaryShipGroupSeqId="00001" estimatedShipCost="12.45" originFacilityId="WebStoreWarehouse" originContactMechId="9200" originTelecomNumberId="9201" destinationContactMechId="9015" destinationTelecomNumberId="9025" partyIdTo="DemoCustomer"/>
+    <Shipment shipmentId="9998" shipmentTypeId="SALES_SHIPMENT" statusId="SHIPMENT_INPUT" primaryOrderId="DEMO10090" primaryShipGroupSeqId="00001" estimatedShipCost="12.45" originFacilityId="WebStoreWarehouse" originContactMechId="9200" originTelecomNumberId="9201" destinationContactMechId="9015" destinationTelecomNumberId="9025" partyIdTo="DemoCustomer" createdDate="2008-06-10 12:59:26.8"/>
 
     <!-- Purchase order test data -->
     <!--for jira issue - 1782-->
@@ -106,7 +106,7 @@ under the License.
     <OrderStatus orderStatusId="9014" statusId="ORDER_COMPLETED" orderId="Demo1001" statusDatetime="2009-08-13 17:47:47.344" statusUserLogin="admin"/>
     <OrderContactMech orderId="Demo1001" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200"/>
     
-    <Shipment shipmentId="9997" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_RECEIVED" primaryOrderId="Demo1001" primaryShipGroupSeqId="00001" estimatedShipCost="0.00" destinationFacilityId="WebStoreWarehouse" destinationContactMechId="9200" destinationTelecomNumberId="9201" partyIdFrom="DemoSupplier"/>
+    <Shipment shipmentId="9997" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_RECEIVED" primaryOrderId="Demo1001" primaryShipGroupSeqId="00001" estimatedShipCost="0.00" destinationFacilityId="WebStoreWarehouse" destinationContactMechId="9200" destinationTelecomNumberId="9201" partyIdFrom="DemoSupplier" createdDate="2008-06-10 12:59:26.8"/>
     <ShipmentItem shipmentId="9997" shipmentItemSeqId="00001" productId="GZ-2644" quantity="2.000000"/>
     <ShipmentRouteSegment shipmentId="9997" shipmentRouteSegmentId="00001" destFacilityId="WebStoreWarehouse" destContactMechId="9200" destTelecomNumberId="9201" carrierPartyId="_NA_" shipmentMethodTypeId="NO_SHIPPING" carrierServiceStatusId="SHRSCS_NOT_STARTED"/>
     <ShipmentPackage shipmentId="9997" shipmentPackageSeqId="00001" dateCreated="2009-08-13 17:46:29.751"/>