Author: apatel
Date: Sat Sep 15 14:10:53 2007
New Revision: 575981
URL: http://svn.apache.org/viewvc?rev=575981&view=rev
Log:
Renamed EditGlJournalEntry form/screen to new.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
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=575981&r1=575980&r2=575981&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
Sat Sep 15 14:10:53 2007
@@ -443,16 +443,16 @@
<request-map uri="createGlJournalEntry">
<security https="true" auth="true"/>
<event type="service" invoke="createGlJournalEntry"/>
- <response name="success" type="view" value="EditGlJournalEntry"/>
- <response name="error" type="view" value="EditGlJournalEntry"/>
+ <response name="success" type="view" value="NewGlJournalEntry"/>
+ <response name="error" type="view" value="NewGlJournalEntry"/>
</request-map>
<request-map uri="FindGlJournalEntry">
<security https="true" auth="true"/>
<response name="success" type="view" value="FindGlJournalEntry"/>
</request-map>
- <request-map uri="EditGlJournalEntry">
+ <request-map uri="NewGlJournalEntry">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EditGlJournalEntry"/>
+ <response name="success" type="view" value="NewGlJournalEntry"/>
</request-map>
<request-map uri="ListUnpostedAcctgTrans">
<security https="true" auth="true"/>
@@ -1455,7 +1455,7 @@
<!-- Party Accounts -->
<view-map name="PartyAccountsSummary" type="screen"
page="component://accounting/widget/AccountingScreens.xml#PartyAccountsSummary"/>
<view-map name="FindGlJournalEntry" type="screen"
page="component://accounting/widget/AccountingScreens.xml#FindGlJournalEntry"/>
- <view-map name="EditGlJournalEntry" type="screen"
page="component://accounting/widget/AccountingScreens.xml#EditGlJournalEntry"/>
+ <view-map name="NewGlJournalEntry" type="screen"
page="component://accounting/widget/AccountingScreens.xml#NewGlJournalEntry"/>
<view-map name="ListUnpostedAcctgTrans" type="screen"
page="component://accounting/widget/AccountingScreens.xml#ListUnpostedAcctgTrans"/>
<!-- GlAccount, GlJournalEntry, AcctgTrans -->
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml?rev=575981&r1=575980&r2=575981&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
(original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
Sat Sep 15 14:10:53 2007
@@ -24,7 +24,7 @@
<form name="ListCompanies" type="list" title="Internal Organizations"
list-name="parties">
<field name="partyId"
title="${uiLabelMap.AccountingCompanies}"><display-entity
entity-name="PartyGroup" description="${groupName}"/></field>
<field name="admin" title="${uiLabelMap.AccountingAdmin}"><hyperlink
target="AdminMain?organizationPartyId=${partyId}"
description="${uiLabelMap.AccountingAdmin}"/></field>
- <field name="accounts"
title="${uiLabelMap.AccountingAccounts}"><hyperlink
target="EditGlJournalEntry?organizationPartyId=${partyId}"
description="${uiLabelMap.AccountingAccounts}"/></field>
+ <field name="accounts"
title="${uiLabelMap.AccountingAccounts}"><hyperlink
target="PartyAccountsSummary?organizationPartyId=${partyId}"
description="${uiLabelMap.AccountingAccounts}"/></field>
</form>
<form name="ListGlAccountOrganization" list-name="listIt" target=""
title="" type="list" paginate-target="ListGlAccountOrganization">
Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=575981&r1=575980&r2=575981&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Sat Sep 15
14:10:53 2007
@@ -134,25 +134,18 @@
</section>
</screen>
- <screen name="EditGlJournalEntry">
+ <screen name="NewGlJournalEntry">
<section>
<actions>
- <set field="titleProperty" value="AcctgEditGlJournalEntry"/>
+ <set field="titleProperty" value="AcctgNewGlJournalEntry"/>
<set field="tabButtonItem" value="FindGlJournalEntry"/>
- <set field="labelTitleProperty"
value="AcctgEditGlJournalEntry"/>
- <!-- entity-condition entity-name="GlAccountOrganization"
list-name="entityList" use-cache="true" >
- <condition-expr field-name="glAccountId"
operator="greater" value="0" />
- </entity-condition -->
- <entity-condition entity-name="GlAccount"
list-name="entityList" use-cache="true" >
- <condition-expr field-name="glAccountId"
operator="greater" value="0" />
- <!--limit-range start="0" size="25" / -->
- </entity-condition>
+ <set field="labelTitleProperty"
value="AcctgNewGlJournalEntry"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-menu name="JournalEntryActionsBar"
location="component://accounting/widget/Menus.xml"/>
- <include-form name="EditGlJournalEntry"
location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="NewGlJournalEntry"
location="component://accounting/widget/JournalEntryForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml?rev=575981&r1=575980&r2=575981&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml Sat Sep 15
14:10:53 2007
@@ -97,7 +97,7 @@
</field>
</form>
- <form name="EditGlJournalEntry" type="single"
target="createGlJournalEntry" title="" default-map-name="journal">
+ <form name="NewGlJournalEntry" type="single" target="createGlJournalEntry"
title="" default-map-name="journal">
<field name="acctgTransTypeId"
title="${uiLabelMap.AccountingTransactionType}">
<drop-down>
<entity-options entity-name="AcctgTransType"
description="${description}">
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=575981&r1=575980&r2=575981&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sat Sep 15 14:10:53
2007
@@ -409,7 +409,7 @@
<link
target="FindGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
</menu-item>
<menu-item name="NewJournalEnty"
title="${uiLabelMap.AcctgNewGlJournalEntry}">
- <link
target="EditGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
+ <link
target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
</menu-item>
</menu>
