Author: doogie
Date: Thu Mar 5 02:37:31 2009
New Revision: 750295
URL: http://svn.apache.org/viewvc?rev=750295&view=rev
Log:
This lets auto-accounting-transaction-tests-PaymentSentToSupplier
get a bit further, but it still fails. The patch is from OFBIZ-1784.
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=750295&r1=750294&r2=750295&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 02:37:31 2009
@@ -142,7 +142,7 @@
* Debit; in account 210000 - "ACCOUNTS PAYABLE"; amount: 290$
-->
- <set field="paymentId" value="10000"/>
+ <set field="paymentId" value="9000"/>
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -181,7 +181,7 @@
</if-compare>
</iterate>
<assert>
- <if-compare field="debitTotal" operator="equals"
value="creditTotal"/>
+ <if-compare field="debitTotal" operator="equals"
value="${creditTotal}"/>
</assert>
<check-errors/>
</simple-method>
Modified: ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml?rev=750295&r1=750294&r2=750295&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoOrderTestData.xml Thu Mar 5
02:37:31 2009
@@ -71,9 +71,13 @@
<OrderRole orderId="DEMO10091" partyId="DemoSupplier"
roleTypeId="SUPPLIER_AGENT" lastUpdatedStamp="2008-06-10 13:27:07.431"
lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10
13:27:07.431" createdTxStamp="2008-06-10 13:27:07.022"/>
<OrderItemShipGroup orderId="DEMO10091" shipGroupSeqId="00001"
shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_"
carrierRoleTypeId="CARRIER" contactMechId="9200" maySplit="N" isGift="N"
lastUpdatedStamp="2008-06-10 13:27:07.326" lastUpdatedTxStamp="2008-06-10
13:27:07.022" createdStamp="2008-06-10 13:27:07.326" createdTxStamp="2008-06-10
13:27:07.022"/>
<OrderItemShipGroupAssoc orderId="DEMO10091" orderItemSeqId="00001"
shipGroupSeqId="00001" quantity="5.0" lastUpdatedStamp="2008-06-10
13:27:07.363" lastUpdatedTxStamp="2008-06-10 13:27:07.022"
createdStamp="2008-06-10 13:27:07.363" createdTxStamp="2008-06-10
13:27:07.022"/>
+
+ <!-- for jira issue - 1784 -->
+ <Payment paymentId="9000" paymentTypeId="VENDOR_PAYMENT"
paymentMethodTypeId="EFT_ACCOUNT" partyIdFrom="Company"
partyIdTo="DemoSupplier" statusId="PMNT_NOT_PAID" effectiveDate="2006-04-25
12:56:54.292" amount="190.97" currencyUomId="USD" lastUpdatedStamp="2008-06-10
12:59:10.96" lastUpdatedTxStamp="2008-06-10 12:59:10.661"
createdStamp="2008-06-10 12:59:10.96" createdTxStamp="2008-06-10 12:59:10.661"/>
+
<OrderStatus orderStatusId="9007" statusId="ORDER_CREATED"
orderId="DEMO10091" statusDatetime="2008-06-10 13:27:07.024"
statusUserLogin="admin" lastUpdatedStamp="2008-06-10 13:27:07.221"
lastUpdatedTxStamp="2008-06-10 13:27:07.022" createdStamp="2008-06-10
13:27:07.221" createdTxStamp="2008-06-10 13:27:07.022"/>
<OrderStatus orderStatusId="9008" statusId="ITEM_CREATED"
orderId="DEMO10091" orderItemSeqId="00001" statusDatetime="2008-06-10
13:27:07.024" statusUserLogin="admin" lastUpdatedStamp="2008-06-10
13:27:07.279" lastUpdatedTxStamp="2008-06-10 13:27:07.022"
createdStamp="2008-06-10 13:27:07.279" createdTxStamp="2008-06-10
13:27:07.022"/>
<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"/>
-</entity-engine-xml>
\ No newline at end of file
+</entity-engine-xml>
