Author: erwan
Date: Sat Jan 2 09:01:28 2010
New Revision: 895149
URL: http://svn.apache.org/viewvc?rev=895149&view=rev
Log:
Changing the year as we are now in 2010. This corrects buildbot errors reported
on the dev mailing list.
Some trailing spaces have been also removed.
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=895149&r1=895148&r2=895149&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
Sat Jan 2 09:01:28 2010
@@ -29,7 +29,7 @@
<!-- Postcondition :
1 ) Two commission will be creating for the parties
DemoCustAgent and DemoRepAll (like 10000 and 10001 invoiceId).
2 ) Its amountTotal will be same as commission cost of
associated products. -->
-
+
<set field="invoiceId" value="8100"/>
<set field="invoiceIds[]" from-field="invoiceId"/>
<set field="partyIds[]" value="DemoRepAll"/>
@@ -60,7 +60,7 @@
<iterate list="invoicesCreated" entry="invoice">
<call-class-method method-name="getInvoiceTotal"
ret-field="amountTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker">
<field field="delegator" type="org.ofbiz.entity.Delegator"/>
- <field field="invoice.commissionInvoiceId" type="String"/>
+ <field field="invoice.commissionInvoiceId" type="String"/>
</call-class-method>
<assert>
<or>
@@ -90,8 +90,8 @@
</entity-one>
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2009-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2010-01-01 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2010-12-31 16:55:01.0" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
@@ -158,8 +158,8 @@
</entity-one>
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2009-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2010-01-01 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2010-12-31 16:55:01.0" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
@@ -173,10 +173,10 @@
<result-to-field result-name="creditTotal"
field="undepositedCreditTotal"/>
<result-to-field result-name="debitCreditDifference"
field="undepositedDebitCreditDifference"/>
</call-service>
-
+
<log level="info" message="BEFORE RUNNING CANCEL CHECK RUN :
ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ;
creditTotal:${payableCreditTotal} ; debitCreditDifference :
${payableDebitCreditDifference}"/>
<log level="info" message="BEFORE RUNNING CANCEL CHECK RUN :
UNDEPOSITED RECEIPTS ;debitTotal :${undepositedDebitTotal} ;
creditTotal:${undepositedCreditTotal} ; debitCreditDifference :
${undepositedDebitCreditDifference}"/>
-
+
<set field="paymentGroupId" value="9000"/>
<set field="cancelCheckRunPaymentsMap.userLogin"
from-field="userLogin"/>
<set field="cancelCheckRunPaymentsMap.paymentGroupId"
from-field="paymentGroupId"/>
@@ -186,7 +186,7 @@
</entity-and>
<first-from-list list="paymentGroupMemberAndTransList"
entry="paymentGroupMemberAndTrans"/>
<if-compare field="paymentGroupMemberAndTrans.finAccountTransStatusId"
operator="not-equals" value="FINACT_TRNS_APPROVED">
-
+
<set field="totalPayableDebitAmount" value="${payableDebitTotal +
82.86}" type="BigDecimal"/>
<set field="totalPayableCreditAmount" value="${payableCreditTotal +
165.72}" type="BigDecimal"/>
<set field="totalPayableDebitCreditDifference"
value="${payableDebitCreditDifference - 82.86}" type="BigDecimal"/>
@@ -196,7 +196,7 @@
<result-to-field result-name="creditTotal"
field="payableCreditTotal"/>
<result-to-field result-name="debitCreditDifference"
field="payableDebitCreditDifference"/>
</call-service>
-
+
<assert>
<if-compare-field field="totalPayableDebitAmount"
operator="equals" to-field="payableDebitTotal" type="BigDecimal"/>
<if-compare-field field="totalPayableCreditAmount"
operator="equals" to-field="payableCreditTotal" type="BigDecimal"/>
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml?rev=895149&r1=895148&r2=895149&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoPaymentTests.xml
Sat Jan 2 09:01:28 2010
@@ -20,7 +20,7 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd";>
-
+
<!-- Test case for Batching Payments process-->
<simple-method method-name="testCreatePaymentGroupAndMember"
short-description="auto test createPaymentGroupAndMember service"
login-required="false">
<set field="paymentIds[]" value="demo10001"/>
@@ -61,13 +61,13 @@
<!--Test case for voiding payments -->
<simple-method method-name="testVoidPayment" short-description="Test case
for voiding payments" login-required="false">
- <!-- Precondition : payment is in sent status and invoice is in ready
for posting status
+ <!-- Precondition : payment is in sent status and invoice is in ready
for posting status
Credit in account 213000 - CUSTOMER CREDIT
Debit in account 210000 - ACCOUNTS PAYABLE -->
<!-- Post condition : payment status changes to void.
removes PaymentApplication if any associated.
- Credit in account 210000- ACCOUNTS PAYABLE
+ Credit in account 210000- ACCOUNTS PAYABLE
Debit in account 213000 - CUSTOMER CREDIT-->
<set field="paymentId" value="8000"/>
@@ -105,7 +105,7 @@
<!--Test case for canceling invoices-->
<simple-method method-name="testCancelInvoice" short-description="Test
case for canceling invoices" login-required="false">
- <!-- Precondition : invoice is in ready status
+ <!-- Precondition : invoice is in ready status
Credit in account 210000 - ACCOUNTS PAYABLE
Debit in account 516100 -->
@@ -123,7 +123,7 @@
<set field="setInvoiceStatusMap.invoiceId" from-field="invoiceId"/>
<set field="setInvoiceStatusMap.statusId" from-field="statusId"/>
<call-service service-name="setInvoiceStatus"
in-map-name="setInvoiceStatusMap"/>
-
+
<entity-one entity-name="Invoice" value-field="invoice"/>
<assert>
<if-compare field="invoice.statusId" operator="equals"
value="INVOICE_CANCELLED"/>
@@ -148,21 +148,21 @@
</iterate>
<check-errors/>
</simple-method>
-
+
<!--Test case for process mass check run-->
<simple-method method-name="testCreatePaymentAndPaymentGroupForInvoices"
short-description="Test case for validate service which is creating payment and
payment group" login-required="false">
- <!-- Precondition : Invoice is in ready status.
+ <!-- Precondition : Invoice is in ready status.
Invoice outstanding amount should be greater than
zero -->
<!-- Following process is tested by test case:
- This will call createPaymentAndPaymentGroupForInvoices service
and return a paymentGroupId;
+ This will call createPaymentAndPaymentGroupForInvoices service
and return a paymentGroupId;
1. Checked for paymentGroupId for not empty
2. Checked for associated paymentGroupMembers for not empty -->
<!-- Post condition : Invoice status should be changed to paid.
Payment should be created with
PaymentApplications.
PaymentGroup and PaymentGroupMembers should be
created. -->
-
+
<entity-one entity-name="UserLogin"
value-field="createPaymentAndPaymentGroupForInvoicesMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -201,7 +201,7 @@
thruDate for PaymentGroupMember should be Null -->
<!-- Following process is tested by test case:
- This will call cancelCheckRunPayments service;
+ This will call cancelCheckRunPayments service;
1. Checked for thruDate for not empty
2. Checked for associated payment status as PMNT_VOID -->
@@ -231,11 +231,11 @@
<if-compare field="paymentGroupMemberAndTrans.statusId"
operator="equals" value="PMNT_VOID"/>
</assert>
<check-errors/>
- </iterate>
+ </iterate>
</if-compare>
<log level="info" message="Test case for cancelCheckRunPayments ran
successfully for paymentGroupId = ${paymentGroupId}"/>
</simple-method>
-
+
<!-- Test case for deposit or withdraw payments -->
<simple-method method-name="testDepositWithdrawPayments"
short-description="test depositWithdrawPayments service" login-required="false">
<set field="paymentIds[]" value="demo10010"/>
@@ -265,7 +265,7 @@
</iterate>
<log level="info" message="fin Account Trans has been created for
passed payments"/>
</simple-method>
-
+
<simple-method method-name="testDepositWithdrawPaymentsInSingleTrans"
short-description="test depositWithdrawPayments service for single transaction"
login-required="false">
<set field="paymentIds[]" value="8004"/>
<set field="finAccountId" value="SC_CHECKING"/>
@@ -306,7 +306,7 @@
<simple-method method-name="testSetFinAccountTransStatus"
short-description="test case for setFinAccountTransStatus service"
login-required="false">
<!-- Precondition : FinAccountTrans should be in CREATED status -->
- <!-- Post condition : FinAccountTrans status changes to CANCELED
+ <!-- Post condition : FinAccountTrans status changes to CANCELED
Clear finAccountTransId field and update
associated Payment record -->
<set field="finAccountTransId" value="9102"/>
<set field="statusId" value="FINACT_TRNS_CANCELED"/>
@@ -316,7 +316,7 @@
<set field="setFinAccountTransStatusMap.finAccountTransId"
from-field="finAccountTransId"/>
<set field="setFinAccountTransStatusMap.statusId"
from-field="statusId"/>
<set field="setFinAccountTransStatusMap.userLogin"
from-field="userLogin"/>
- <call-service service-name="setFinAccountTransStatus"
in-map-name="setFinAccountTransStatusMap"/>
+ <call-service service-name="setFinAccountTransStatus"
in-map-name="setFinAccountTransStatusMap"/>
<entity-one entity-name="FinAccountTrans"
value-field="finAccountTrans"/>
<assert>
<if-compare-field field="finAccountTrans.statusId"
operator="equals" to-field="statusId"/>
@@ -327,7 +327,7 @@
<assert>
<if-empty field="payment.finAccountTransId"/>
</assert>
- <check-errors/>
+ <check-errors/>
</if-not-empty>
</simple-method>
@@ -350,8 +350,8 @@
</entity-one>
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2009-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2010-01-01 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2010-12-31 16:55:01.0" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="120000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="receivableDebitTotal"/>
@@ -422,8 +422,8 @@
</entity-one>
<set field="getAcctgTransEntriesAndTransTotalMap.userLogin"
from-field="userLogin"/>
<set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId"
value="Company"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2009-01-01 16:55:01.0" type="Timestamp"/>
- <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate"
value="2010-01-01 16:55:01.0" type="Timestamp"/>
+ <set
field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate"
value="2010-12-31 16:55:01.0" type="Timestamp"/>
<set field="getAcctgTransEntriesAndTransTotalMap.glAccountId"
value="210000"/>
<call-service service-name="getAcctgTransEntriesAndTransTotal"
in-map-name="getAcctgTransEntriesAndTransTotalMap">
<result-to-field result-name="debitTotal"
field="payableDebitTotal"/>
