You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/11/25 18:56:27 UTC
svn commit: r598021 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/WEB-INF/actions/chartofaccounts/
webapp/accounting/chartofaccounts/ widget/
Author: jacopoc
Date: Sun Nov 25 09:56:25 2007
New Revision: 598021
URL: http://svn.apache.org/viewvc?rev=598021&view=rev
Log:
Renamed other screens/forms files to better describe their contents..
Added:
ofbiz/trunk/applications/accounting/widget/GlForms.xml
- copied unchanged from r598010, ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (with props)
Removed:
ofbiz/trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
ofbiz/trunk/applications/accounting/widget/JournalEntryForms.xml
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh?rev=598021&r1=598020&r2=598021&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh Sun Nov 25 09:56:25 2007
@@ -33,7 +33,7 @@
glAccountId = request.getParameter("glAccountId");
glAccount = delegator.findByPrimaryKey("GlAccount", UtilMisc.toMap("glAccountId", glAccountId));
-HtmlFormWrapper editGlAccountWrapper = new HtmlFormWrapper("component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml", "EditGlAccount", request, response);
+HtmlFormWrapper editGlAccountWrapper = new HtmlFormWrapper("component://accounting/widget/GlobalGlAccountsForms.xml", "EditGlAccount", request, response);
editGlAccountWrapper.putInContext("glAccount", glAccount);
editGlAccountWrapper.putInContext("glAccountId", glAccountId);
editGlAccountWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=598021&r1=598020&r2=598021&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sun Nov 25 09:56:25 2007
@@ -84,13 +84,13 @@
<link text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext" target="NewGlJournalEntry?organizationPartyId=${organizationPartyId}"/>
<link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
</container>
- <include-form name="FindAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="FindAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
<section>
<condition>
<if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="ListAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="ListAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
</widgets>
</section>
</decorator-section>
@@ -109,13 +109,13 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="FindAcctgTransEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="FindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
<section>
<condition>
<if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
- <include-form name="ListFindAcctgTransEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="ListFindAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
</widgets>
</section>
</decorator-section>
@@ -135,7 +135,7 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="NewGlJournalEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="NewGlJournalEntry" location="component://accounting/widget/GlForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -172,8 +172,8 @@
</condition>
<widgets>
<container>
- <include-form name="EditAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
- <include-form name="ListAcctgTransEntries" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="EditAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
+ <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/>
</container>
</widgets>
</section>
@@ -186,7 +186,7 @@
<link target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AcctgNewGlJournalEntry}" style="buttontext"/>
</container>
<container>
- <include-form name="EditAcctgTransEntry" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/>
</container>
</widgets>
</section>
@@ -212,7 +212,7 @@
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/JournalEntryForms.xml"/>
+ <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Added: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=598021&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Nov 25 09:56:25 2007
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization">
+ <actions>
+ <set field="entityName" value="GlAccountOrganization"/>
+ <set field="noConditionFind" value="Y"/>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" env-name="entityName"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
+ <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
+ </field>
+ </form>
+
+ <!-- Displays the form for assigning accounts to a party or company -->
+ <!-- TODO: Localize field names -->
+ <form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account">
+
+ <!-- field name="glAccountId" title="Edit" widget-style="buttontext" -->
+
+ <field name="glAccountId">
+ <drop-down>
+ <entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}">
+ <entity-order-by field-name="glAccountId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <!-- field name="organizationPartyId" title="Party" -->
+ <field name="partyId" parameter-name="organizationPartyId">
+ <drop-down>
+ <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" >
+ <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
+ <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
+ <entity-order-by field-name="partyId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListGlAccount" list-name="listIt" target="" title="" type="list" default-entity-name="GlAccount">
+ <actions>
+ <set field="entityName" value="GlAccount"/>
+ <set field="noConditionFind" value="Y"/>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="entityName" env-name="entityName"/>
+ <field-map field-name="noConditionFind" value="Y"/>
+ </service>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
+ </actions>
+
+ <!--auto-fields-entity entity-name="GlAccount" default-field-type="display"/-->
+ <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
+ </field>
+ <field name="accountName"><display/></field>
+ <field name="glAccountTypeId"><display-entity entity-name="GlAccountType"/></field>
+ <field name="glAccountClassId"><display-entity entity-name="GlAccountClass"/></field>
+ <field name="glResourceTypeId"><display-entity entity-name="GlResourceType"></display-entity></field>
+ <field name="glXbrlClassId"><display-entity entity-name="GlXbrlClass"></display-entity></field>
+ <field name="parentGlAccountId"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]" key-field-name="glAccountId"></display-entity></field>
+ <field name="accountCode"><hidden/></field>
+ <field name="postedBalance" widget-area-style="align-text" title-area-style="align-text"><display type="currency" currency="${defaultCurrencyUomId}"/></field>
+ </form>
+
+ <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount">
+ <alt-target use-when="glAccount==null" target="createGlAccount"/>
+ <auto-fields-service service-name="updateGlAccount" map-name=""/>
+
+ <field use-when="glAccount!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingNotModificationRecrationGlAccount}"><display/></field>
+ <field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingCouldNotFindGlAccount} [${glAccountId}]"><text size="20" maxlength="20"/></field>
+ <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
+ <field use-when="glAccount==null&&glAccountId==null" name="glAccountId"><text size="20" maxlength="20"/></field>
+
+ <field name="glAccountTypeId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="GlAccountType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glAccountClassId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="GlAccountClass" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glResourceTypeId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="GlResourceType" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="glXbrlClassId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="GlXbrlClass" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="parentGlAccountId">
+ <drop-down allow-empty="true">
+ <entity-options key-field-name="glAccountId" entity-name="GlAccount" description="[${glAccountId}] ${accountName}-${accountCode}">
+ <entity-order-by field-name="glAccountId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="postedBalance"><display/></field>
+
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <!-- this is used to list AcctgTransEntries and can be called either by using an acctgTransId or a glAccountId -->
+ <form name="ListAcctgTransEntries" type="list" list-name="entries" default-entity-name="AcctgTransEntry">
+ <field name="acctgTransId">
+ <hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
+ </field>
+ <field name="acctgTransEntrySeqId"><display/></field>
+ <field name="glAccountId">
+ <display-entity entity-name="GlAccount" description="${accountName}">
+ <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]"/>
+ </display-entity>
+ </field>
+ <field name="description"><display/></field>
+ <field name="voucherRef"><display/></field>
+ <field name="partyId"><display/></field>
+ <field name="organizationPartyId"><display/></field>
+ <field name="productId"><display/></field>
+ <field name="debitCreditFlag"><display/></field>
+ <field name="amount"><display/></field>
+ <field name="reconcileStatusId"><display/></field>
+ <field name="settlementTermId"><display/></field>
+ <field name="isSummary"><display/></field>
+ </form>
+
+ <form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal">
+ <field name="" title="${uiLabelMap.CommonEmptyHeader}">
+ <hyperlink also-hidden="false" description="[Back to Admin]" target="AdminMain?organizationPartyId=${organizationPartyId}"/>
+ </field>
+ </form>
+
+ <form name="ListGlReconciliations" type="list" list-name="glReconciliations" default-entity-name="GlReconciliation">
+ <field name="glReconciliationId">
+ <hyperlink also-hidden="false" description="${glReconciliationId}" target="viewGlReconciliation?glReconciliationId=${glReconciliationId}&amp;organizationPartyId=${organizationPartyId}&amp;glAccountId=${glAccountId}"/>
+ </field>
+ <field name="glReconciliationName"><display/></field>
+ <field name="description"><display/></field>
+ <field name="createdByUserLogin"><display/></field>
+ <field name="glAccountId">
+ <display-entity entity-name="GlAccount" description="${accountName}">
+ <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}&amp;organizationPartyId=${organizationPartyId}"
+ description="[${glAccountId}]"/>
+ </display-entity>
+ </field>
+ <field name="reconciledBalance"><display/></field>
+ <field name="reconciledDate"><display/></field>
+ </form>
+
+ <form name="ListGlReconciliationEntries" type="list" list-name="glReconciliationEntries" default-entity-name="GlReconciliationEntry">
+ <field name="glReconciliationId"><display/></field>
+ <field name="acctgTransId">
+ <hyperlink also-hidden="false" description="${acctgTransId}"
+ target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
+ </field>
+ <field name="acctgTransEntrySeqId"><display/></field>
+ <field name="reconciledAmount"><display/></field>
+ </form>
+</forms>
Propchange: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=598021&r1=598020&r2=598021&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sun Nov 25 09:56:25 2007
@@ -109,7 +109,7 @@
<widgets>
<decorator-screen name="GenericDecorator">
<decorator-section name="body">
- <include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -140,8 +140,8 @@
<container style="column-left-wide">
<include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" />
</container>
- <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
- <!-- include-form name="AssignGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/ -->
+ <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
+ <!-- include-form name="AssignGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/ -->
</decorator-section>
</decorator-screen>
</widgets>
@@ -165,7 +165,7 @@
<container style="column-left-wide">
<include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml" />
</container>
- <include-form name="ListAcctgTransEntries" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -191,7 +191,7 @@
<platform-specific>
<html><html-template location="component://accounting/webapp/accounting/chartofaccounts/GlAccountTabBar.ftl"/></html>
</platform-specific>
- <include-form name="ListAcctgTransEntries" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -210,7 +210,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="EditGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
<!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / -->
@@ -240,7 +240,7 @@
<link target="ListGlAccountsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ListGlAccountsExport" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>
- <include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -258,7 +258,7 @@
<widgets>
<decorator-screen name="FoDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -273,7 +273,7 @@
<widgets>
<decorator-screen name="XmlDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="body">
- <include-form name="ListGlAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="ListGlAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -306,7 +306,7 @@
<widgets>
<decorator-screen name="CommonAccountDecorator">
<decorator-section name="body">
- <include-form name="EditGlobalAccount" location="component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml"/>
+ <include-form name="EditGlobalAccount" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>