Author: apatel
Date: Thu Jul 30 06:33:39 2009
New Revision: 799181
URL: http://svn.apache.org/viewvc?rev=799181&view=rev
Log:
Adding noConditionFind flag to search screen.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy?rev=799181&r1=799180&r2=799181&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/DepositWithdrawPayments.groovy
Thu Jul 30 06:33:39 2009
@@ -20,7 +20,7 @@
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
-
+if ("Y".equals(parameters.noConditionFind)) {
List exprListForParameters = [];
partyCond =
EntityCondition.makeCondition([EntityCondition.makeCondition("partyIdTo",
EntityOperator.EQUALS, organizationPartyId),
@@ -60,4 +60,5 @@
context.paymentList = paymentListWithCreditCard;
} else {
context.paymentList = paymentListWithoutCreditCard;
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file
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=799181&r1=799180&r2=799181&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
Thu Jul 30 06:33:39 2009
@@ -21,7 +21,7 @@
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
-
+if ("Y".equals(parameters.noConditionFind)) {
List paymentCond = [];
if (paymentMethodTypeId) {
paymentCond.add(EntityCondition.makeCondition("paymentMethodTypeId",
EntityOperator.EQUALS, paymentMethodTypeId));
@@ -70,3 +70,4 @@
context.paymentList = paymentListWithoutCreditCard;
}
}
+}
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=799181&r1=799180&r2=799181&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Thu Jul 30
06:33:39 2009
@@ -224,6 +224,7 @@
</form>
<form name="PaymentsDepositWithdraw" type="single"
target="FindPaymentsForDepositOrWithdraw" extends="FindBatchPayments"
extends-resource="component://accounting/widget/ar/forms/ArPaymentForms.xml">
<field name="finAccountId"><hidden/></field>
+ <field name="noConditionFind"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="FindDepositSlips" type="single" target="FindDepositSlips"
extends="FindPaymentGroup"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
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=799181&r1=799180&r2=799181&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Thu
Jul 30 06:33:39 2009
@@ -24,6 +24,7 @@
<form name="FindBatchPayments" type="single" target="batchPayments">
<actions>
<set field="organizationPartyId" from-field="organizationPartyId"
default-value="${defaultOrganizationPartyId}"/>
+ <set field="noConditionFind" value="Y"/>
</actions>
<field name="finAccountId">
<drop-down allow-empty="true">
@@ -40,6 +41,7 @@
</drop-down>
</field>
<field name="organizationPartyId"><hidden/></field>
+ <field name="noConditionFind"><hidden/></field>
<field name="cardType" tooltip="Select Credit Card from above list of
Payment Method Types.">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration"
description="${enumCode}" key-field-name="enumCode">
