You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2007/09/12 03:18:38 UTC
svn commit: r574743 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/WEB-INF/controller.xml
webapp/accounting/admin/AdminForms.xml widget/AccountingScreens.xml
widget/AdminScreens.xml widget/CommonScreens.xml widget/Menus.xml
Author: apatel
Date: Tue Sep 11 18:18:37 2007
New Revision: 574743
URL: http://svn.apache.org/viewvc?rev=574743&view=rev
Log:
Companies --> Accounts now navigates to set of screens for managing GL activities.
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/AdminScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.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=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Sep 11 18:18:37 2007
@@ -430,19 +430,33 @@
<response name="error" type="view" value="CaptureTransaction"/>
</request-map>
- <!-- GlAccount requests -->
+ <!-- Party Accounts requests -->
+ <request-map uri="PartyAccountsSummary">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="PartyAccountsSummary"/>
+ </request-map>
<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"/>
</request-map>
-
<request-map uri="EditGlJournalEntry">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditGlJournalEntry"/>
</request-map>
+ <request-map uri="ListUnpostedAcctgTrans">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
+ </request-map>
+ <request-map uri="postAcctgTrans">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="postAcctgTrans"/>
+ <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
+ <response name="error" type="view" value="ListUnpostedAcctgTrans"/>
+ </request-map>
+ <!-- GlAccount requests -->
<request-map uri="AssignGlAccount">
<security https="true" auth="true"/>
<response name="success" type="view" value="AssignGlAccount"/>
@@ -1105,16 +1119,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="PartyAcctgPreference"/>
</request-map>
- <request-map uri="ListUnpostedAcctgTrans">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
- </request-map>
- <request-map uri="postAcctgTrans">
- <security https="true" auth="true"/>
- <event type="service" invoke="postAcctgTrans"/>
- <response name="success" type="view" value="ListUnpostedAcctgTrans"/>
- <response name="error" type="view" value="ListUnpostedAcctgTrans"/>
- </request-map>
<request-map uri="createPartyAcctgPreference">
<security https="true" auth="true"/>
<event type="service" invoke="createPartyAcctgPreference"/>
@@ -1438,9 +1442,13 @@
<view-map name="editPaymentApplications" type="screen" page="component://accounting/widget/PaymentScreens.xml#EditPaymentApplications"/>
<view-map name="ManualTransaction" type="screen" page="component://accounting/widget/PaymentScreens.xml#ManualTransaction"/>
<view-map name="PrintChecks" type="screenfop" page="component://accounting/widget/PaymentScreens.xml#PrintChecks" content-type="application/pdf" encoding="none"/>
-
- <!-- GlAccount, GlJournalEntry, AcctgTrans -->
+
+ <!-- Party Accounts -->
+ <view-map name="PartyAccountsSummary" type="screen" page="component://accounting/widget/AccountingScreens.xml#PartyAccountsSummary"/>
<view-map name="EditGlJournalEntry" type="screen" page="component://accounting/widget/AccountingScreens.xml#EditGlJournalEntry"/>
+ <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListUnpostedAcctgTrans"/>
+
+ <!-- GlAccount, GlJournalEntry, AcctgTrans -->
<view-map name="AddGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#AddGlAccount"/>
<view-map name="FindGlobalGlAccount" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccounts"/>
<view-map name="ListGlobalGlAccounts" type="screen" page="component://accounting/widget/AccountingScreens.xml#ListGlAccounts"/>
@@ -1524,7 +1532,6 @@
<view-map name="TimePeriods" type="screen" page="component://accounting/widget/AdminScreens.xml#TimePeriods"/>
<view-map name="PartyAcctgPreference" type="screen" page="component://accounting/widget/AdminScreens.xml#PartyAcctgPreference"/>
<view-map name="ViewFXConversions" type="screen" page="component://accounting/widget/AdminScreens.xml#ViewFXConversions"/>
- <view-map name="ListUnpostedAcctgTrans" type="screen" page="component://accounting/widget/AdminScreens.xml#ListUnpostedAcctgTrans"/>
<view-map name="GlAccountPurInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountPurInvoice"/>
<view-map name="GlAccountSalInvoice" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountSalInvoice"/>
<view-map name="GlAccountTypePaymentType" type="screen" page="component://accounting/widget/AdminScreens.xml#GlAccountTypePaymentType"/>
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=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml Tue Sep 11 18:18:37 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="ListGlAccountOrganization?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field>
+ <field name="accounts" title="${uiLabelMap.AccountingAccounts}"><hyperlink target="EditGlJournalEntry?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field>
</form>
<form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference" default-service-name="createPartyAcctgPreference" default-map-name="partyAcctgPreference">
Modified: ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml?rev=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingScreens.xml Tue Sep 11 18:18:37 2007
@@ -95,6 +95,26 @@
</section>
</screen>
+ <screen name="PartyAccountsSummary">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PartyAccountsSummary"/>
+ <set field="tabButtonItem" value="PartyAccountsSummary"/>
+ <set field="labelTitleProperty" value="PartyAccountsSummary"/>
+ <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
+ <condition-expr field-name="glAccountId" operator="greater" value="0" />
+ </entity-condition -->
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <label style="head1">${uiLabelMap.PartyAccountsSummary}</label>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditGlJournalEntry">
<section>
<actions>
@@ -110,7 +130,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="GenericDecorator">
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<include-form name="EditGlJournalEntry" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
</decorator-section>
@@ -118,6 +138,30 @@
</widgets>
</section>
</screen>
+
+ <screen name="ListUnpostedAcctgTrans">
+ <section>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="tabButtonItem" value="ListUnpostedAcctgTrans"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
+ <set field="partyId" from-field="parameters.organizationPartyId"/>
+ <entity-condition entity-name="AcctgTrans" list-name="transactions">
+ <condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
+ <order-by field-name="transactionDate"/>
+ </entity-condition>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-form name="ListUnpostedAcctgTrans" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="ListGlAccountOrganization">
<section>
<actions>
Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?rev=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Tue Sep 11 18:18:37 2007
@@ -100,29 +100,6 @@
</widgets>
</section>
</screen>
- <screen name="ListUnpostedAcctgTrans">
- <section>
- <actions>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="tabButtonItem" value="ListUnpostedAcctgTrans"/>
- <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
- <set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
- <set field="partyId" from-field="parameters.organizationPartyId"/>
- <entity-condition entity-name="AcctgTrans" list-name="transactions">
- <condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
- <order-by field-name="transactionDate"/>
- </entity-condition>
- </actions>
- <widgets>
- <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <include-form name="ListUnpostedAcctgTrans" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<!-- Screen to view and manage foreign exchange conversions -->
<screen name="ViewFXConversions">
<section>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Sep 11 18:18:37 2007
@@ -237,6 +237,27 @@
</section>
</screen>
+ <screen name="CommonPartyAccountsDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="companies"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <include-menu name="PartyAccountsTabBar" location="component://accounting/widget/Menus.xml"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="CommonFinAccountDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=574743&r1=574742&r2=574743&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Sep 11 18:18:37 2007
@@ -395,5 +395,18 @@
<link target="EditFinAccountAuths?finAccountId=${finAccountId}"/>
</menu-item>
</menu>
+ <menu name="PartyAccountsTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
+ menu-container-style="button-bar button-style-1" type="simple">
+ <menu-item name="PartyAccountsSummary" title="${uiLabelMap.CommonSummary}">
+ <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ <menu-item name="EditGlJournalEntry" title="${uiLabelMap.AcctgEditGlJournalEntry}">
+ <link target="EditGlJournalEntry"/>
+ </menu-item>
+ <menu-item name="ListUnpostedAcctgTrans" title="${uiLabelMap.AccountingManualPostTrans}">
+ <link target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
+ </menu-item>
+ </menu>
+
</menus>