Author: ashish
Date: Wed Jul 8 16:27:51 2009
New Revision: 792213
URL: http://svn.apache.org/viewvc?rev=792213&view=rev
Log:
Applied patch from jira issue OFBIZ-2699 - Create Payment Batches for Ar
Payment.
Following things are covered in this patch:
– Add new tab with name overview for payment group.
– Added forms on overview screen.
Thanks Awdesh for your contribution on this.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
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/PaymentGroupScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Jul
8 16:27:51 2009
@@ -2282,6 +2282,9 @@
<value xml:lang="ru">ÐÑибка безопаÑноÑÑи: длÑ
запÑÑка deleteFixedAssetMaintOrder Ñ Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ
пÑава ACCOUNTING_DELETE, ACCOUNTING_ADMIN или огÑаниÑеннÑе
ACCOUNTING_ROLE_UPDATE</value>
<value xml:lang="th">Security Error:
à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸! à¹à¸à¸à¸²à¸£ deleteFixedAssetMaintOrder
à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ACCOUNTING_DELETE หรืภACCOUNTING_ADMIN
permission, หรืภlimited ACCOUNTING_ROLE_UPDATE à¸à¹à¸à¸</value>
</property>
+ <property key="AccountingDepositSlip">
+ <value xml:lang="en">Deposit Slip</value>
+ </property>
<property key="AccountingDescr">
<value xml:lang="ar">ÙصÙ</value>
<value xml:lang="de">Beschreibung</value>
@@ -5965,6 +5968,9 @@
<property key="AccountingPaymentGroupMember">
<value xml:lang="en">Group Member</value>
</property>
+ <property key="AccountingPaymentGroupOverview">
+ <value xml:lang="en">Payment Group Overview</value>
+ </property>
<property key="AccountingPaymentHeader">
<value xml:lang="ar">رأسÙØ© اÙتسدÙد</value>
<value xml:lang="en">Payment Header</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=792213&r1=792212&r2=792213&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Wed Jul 8 16:27:51 2009
@@ -425,6 +425,11 @@
<response name="success" type="view" value="EditPaymentGroupMember"/>
<response name="error" type="view" value="EditPaymentGroupMember"/>
</request-map>
+
+ <request-map uri="PaymentGroupOverview">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PaymentGroupOverview"/>
+ </request-map>
<!-- transaction page requests -->
<request-map uri="FindGatewayResponses">
@@ -2182,6 +2187,7 @@
<view-map name="FindPaymentGroup" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#FindPaymentGroup"/>
<view-map name="EditPaymentGroup" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#EditPaymentGroup"/>
<view-map name="EditPaymentGroupMember" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#EditPaymentGroupMember"/>
+ <view-map name="PaymentGroupOverview" type="screen"
page="component://accounting/widget/PaymentGroupScreens.xml#PaymentGroupOverview"/>
<!-- Party Accounts -->
<view-map name="PartyAccountsSummary" type="screen"
page="component://accounting/widget/GlScreens.xml#PartyAccountsSummary"/>
<view-map name="FindAcctgTrans" type="screen"
page="component://accounting/widget/GlScreens.xml#FindAcctgTrans"/>
Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/controller.xml Wed
Jul 8 16:27:51 2009
@@ -48,7 +48,7 @@
<request-map uri="createPaymentBatch">
<security https="true" auth="true"/>
<event type="service" invoke="createPaymentBatch"/>
- <response name="success" type="view" value="EditPaymentGroup"/>
+ <response name="success" type="view" value="PaymentGroupOverview"/>
<response name="error" type="view" value="BatchPayments"/>
</request-map>
<request-map uri="getPaymentRunningTotal">
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Jul 8
16:27:51 2009
@@ -113,10 +113,8 @@
<not><if-empty
field="paymentGroup"/></not>
</condition>
<widgets>
+ <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/Menus.xml"/>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
- <container style="button-bar">
- <link target="EditPaymentGroup"
text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext"/>
- </container>
</widgets>
<fail-widgets>
<container
style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Jul 8 16:27:51
2009
@@ -464,11 +464,10 @@
</menu>
<menu name="PaymentGroupTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="Find" title="${uiLabelMap.CommonFind}">
- <condition>
- <if-compare field="tabButtonItem" operator="not-equals"
value="Find"/>
- </condition>
- <link target="FindPaymentGroup"/>
+ <menu-item name="PaymentGroupOverview"
title="${uiLabelMap.AccountingPaymentTabOverview}">
+ <link target="PaymentGroupOverview">
+ <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
+ </link>
</menu-item>
<menu-item name="EditPaymentGroup" title="${uiLabelMap.CommonGroup}">
<condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
@@ -483,6 +482,28 @@
</link>
</menu-item>
</menu>
+
+ <menu name="PaymentGroupSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2">
+ <menu-item name="createNew"
title="${uiLabelMap.AccountingCreateNewPaymentGroup}">
+ <condition>
+ <not><if-empty field="paymentGroup"/></not>
+ </condition>
+ <link target="EditPaymentGroup"/>
+ </menu-item>
+ <!-- To Do -->
+ <!--<menu-item name="depositSlip"
title="${uiLabelMap.AccountingDepositSlip}">
+ <condition>
+ <and>
+ <if-compare field="display" operator="equals"
value="true"/>
+ <if-compare field="paymentGroup.paymentGroupTypeId"
operator="equals" value="BATCH_PAYMENT"/>
+ </and>
+ </condition>
+ <link target="DepositSlip.pdf">
+ <parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
+ </link>
+ </menu-item>-->
+ </menu>
<menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint"
default-menu-item-name="EditFixedAssetMaint">
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Wed Jul 8
16:27:51 2009
@@ -38,7 +38,7 @@
</service>
</actions>
<field name="paymentGroupId" widget-style="buttontext">
- <hyperlink description="${paymentGroupId}"
target="EditPaymentGroup">
+ <hyperlink description="${paymentGroupId}"
target="PaymentGroupOverview">
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
@@ -57,6 +57,7 @@
<field use-when="paymentGroup!=null" name="paymentGroupId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="paymentGroup==null @and paymentGroupId==null"
name="paymentGroupId"><ignored/></field>
<field use-when="paymentGroup==null @and paymentGroupId!=null"
name="paymentGroupId"><display description="${uiLabelMap.CommonCannotBeFound}:
[${paymentGroupId}]" also-hidden="false"/></field>
+ <field name="paymentGroupId"
use-when="display==true"><display/></field>
<field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}">
<drop-down allow-empty="false">
<entity-options entity-name="PaymentGroupType"
description="${description}">
@@ -64,8 +65,13 @@
</entity-options>
</drop-down>
</field>
+ <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}"
use-when="display==true">
+ <display-entity entity-name="PaymentGroupType"
description="${description}"/>
+ </field>
+ <field name="paymentGroupName"
use-when="display==true"><display/></field>
<field name="submitButton" use-when="paymentMethod==null"
title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
<field name="submitButton" use-when="paymentMethod!=null"
title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+ <field name="submitButton" use-when="display==true"><hidden/></field>
</form>
<!-- Payment Group Member -->
@@ -91,4 +97,10 @@
<field name="paymentId"><text size="30"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit
button-type="button"/></field>
</form>
+ <form name="PaymentGroupMembers" type="list"
list-name="paymentGroupMembers"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
+ <field name="paymentId"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml Wed Jul
8 16:27:51 2009
@@ -92,4 +92,34 @@
</widgets>
</section>
</screen>
+ <screen name="PaymentGroupOverview">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="AccountingPaymentGroupOverview"/>
+ <set field="tabButtonItem" value="PaymentGroupOverview"/>
+ <set field="paymentGroupId"
from-field="parameters.paymentGroupId"/>
+ <set field="display" type="Boolean" value="true"/>
+ <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="CommonPaymentGroupDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet
title="${uiLabelMap.AccountingPaymentGroupOverview}">
+ <include-form name="EditPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </screenlet>
+ <screenlet
title="${uiLabelMap.AccountingPayment}
${uiLabelMap.AccountingPaymentGroupMember}">
+ <include-form name="PaymentGroupMembers"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/ar/ArPaymentScreens.xml Wed Jul
8 16:27:51 2009
@@ -58,6 +58,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleBatchPayments"/>
+ <set field="headerItem" value="payments"/>
<set field="tabButtonItem" value="batchPayments"/>
<set field="paymentMethodTypeId"
from-field="parameters.paymentMethodTypeId"/>
<set field="cardType" from-field="parameters.cardType"/>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=792213&r1=792212&r2=792213&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Wed Jul 8
16:27:51 2009
@@ -141,10 +141,8 @@
<not><if-empty
field="paymentGroup"/></not>
</condition>
<widgets>
+ <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/Menus.xml"/>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
- <container style="button-bar">
- <link target="EditPaymentGroup"
text="${uiLabelMap.AccountingCreateNewPaymentGroup}" style="buttontext"/>
- </container>
</widgets>
<fail-widgets>
<container
style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
