svn commit: r798385 - in /ofbiz/trunk/applications/accounting: webapp/ar/WEB-INF/actions/BatchPayments.groovy widget/ar/forms/ArPaymentForms.xml

[apatel-2]

Author: apatel
Date: Tue Jul 28 03:34:27 2009
New Revision: 798385

URL: http://svn.apache.org/viewvc?rev=798385&view=rev
Log:
Search Payments for bacthing now does not require paymentMethodType be selected. This will let user mix Cash and Check while creating bank deposit slip.

Modified:
    ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy
    ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy?rev=798385&r1=798384&r2=798385&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy Tue Jul 28 03:34:27 2009
@@ -23,8 +23,9 @@
 import org.ofbiz.entity.condition.EntityOperator;
 
 List paymentCond = [];
-if (paymentMethodTypeId) {
+    if (paymentMethodTypeId) {
     paymentCond.add(EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.EQUALS, paymentMethodTypeId));
+    }
     if (fromDate) {
         paymentCond.add(EntityCondition.makeCondition("effectiveDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
     }
@@ -68,4 +69,3 @@
             context.paymentList = paymentListWithoutCreditCard;
         }
     }
-}

Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml?rev=798385&r1=798384&r2=798385&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Tue Jul 28 03:34:27 2009
@@ -24,7 +24,6 @@
     <form name="FindBatchPayments" type="single" target="batchPayments">
         <actions>
             <set field="organizationPartyId" from-field="organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
-            <set field="defauldPaymentMethodTypeId" value="PERSONAL_CHECK"/>
         </actions>
         <field name="finAccountId">
             <drop-down allow-empty="true">
@@ -34,8 +33,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="paymentMethodTypeId" title="${uiLabelMap.FormFieldTitle_paymentMethodTypeId}*" required-field="true">
-            <drop-down allow-empty="false" no-current-selected-key="${defauldPaymentMethodTypeId}">
+        <field name="paymentMethodTypeId" title="${uiLabelMap.FormFieldTitle_paymentMethodTypeId}">
+            <drop-down allow-empty="true">
                 <entity-options entity-name="PaymentMethodType" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>