Author: apatel
Date: Tue Jul 28 13:59:00 2009
New Revision: 798527
URL: http://svn.apache.org/viewvc?rev=798527&view=rev
Log:
Adding Tab for creating Deposit slip from 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/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.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=798527&r1=798526&r2=798527&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul
28 13:59:00 2009
@@ -1935,6 +1935,9 @@
<value
xml:lang="th">สรà¹à¸²à¸à¸à¸±à¸à¸£à¹à¸à¸£à¸à¸´à¸à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">å建æ°ä¿¡ç¨å¡</value>
</property>
+ <property key="AccountingCreateNewDepositSlip">
+ <value xml:lang="en">Create New Deposit Slip for Financial Account:
${finAccountId}</value>
+ </property>
<property key="AccountingCreateNewEftAccount">
<value xml:lang="ar">استØداث Øساب EFT جدÙد</value>
<value xml:lang="de">Neue Bankverbindung erstellen</value>
@@ -2354,6 +2357,9 @@
<value xml:lang="nl">Kopiëer boekhoudtransactie</value>
<value
xml:lang="th">à¸à¸³à¸¥à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸±à¸à¸à¸µ</value>
</property>
+ <property key="AccountingCreateNewDepositSlip">
+ <value xml:lang="en">Create New Deposit Slip</value>
+ </property>
<property key="AccountingEFTAccount">
<value xml:lang="ar">Øساب EFT</value>
<value xml:lang="de">Bankverbindung</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=798527&r1=798526&r2=798527&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 13:59:00 2009
@@ -2139,6 +2139,16 @@
<response name="success" type="view" value="PaymentsDepositWithdraw"/>
<response name="error" type="view" value="PaymentsDepositWithdraw"/>
</request-map>
+ <request-map uri="NewDepositSlip">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="NewDepositSlip"/>
+ </request-map>
+ <request-map uri="createPaymentBatch">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createPaymentGroupAndMember"/>
+ <response name="success" type="view"
value="EditDepositSlipAndMembers"/>
+ <response name="error" type="view" value="NewDepositSlip"/>
+ </request-map>
<!-- ================ Depreciation Calculation Report requests
================ -->
@@ -2531,7 +2541,7 @@
<view-map name="TransactionTotals" type="screen"
page="component://accounting/widget/ReportFinancialSummaryScreens.xml#TransactionTotals"/>
<view-map name="PaymentsDepositWithdraw" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#PaymentsDepositWithdraw"/>
<view-map name="LookupCustomerName" type="screen"
page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/>
-
+ <view-map name="NewDepositSlip" type="screen"
page="component://accounting/widget/FinAccountScreens.xml#NewDepositSlip"/>
<!-- Assignment Mappings -->
<view-map name="EditPartyFixedAssetAssignments" type="screen"
page="component://accounting/widget/FixedAssetScreens.xml#EditPartyFixedAssetAssignments"/>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=798527&r1=798526&r2=798527&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Jul 28
13:59:00 2009
@@ -294,6 +294,12 @@
<decorator-section name="body">
<section>
<widgets>
+ <container style="button-bar">
+ <link target="NewDepositSlip"
text="${uiLabelMap.AccountingCreateNewDepositSlip}" style="buttontext">
+ <parameter param-name="finAccountId"
from-field="parameters.finAccountId"/>
+ <parameter
param-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ </link>
+ </container>
<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"/>
@@ -341,4 +347,42 @@
</widgets>
</section>
</screen>
+ <screen name="NewDepositSlip">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="AccountingCreateNewDepositSlip"/>
+ <set field="tabButtonItem" value="findDepositSlips"/>
+ <set field="finAccountId"
from-field="parameters.finAccountId"/>
+ <set field="headerItem" value="FindFinAccount"/>
+ <set field="paymentMethodTypeId"
from-field="parameters.paymentMethodTypeId"/>
+ <set field="finAccountId"
from-field="parameters.finAccountId"/>
+ <set field="cardType" from-field="parameters.cardType"/>
+ <set field="fromDate" type="Timestamp"
from-field="parameters.fromDate"/>
+ <set field="thruDate" type="Timestamp"
from-field="parameters.thruDate"/>
+ <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
+ <set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
+ <script
location="component://accounting/webapp/ar/WEB-INF/actions/BatchPayments.groovy"/>
+ </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="FindBatchPaymentsForDepositSlip"
location="component://accounting/widget/ar/forms/ArPaymentForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <platform-specific>
+ <html><html-template
location="component://accounting/webapp/ar/payment/batchPayments.ftl"/></html>
+ </platform-specific>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=798527&r1=798526&r2=798527&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Jul 28 13:59:00
2009
@@ -668,6 +668,7 @@
<menu-item name="findDepositSlips"
title="${uiLabelMap.AccountingDepositSlips}">
<link target="FindDepositSlips">
<parameter param-name="finAccountId"/>
+ <parameter param-name="organizationPartyId"
from-field="finAccount.ownerPartyId"/>
</link>
</menu-item>
</menu>
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=798527&r1=798526&r2=798527&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/ArPaymentForms.xml Tue
Jul 28 13:59:00 2009
@@ -55,4 +55,7 @@
<field name="thruDate"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="FindBatchPaymentsForDepositSlip" target="NewDepositSlip"
extends="FindBatchPayments"
extends-resource="component://accounting/widget/ar/forms/ArPaymentForms.xml">
+ <field name="finAccountId"><display
description="${finAccountId}"/></field>
+ </form>
</forms>
