Author: ashish
Date: Wed Jan 6 11:37:43 2010
New Revision: 896404
URL: http://svn.apache.org/viewvc?rev=896404&view=rev
Log:
Applied patch from jira issue OFBIZ-3387 - Make AR Payment Groups screens
consistent to the best practice.
Thanks Sumit for the contribution.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=896404&r1=896403&r2=896404&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed Jan
6 11:37:43 2010
@@ -242,6 +242,10 @@
<value
xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸£à¸°à¸¢à¸°à¹à¸§à¸¥à¸²</value>
<value xml:lang="zh">æ·»å å®å¶æ¶é´æ®µ</value>
</property>
+ <property key="AccountingAddPaymentGroupMember">
+ <value xml:lang="en">Add Payment Group Member</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹
सदसà¥à¤¯ à¤à¥à¤¡à¤¼à¥à¤</value>
+ </property>
<property key="AccountingAddFinAccountTypeGlAccount">
<value xml:lang="de">Finanzkonten-Art Hauptkonto hinzufügen</value>
<value xml:lang="en">Add FinAccount Type Gl Account</value>
@@ -4548,6 +4552,10 @@
<value xml:lang="en">Group in one Transaction</value>
<value xml:lang="hi_IN">लà¥à¤¨-दà¥à¤¨ à¤à¤ समà¥à¤¹
मà¥à¤</value>
</property>
+ <property key="AccountingGroupMembers">
+ <value xml:lang="en">Group Members</value>
+ <value xml:lang="hi_IN">समà¥à¤¹ सदसà¥à¤¯</value>
+ </property>
<property key="AccountingHideFields">
<value xml:lang="ar">إخÙاء اÙØÙÙÙ</value>
<value xml:lang="de">Felder ausblenden</value>
@@ -7231,9 +7239,9 @@
<value xml:lang="en">Payment Group Id</value>
<value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹
à¤à¥à¤°à¤®à¤¾à¤à¤</value>
</property>
- <property key="AccountingPaymentGroupMember">
- <value xml:lang="en">Group Member</value>
- <value xml:lang="hi_IN">समà¥à¤¹ सदसà¥à¤¯</value>
+ <property key="AccountingPaymentGroupMembers">
+ <value xml:lang="en">Payment Group Members</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹
सदसà¥à¤¯</value>
</property>
<property key="AccountingPaymentGroupName">
<value xml:lang="de">Name der Zahlungsgruppe</value>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=896404&r1=896403&r2=896404&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Wed Jan 6
11:37:43 2010
@@ -481,7 +481,7 @@
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
</link>
</menu-item>
- <menu-item name="EditPaymentGroupMember"
title="${uiLabelMap.AccountingPaymentGroupMember}">
+ <menu-item name="EditPaymentGroupMember"
title="${uiLabelMap.AccountingGroupMembers}">
<condition><not><if-empty
field="paymentGroup.paymentGroupId"/></not></condition>
<link target="EditPaymentGroupMember">
<parameter param-name="paymentGroupId"
from-field="paymentGroup.paymentGroupId"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=896404&r1=896403&r2=896404&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Wed Jan 6
11:37:43 2010
@@ -30,7 +30,7 @@
</form>
<form name="ListPaymentGroup" type="list" separate-columns="true"
default-entity-name="PaymentGroup" list-name="paymentGroupList"
- paginate-target="FindPaymentGroup" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ paginate-target="FindPaymentGroup" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
header-row-style="header-row-2">
<row-actions>
<entity-and entity-name="PaymentGroupMember"
list="paymentGroupMembers" filter-by-date="true">
<field-map field-name="paymentGroupId"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml?rev=896404&r1=896403&r2=896404&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupScreens.xml Wed Jan
6 11:37:43 2010
@@ -68,7 +68,9 @@
<widgets>
<decorator-screen name="CommonPaymentGroupDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <screenlet
title="${uiLabelMap.AccountingPaymentGroup}">
<include-form name="EditPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -88,8 +90,12 @@
<widgets>
<decorator-screen name="CommonPaymentGroupDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
- <include-form name="AddPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ <screenlet name="listPaymentGroupMember"
title="${uiLabelMap.AccountingPaymentGroupMembers}" collapsible="true">
+ <include-form name="ListPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </screenlet>
+ <screenlet name="addPaymentGroupMember"
title="${uiLabelMap.AccountingAddPaymentGroupMember}" collapsible="true">
+ <include-form name="AddPaymentGroupMember"
location="component://accounting/widget/PaymentGroupForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -116,10 +122,10 @@
<decorator-section name="body">
<section>
<widgets>
- <screenlet
title="${uiLabelMap.AccountingPaymentGroupOverview}">
+ <screenlet name="editPaymentGroup"
title="${uiLabelMap.AccountingPaymentGroupOverview}" collapsible="true">
<include-form name="EditPaymentGroup"
location="component://accounting/widget/PaymentGroupForms.xml"/>
</screenlet>
- <screenlet
title="${uiLabelMap.AccountingPayment}
${uiLabelMap.AccountingPaymentGroupMember}">
+ <screenlet name="paymentGroupMembers"
title="${uiLabelMap.AccountingPaymentGroupMembers}" collapsible="true">
<include-form name="PaymentGroupMembers"
location="component://accounting/widget/PaymentGroupForms.xml"/>
</screenlet>
</widgets>
