svn commit: r750321 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml ecommerce/data/DemoOrderTestData.xml

[doogie-3]

Author: doogie
Date: Thu Mar  5 05:48:22 2009
New Revision: 750321

URL: http://svn.apache.org/viewvc?rev=750321&view=rev
Log:
Apply seed data, and make
accounting:auto-accounting-transaction-tests-SalesOrderShipments
work.  Based on OFBIZ-1785.

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
    ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=750321&r1=750320&r2=750321&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml Thu Mar  5 05:48:22 2009
@@ -201,12 +201,12 @@
               * Debit; in account:500000 - Account Type:"COGS_ACCOUNT"
         -->
 
-        <set field="shipmentId" value="10000"/>
-        <set field="orderId" value="WSCO10000"/>
+        <set field="shipmentId" value="9998"/>
+        <set field="orderId" value="DEMO10090"/>
         <set field="shipGroupSeqId" value="00001"/>
         <set field="orderItemSeqId" value="00001"/>
         <set field="inventoryItemId" value="9001"/>
-        <set field="quantity" value="2" type="BigDecimal"/>
+        <set field="quantity" value="1" type="BigDecimal"/>
         <set field="productId" value="GZ-2644"/>
 
         <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
@@ -225,7 +225,7 @@
             <condition-expr field-name="productId" operator="equals" from-field="productId"/>
         </entity-condition>
         
-        <assert><not><if-empty field="acctgTransEntries"/></not></assert>
+        <assert><not><if-empty field="acctgTransEntryList"/></not></assert>
         <iterate list="acctgTransEntryList" entry="acctgTransEntry">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                 <assert>

Modified: ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml?rev=750321&r1=750320&r2=750321&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml Thu Mar  5 05:48:22 2009
@@ -80,4 +80,5 @@
     <OrderContactMech orderId="DEMO10091" contactMechPurposeTypeId="SHIPPING_LOCATION" contactMechId="9200" lastUpdatedStamp="2008-06-10 13:27:07.294" lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10 13:27:07.294" createdTxStamp="2008-06-10 13:27:07.022"/>
     
     <Shipment shipmentId="9999" shipmentTypeId="PURCHASE_SHIPMENT" statusId="PURCH_SHIP_CREATED" primaryOrderId="DEMO10091" primaryShipGroupSeqId="00001" lastUpdatedStamp="2008-06-10 12:59:26.852" lastUpdatedTxStamp="2008-06-10 12:59:26.8" createdStamp="2008-06-10 12:59:26.852" createdTxStamp="2008-06-10 12:59:26.8"/>
+    <Shipment shipmentId="9998" shipmentTypeId="SALES_SHIPMENT" statusId="SHIPMENT_INPUT" primaryOrderId="DEMO10091" primaryShipGroupSeqId="00001" estimatedShipCost="12.45" originFacilityId="WebStoreWarehouse" originContactMechId="9200" originTelecomNumberId="9201" destinationContactMechId="9015" destinationTelecomNumberId="9025" partyIdTo="DemoCustomer"/>
 </entity-engine-xml>