Author: apatel
Date: Mon Jul 27 12:13:53 2009
New Revision: 798113
URL: http://svn.apache.org/viewvc?rev=798113&view=rev
Log:
Misc cleanups in Financial Account and Payment Group screens.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=798113&r1=798112&r2=798113&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Jul
27 12:13:53 2009
@@ -6490,6 +6490,9 @@
<value xml:lang="th">สà¹à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
<value xml:lang="zh">å·²åéçæ¯ä»</value>
</property>
+ <property key="AccountingPaymentStatus">
+ <value xml:lang="en">Payment Status</value>
+ </property>
<property key="AccountingPaymentStatusIsNotReceivedOrSentError">
<value xml:lang="en">Payment status must be received or sent</value>
</property>
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=798113&r1=798112&r2=798113&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
Mon Jul 27 12:13:53 2009
@@ -23,7 +23,7 @@
import org.ofbiz.entity.condition.EntityOperator;
List paymentCond = [];
-if (paymentMethodTypeId && finAccountId) {
+if (paymentMethodTypeId) {
paymentCond.add(EntityCondition.makeCondition("paymentMethodTypeId",
EntityOperator.EQUALS, paymentMethodTypeId));
if (fromDate) {
paymentCond.add(EntityCondition.makeCondition("effectiveDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
@@ -37,11 +37,12 @@
if (organizationPartyId) {
paymentCond.add(EntityCondition.makeCondition("partyIdTo",
EntityOperator.EQUALS, organizationPartyId));
}
-
- finAccountTransList = delegator.findList("FinAccountTrans",
EntityCondition.makeCondition([finAccountId : finAccountId]), null, null, null,
false);
- if (finAccountTransList) {
- finAccountTransIds =
EntityUtil.getFieldListFromEntityList(finAccountTransList, "finAccountTransId",
true);
- paymentCond.add(EntityCondition.makeCondition("finAccountTransId",
EntityOperator.IN, finAccountTransIds));
+ if (finAccountId) {
+ finAccountTransList = delegator.findList("FinAccountTrans",
EntityCondition.makeCondition([finAccountId : finAccountId]), null, null, null,
false);
+ if (finAccountTransList) {
+ finAccountTransIds =
EntityUtil.getFieldListFromEntityList(finAccountTransList, "finAccountTransId",
true);
+ paymentCond.add(EntityCondition.makeCondition("finAccountTransId",
EntityOperator.IN, finAccountTransIds));
+ }
}
payments = delegator.findList("Payment",
EntityCondition.makeCondition(paymentCond, EntityOperator.AND), null, null,
null, false);
paymentListWithCreditCard = [];
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=798113&r1=798112&r2=798113&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Mon Jul 27
12:13:53 2009
@@ -26,6 +26,7 @@
<property-map resource="AccountingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"
global="true"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap"
global="true"/>
<property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="ManufacturingUiLabels"
map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap"
global="true"/>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=798113&r1=798112&r2=798113&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Jul 27 12:13:53
2009
@@ -498,6 +498,7 @@
<and>
<if-compare field="display" operator="equals"
value="true"/>
<if-compare field="paymentGroup.paymentGroupTypeId"
operator="equals" value="BATCH_PAYMENT"/>
+ <not><if-empty field="paymentGroupMembers"/></not>
</and>
</condition>
<link target="DepositSlip.pdf">
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=798113&r1=798112&r2=798113&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Mon Jul 27
12:13:53 2009
@@ -115,8 +115,8 @@
<parameter param-name="paymentId"/>
</hyperlink>
</field>
- <field name="paymentTypeId"><display-entity entity-name="PaymentType"
description="${description}"/></field>
- <field name="statusId"><display-entity
entity-name="StatusItem"/></field>
+ <field name="paymentTypeId"
title="${uiLabelMap.OrderPaymentType}"><display-entity
entity-name="PaymentType" description="${description}"/></field>
+ <field name="statusId"
title="${uiLabelMap.AccountingPaymentStatus}"><display-entity
entity-name="StatusItem"/></field>
<field name="amount"><display also-hidden="false" type="currency"
currency="${currencyUomId}"/></field>
<field name="fromDate"><display/></field>
<field name="thruDate"><display/></field>
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=798113&r1=798112&r2=798113&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Mon
Jul 27 12:13:53 2009
@@ -24,9 +24,10 @@
<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>
+ <drop-down allow-empty="true">
<entity-options entity-name="FinAccount"
description="${finAccountName} [${finAccountId}]" filter-by-date="true">
<entity-constraint name="ownerPartyId"
env-name="organizationPartyId"/>
<entity-constraint name="finAccountTypeId"
value="BANK_ACCOUNT"/>
@@ -34,7 +35,7 @@
</drop-down>
</field>
<field name="paymentMethodTypeId"
title="${uiLabelMap.FormFieldTitle_paymentMethodTypeId}*" required-field="true">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="false"
no-current-selected-key="${defauldPaymentMethodTypeId}">
<entity-options entity-name="PaymentMethodType"
description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
