Author: apatel
Date: Thu Jul 30 07:16:37 2009
New Revision: 799191
URL: http://svn.apache.org/viewvc?rev=799191&view=rev
Log:
Add Find/List of deposit slips for the bankaccount. Patch from OFBIZ-2770.
Thanks Sumit, Awdesh.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=799191&r1=799190&r2=799191&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Thu Jul
30 07:16:37 2009
@@ -6861,6 +6861,9 @@
<value xml:lang="th">Security Error:
à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸!
à¸à¸²à¸£à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸²à¸£à¸à¸´à¸¡à¸à¹,
à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ACCOUNTING_PRINT_CHECKS à¸à¹à¸à¸</value>
<value
xml:lang="zh">å®å
¨é误ï¼è¦æå°æ¯ç¥¨ï¼ä½ å¿
é¡»å
·æACCOUNTING_PRINT_CHECKSæé</value>
</property>
+ <property key="AccountingPrintDepositSlip">
+ <value xml:lang="en">Print Deposit Slip</value>
+ </property>
<property key="AccountingProblemChangingInvoiceStatusTo">
<value xml:lang="ar">Ù
Ø´Ù٠عÙد تغÙÙر ÙضعÙØ©
اÙÙاتÙرة Ø¥ÙÙ ${newStatus}</value>
<value xml:lang="en">Problem changing invoice status to
${newStatus}</value>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=799191&r1=799190&r2=799191&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Thu Jul 30
07:16:37 2009
@@ -246,12 +246,18 @@
</field>
</form>
<form name="EditDepositSlip" type="single" target="updateDepositSlip"
extends="EditPaymentGroup"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <field name="paymentGroupTypeId"
title="${uiLabelMap.CommonType}"><display-entity entity-name="PaymentGroupType"
description="${description}"/></field>
<field name="finAccountId"><hidden value="${finAccountId}"/></field>
</form>
<form name="AddDepositSlipMember" type="single"
target="addDepositSlipMember" extends="AddPaymentGroupMember"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
<field name="finAccountId"><hidden value="${finAccountId}"/></field>
</form>
<form name="ListDepositSlipMember" type="list"
target="updateDepositSlipMember" extends="ListPaymentGroupMember"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <actions>
+ <entity-and entity-name="PaymentGroupMember"
list="paymentGroupMembers">
+ <field-map field-name="paymentGroupId"/>
+ </entity-and>
+ </actions>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
<hyperlink target="expireDepositSlipMember"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=799191&r1=799190&r2=799191&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Thu Jul 30
07:16:37 2009
@@ -326,7 +326,7 @@
<set field="paymentGroupId"
from-field="parameters.paymentGroupId"/>
<entity-one entity-name="FinAccount" value-field="finAccount"/>
<entity-one entity-name="PaymentGroup"
value-field="paymentGroup"/>
- <entity-and entity-name="PaymentGroupMember"
list="paymentGroupMembers">
+ <entity-and entity-name="PaymentGroupMember"
list="paymentGroupMemberList" filter-by-date="true">
<field-map field-name="paymentGroupId"/>
</entity-and>
</actions>
@@ -334,16 +334,24 @@
<decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
<decorator-section name="body">
<section>
+ <condition>
+ <not><if-empty
field="paymentGroupMemberList"/></not>
+ </condition>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingEditPaymentGroupFor}">
- <include-form name="EditDepositSlip"
location="component://accounting/widget/FinAccountForms.xml"/>
- </screenlet>
- <screenlet
title="${uiLabelMap.AccountingEditPaymentGroupMemberFor}">
- <include-form name="AddDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
- <include-form name="ListDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
- </screenlet>
+ <container style="button-bar">
+ <link target="DepositSlip.pdf"
text="${uiLabelMap.AccountingPrintDepositSlip}" style="buttontext">
+ <parameter
param-name="paymentGroupId"/>
+ </link>
+ </container>
</widgets>
</section>
+ <screenlet
title="${uiLabelMap.AccountingEditPaymentGroupFor}">
+ <include-form name="EditDepositSlip"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingEditPaymentGroupMemberFor}">
+ <include-form name="AddDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="ListDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
