svn commit: r504637 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.properties script/org/ofbiz/accounting/payment/PaymentServices.xml servicedef/services_payment.xml

[sichen]

Author: sichen
Date: Wed Feb  7 10:27:50 2007
New Revision: 504637

URL: http://svn.apache.org/viewvc?view=rev&rev=504637
Log:
Allow the createPaymentApplication service to accept overrideGlAccountId as an optional parameter

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
    ofbiz/trunk/applications/accounting/servicedef/services_payment.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?view=diff&rev=504637&r1=504636&r2=504637
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Feb  7 10:27:50 2007
@@ -305,7 +305,7 @@
 AccountingPartyRoleAdd=Add a new Party Role
 AccountingPayment=Payment
 AccountingPaymentAlreadyReceived=Payment already received
-AccountingPaymentApplicationParameterMissing=Payment application requires either an invoiceId, a billingAccountId, or a taxAuthGeoId
+AccountingPaymentApplicationParameterMissing=Payment application requires either an invoiceId, a billingAccountId, a taxAuthGeoId or a glAccountId
 AccountingPaymentDate=Payment Date
 AccountingPaymentGatewayResponseId=Accounting Payment Gateway Response Id
 AccountingPaymentID=PaymentID

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?view=diff&rev=504637&r1=504636&r2=504637
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Wed Feb  7 10:27:50 2007
@@ -113,8 +113,10 @@
         <if-empty field-name="invoiceId" map-name="parameters">
             <if-empty field-name="billingAccountId" map-name="parameters">
                 <if-empty field-name="taxAuthGeoId" map-name="parameters">
-                  <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/></add-error>
-                  <check-errors/>
+                    <if-empty field-name="overrideGlAccountId" map-name="parameters">
+                      <add-error><fail-property resource="AccountingUiLabels" property="AccountingPaymentApplicationParameterMissing"/></add-error>
+                      <check-errors/>
+                    </if-empty>
                 </if-empty>
             </if-empty>
         </if-empty>

Modified: ofbiz/trunk/applications/accounting/servicedef/services_payment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_payment.xml?view=diff&rev=504637&r1=504636&r2=504637
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_payment.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_payment.xml Wed Feb  7 10:27:50 2007
@@ -52,6 +52,7 @@
         <attribute name="invoiceId" type="String" mode="IN" optional="true"/>
         <attribute name="invoiceItemSeqId" type="String" mode="IN" optional="true"/>
         <attribute name="billingAccountId" type="String" mode="IN" optional="true"/>
+        <attribute name="overrideGlAccountId" type="String" mode="IN" optional="true"/>
         <attribute name="taxAuthGeoId" type="String" mode="IN" optional="true"/>
         <attribute name="amountApplied" type="Double" mode="IN" optional="false"/>
         <attribute name="paymentApplicationId" type="String" mode="OUT" optional="false"/>