Author: apatel
Date: Tue Jul 28 03:15:17 2009
New Revision: 798379
URL: http://svn.apache.org/viewvc?rev=798379&view=rev
Log:
Adding Tab for deposit slips for a bank account (financial account).
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul
28 03:15:17 2009
@@ -2311,6 +2311,9 @@
<property key="AccountingDepositSlip">
<value xml:lang="en">Deposit Slip</value>
</property>
+ <property key="AccountingDepositSlips">
+ <value xml:lang="en">Deposit Slips</value>
+ </property>
<property key="AccountingDepositWithdraw">
<value xml:lang="en">Deposit/Withdraw</value>
</property>
@@ -2808,6 +2811,9 @@
<property key="AccountingFindApInvoices">
<value xml:lang="en">Find AP Invoices</value>
</property>
+ <property key="AccountingFindDepositSlip">
+ <value xml:lang="en">Find Deposit Slips for finAccount
${finAccountId}</value>
+ </property>
<property key="AccountingFindFixedAssets">
<value xml:lang="de">Suche Anlagen</value>
<value xml:lang="en">Find Fixed Assets</value>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Tue Jul 28 03:15:17 2009
@@ -1829,6 +1829,44 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="FinAccountMain"/>
</request-map>
+ <request-map uri="FindDepositSlips">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindDepositSlips"/>
+ </request-map>
+ <request-map uri="updateDepositSlip">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePaymentGroup"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ <response name="error" type="view" value="EditDepositSlipAndMembers"/>
+ </request-map>
+ <request-map uri="addDepositSlipMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPaymentGroupMember"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ <response name="error" type="view" value="EditDepositSlipAndMembers"/>
+ </request-map>
+ <request-map uri="updateDepositSlipMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePaymentGroupMember"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ <response name="error" type="view" value="EditDepositSlipAndMembers"/>
+ </request-map>
+ <request-map uri="deleteDepositSlipMember">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePaymentGroupMember"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ <response name="error" type="view" value="EditDepositSlipAndMembers"/>
+ </request-map>
+ <request-map uri="EditDepositSlipAndMembers">
+ <security https="true" auth="true"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ </request-map>
+ <request-map uri="deleteDepositSlip">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="cancelPaymentBatch"/>
+ <response name="success" type="view" value="FindDepositSlips"/>
+ <response name="error" type="view" value="FindDepositSlips"/>
+ </request-map>
<!-- Fin Account Roles -->
<request-map uri="EditFinAccountRoles">
<security https="true" auth="true"/>
@@ -2292,6 +2330,8 @@
<!-- FinAccount -->
<view-map name="FindFinAccount" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#FindFinAccount"/>
<view-map name="FinAccountMain" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#FinAccountMain"/>
+ <view-map name="FindDepositSlips" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#FindDepositSlips"/>
+ <view-map name="EditDepositSlipAndMembers" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#EditDepositSlipAndMembers"/>
<!-- TO BE REMOVED
<view-map name="ListFinAccount" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#ListFinAccount"/>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Jul 28
03:15:17 2009
@@ -239,4 +239,39 @@
<field name="finAccountId"><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">
+ <field name="finAccountId"><hidden/></field>
+ <field name="paymentGroupTypeId"><hidden
value="BATCH_PAYMENT"/></field>
+ </form>
+ <form name="ListDepositSlips" type="list" target="FindDepositSlips"
extends="ListPaymentGroup"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <field name="paymentGroupId" widget-style="buttontext">
+ <hyperlink description="${paymentGroupId}"
target="EditDepositSlipAndMembers">
+ <parameter param-name="paymentGroupId"/>
+ <parameter param-name="finAccountId"/>
+ </hyperlink>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}">
+ <hyperlink target="deleteDepositSlip"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ <parameter param-name="finAccountId"/>
+ </hyperlink>
+ </field>
+ </form>
+ <form name="EditDepositSlip" type="single" target="updateDepositSlip"
extends="EditPaymentGroup"
extends-resource="component://accounting/widget/PaymentGroupForms.xml">
+ <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">
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
+ <hyperlink target="deleteDepositSlipMember"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ <parameter param-name="paymentId"/>
+ <parameter param-name="fromDate"/>
+ <parameter param-name="finAccountId"/>
+ </hyperlink>
+ </field>
+ <field name="finAccountId"><hidden value="${finAccountId}"/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Jul 28
03:15:17 2009
@@ -271,4 +271,63 @@
</widgets>
</section>
</screen>
+ <screen name="FindDepositSlips">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindDepositSlip"/>
+ <set field="tabButtonItem" value="findDepositSlips"/>
+ <set field="finAccountId"
from-field="parameters.finAccountId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindDepositSlips"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListDepositSlips"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditDepositSlipAndMembers">
+ <section>
+ <actions>
+ <set field="titleProperty" value="AccountingFindDepositSlip"/>
+ <set field="tabButtonItem" value="findDepositSlips"/>
+ <set field="finAccountId"
from-field="parameters.finAccountId"/>
+ <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">
+ <field-map field-name="paymentGroupId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator"
location="${parameters.finAccountDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet
title="${uiLabelMap.AccountingEditPaymentGroup} ${uiLabelMap.CommonFor}
${finAccount.finAccountName} [${finAccountId}]">
+ <include-form name="EditDepositSlip"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingEditPaymentGroupMember} ${uiLabelMap.CommonFor}
${finAccount.finAccountName} [${finAccountId}]">
+ <include-form name="AddDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="ListDepositSlipMember"
location="component://accounting/widget/FinAccountForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Jul 28 03:15:17
2009
@@ -664,6 +664,11 @@
<parameter param-name="organizationPartyId"
from-field="finAccount.ownerPartyId"/>
</link>
</menu-item>
+ <menu-item name="findDepositSlips"
title="${uiLabelMap.AccountingDepositSlips}">
+ <link target="FindDepositSlips">
+ <parameter param-name="finAccountId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="PartyTopTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=798379&r1=798378&r2=798379&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Tue Jul 28
03:15:17 2009
@@ -44,8 +44,18 @@
</field>
<field name="paymentGroupTypeId"><display-entity
entity-name="PaymentGroupType" description="${description}"/></field>
<field name="paymentGroupName"><display/></field>
- <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
- <hyperlink target="deletePaymentGroup"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}">
+ <hyperlink target="cancelPaymentGroup"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ </hyperlink>
+ </field>
+ <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext" use-when="${paymentGroupTypeId == 'CHECK_RUN'}">
+ <hyperlink target="cancelCheckRunPayments"
description="${uiLabelMap.CommonCancel}" also-hidden="false">
+ <parameter param-name="paymentGroupId"/>
+ </hyperlink>
+ </field>
+ <field name="depositSlip" title="${uiLabelMap.CommonEmptyHeader}"
widget-style="buttontext">
+ <hyperlink target="DepositSlip.pdf"
description="${uiLabelMap.AccountingInvoicePDF}" also-hidden="false">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
