Author: nmalin
Date: Wed Jan 14 23:13:09 2015
New Revision: 1651874
URL: http://svn.apache.org/r1651874
Log:
no functionnal change, clean file with remove space end line and double empty
line
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1651874&r1=1651873&r2=1651874&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Wed Jan 14 23:13:09 2015
@@ -125,9 +125,9 @@ under the License.
</if-compare>
<check-errors/>
- <set field="statusIdSave" from-field="payment.statusId"/> <!-- do
not allow status change here -->
+ <set field="statusIdSave" from-field="payment.statusId"/><!-- do not
allow status change here -->
<set-nonpk-fields map="parameters" value-field="payment"/>
- <set field="payment.statusId" from-field="statusIdSave"/> <!-- do
not allow status change here -->
+ <set field="payment.statusId" from-field="statusIdSave"/><!-- do not
allow status change here -->
<if-empty field="payment.effectiveDate">
<now-timestamp field="payment.effectiveDate"/>
@@ -262,20 +262,19 @@ under the License.
</if-compare-field>
</if-empty>
</if-not-empty>
-
-
+
<if-not-empty field="parameters.billingAccountId">
<if-empty field="paymentAppl.amountApplied">
<set field="paymentAppl.amountApplied"
from-field="notAppliedPayment"/>
</if-empty>
</if-not-empty>
-
+
<if-not-empty field="parameters.taxAuthGeoId">
<if-empty field="paymentAppl.amountApplied">
<set field="paymentAppl.amountApplied"
from-field="notAppliedPayment"/>
</if-empty>
</if-not-empty>
-
+
<sequenced-id sequence-name="PaymentApplication"
field="paymentAppl.paymentApplicationId"/>
<field-to-result field="paymentAppl.amountApplied"
result-name="amountApplied"/>
<field-to-result field="paymentAppl.paymentApplicationId"
result-name="paymentApplicationId"/>
@@ -283,7 +282,6 @@ under the License.
<create-value value-field="paymentAppl"/>
<entity-one value-field="payment" entity-name="Payment"/>
<field-to-result field="payment.paymentTypeId"
result-name="paymentTypeId"/>
-
</simple-method>
<simple-method method-name="setPaymentStatus" short-description="Set The
Payment Status">
@@ -330,7 +328,6 @@ under the License.
</then>
</if>
-
<!-- check if the payment fully applied when set to
confirmed-->
<if-compare field="parameters.statusId" operator="equals"
value="PMNT_CONFIRMED">
<set field="notYetApplied"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/>
@@ -362,7 +359,6 @@ under the License.
<!-- everything ok so now change the status field -->
<set from-field="parameters.statusId"
field="payment.statusId"/>
<store-value value-field="payment"/>
-
</else>
</if-empty>
</if-compare-field>
@@ -536,7 +532,7 @@ under the License.
</iterate>
<field-to-result field="selectedInvoicePaymentInfoList"
result-name="invoicePaymentInfoList"/>
</simple-method>
-
+
<simple-method method-name="voidPayment" short-description="Service to
void a payment">
<check-permission permission="ACCOUNTING" action="_UPDATE">
<alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
@@ -620,7 +616,7 @@ under the License.
<fail-property resource="AccountingUiLabels"
property="AccountingTransactionIsAlreadyReconciled"/>
</add-error>
<check-errors/>
- </if-compare>
+ </if-compare>
<iterate list="paymentGroupMemberAndTransList"
entry="paymentGroupMemberAndTrans">
<set-service-fields service-name="expirePaymentGroupMember"
map="paymentGroupMemberAndTrans" to-map="expirePaymentGroupMemberMap"/>
<call-service service-name="expirePaymentGroupMember"
in-map-name="expirePaymentGroupMemberMap"/>
@@ -635,7 +631,7 @@ under the License.
</iterate>
</if-not-empty>
</simple-method>
-
+
<simple-method method-name="createPaymentAndPaymentGroupForInvoices"
short-description="Creates Payments, PaymentApplications and PaymentGroup for
the same">
<entity-one entity-name="PaymentMethod" value-field="paymentMethod"
auto-field-map="true"/>
<entity-one entity-name="FinAccount" value-field="finAccount"
auto-field-map="false">
@@ -653,7 +649,7 @@ under the License.
</if-compare>
<check-errors/>
<set field="invoices" type="List"/>
- <iterate list="parameters.invoiceIds" entry="invoiceId">
+ <iterate list="parameters.invoiceIds" entry="invoiceId">
<entity-one entity-name="Invoice" value-field="invoice"
auto-field-map="true"/>
<clear-field field="invoices"/>
<set field="invoices"
from-field="partyInvoices.${invoice.partyIdFrom}"/>
@@ -689,7 +685,7 @@ under the License.
<field-to-result field="errorMessage" result-name="errorMessage"/>
</if-empty>
</simple-method>
-
+
<simple-method method-name="createPaymentAndApplicationForParty"
short-description="create Payment and PaymentApplications for multiple invoices
for one party">
<set field="paymentAmount" type="BigDecimal" value="0"/>
<iterate list="parameters.invoices" entry="invoice">
@@ -748,14 +744,14 @@ under the License.
<set field="amount" type="BigDecimal" from-field="paymentAmount"/>
<field-to-result field="amount"/>
</simple-method>
-
+
<simple-method method-name="createFinAccoutnTransFromPayment"
short-description="Creates a record for FinAccountTrans on creation of
payment.">
<set-service-fields service-name="createFinAccountTrans"
map="parameters" to-map="createFinAccountTransMap"/>
<set field="createFinAccountTransMap.finAccountTransTypeId"
value="WITHDRAWAL"/>
<set field="createFinAccountTransMap.partyId"
from-field="parameters.organizationPartyId"/>
<now-timestamp field="createFinAccountTransMap.transactionDate"/>
<now-timestamp field="createFinAccountTransMap.entryDate"/>
- <!-- set field="createFinAccountTransMap.statusId" value="CREATE"/>
--> <!-- TODO: It will uncomment when status Id field will add in
FinAccountTrans Entity. -->
+ <!-- set field="createFinAccountTransMap.statusId"
value="CREATE"/>--><!-- TODO: It will uncomment when status Id field will add
in FinAccountTrans Entity. -->
<set field="createFinAccountTransMap.comments" value="Pay to
${parameters.partyId} for invoice Ids - ${parameters.invoiceIds}"/>
<call-service service-name="createFinAccountTrans"
in-map-name="createFinAccountTransMap">
<result-to-field result-name="finAccountTransId"/>
@@ -784,7 +780,7 @@ under the License.
<call-service service-name="createPaymentGroupMember"
in-map-name="createPaymentGroupMemberMap"/>
</iterate>
</simple-method>
-
+
<simple-method method-name="cancelCheckRunPayments"
short-description="Cancel all payments for payment group">
<entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans"
list="paymentGroupMemberAndTransList">
<field-map field-name="paymentGroupId"
from-field="parameters.paymentGroupId"/>
@@ -810,7 +806,7 @@ under the License.
</else>
</if-compare>
</simple-method>
-
+
<simple-method method-name="getPayments" short-description="Get list of
payment">
<set field="paymentGroupId" from-field="parameters.paymentGroupId"/>
<if-not-empty field="paymentGroupId">
@@ -878,11 +874,11 @@ under the License.
<set-service-fields service-name="createPaymentGroupAndMember"
map="parameters" to-map="createPaymentGroupAndMemberMap"/>
<call-service service-name="createPaymentGroupAndMember"
in-map-name="createPaymentGroupAndMemberMap">
<result-to-result result-name="paymentGroupId"/>
- </call-service>
+ </call-service>
</else>
</if-not-empty>
</simple-method>
-
+
<simple-method method-name="massChangePaymentStatus"
short-description="Service set status of Payments in bulk.">
<iterate list="parameters.paymentIds" entry="paymentId">
<set field="setPaymentStatusMap.paymentId" from-field="paymentId"/>
@@ -893,7 +889,6 @@ under the License.
</simple-method>
<simple-method method-name="createPaymentFromOrder"
short-description="Service auto create Payment from Order when payment does
exist yet and not diabled by accountingconfig">
-
<entity-one value-field="orderHeader" entity-name="OrderHeader"/>
<if-compare operator="equals" value="PURCHASE_ORDER"
field="orderHeader.orderTypeId">
@@ -1015,7 +1010,7 @@ under the License.
<set field="parameters.amount"
from-field="orderHeader.grandTotal" />
</else>
</if>
-
+
<set field="parameters.partyIdFrom"
from-field="orderRoleFrom.partyId"/>
<set field="parameters.partyIdTo" from-field="orderRoleTo.partyId"/>
<set field="parameters.paymentMethodTypeId" value="COMPANY_ACCOUNT"/>
@@ -1036,15 +1031,14 @@ under the License.
<field-to-result field="parameters.paymentId" result-name="paymentId"/>
<log level="info" message="payment ${parameters.paymentId} with the
not-paid status automatically created from order: ${parameters.orderId} (can be
disabled in AccountingConfig.properties)"/>
</simple-method>
-
+
<simple-method method-name="createMatchingPaymentApplication"
short-description="Create a payment application if either the invoice of
payment could be found">
-
<property-to-field resource="AccountingConfig"
property="accounting.payment.application.autocreate" field="autoCreate"
default="Y"/>
<if-compare operator="not-equals" value="Y" field="autoCreate">
<log level="info" message="payment application not automatically
created because config is not set to Y"/>
<return/>
</if-compare>
-
+
<if-not-empty field="parameters.invoiceId">
<entity-one value-field="invoice" entity-name="Invoice"/>
<if-not-empty field="invoice">
@@ -1099,7 +1093,7 @@ under the License.
</if-not-empty>
</if-not-empty>
</if-not-empty>
-
+
<if-not-empty field="parameters.paymentId">
<entity-one value-field="payment" entity-name="Payment"/>
<if-not-empty field="payment">
@@ -1123,21 +1117,21 @@ under the License.
<set field="checkInvoice.invoiceId"
from="invoice.invoiceId"/>
<call-service service-name="isInvoiceInForeignCurrency"
in-map-name="checkInvoice">
<result-to-field result-name="isForeign"/>
- </call-service>
+ </call-service>
<if-compare operator="equals" value="true"
field="isForeign">
<if-compare-field operator="equals"
field="invoiceTotal" to-field="payment.actualCurrencyAmount">
<if-compare-field operator="equals"
field="invoice.currencyUomId" to-field="payment.actualCurrencyUomId">
<set field="invoiceId"
from-field="invoice.invoiceId"/>
<set field="amountApplied"
from-field="payment.actualCurrencyAmount"/>
- </if-compare-field>
- </if-compare-field>
+ </if-compare-field>
+ </if-compare-field>
<else>
<if-compare-field operator="equals"
field="invoiceTotal" to-field="payment.amount">
<if-compare-field operator="equals"
field="invoice.currencyUomId" to-field="payment.currencyUomId">
<set field="invoiceId"
from-field="invoice.invoiceId"/>
<set field="amountApplied"
from-field="payment.amount"/>
- </if-compare-field>
- </if-compare-field>
+ </if-compare-field>
+ </if-compare-field>
</else>
</if-compare>
</iterate>
@@ -1153,16 +1147,15 @@ under the License.
</if-not-empty>
</if-not-empty>
</if-not-empty>
-
-
+
<if-not-empty field="createAppl.paymentId">
<if-not-empty field="createAppl.invoiceId">
- <call-service service-name="createPaymentApplication"
in-map-name="createAppl"/>
+ <call-service service-name="createPaymentApplication"
in-map-name="createAppl"/>
<log level="info" message="payment application automatically
created between invoiceId: ${createAppl.invoiceId} and paymentId:
${createAppl.paymentId} for the amount: ${createAppl.appliedAmount} (can be
disabled in AccountingConfig.properties)"/>
</if-not-empty>
</if-not-empty>
</simple-method>
-
+
<!-- PaymentContent -->
<simple-method method-name="createPaymentContent"
short-description="Create Content For Payment">
<make-value value-field="newEntity" entity-name="PaymentContent"/>
