You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/03/28 02:01:34 UTC
svn commit: r523120 - in /ofbiz/trunk/applications/accounting: ./ config/
entitydef/ script/org/ofbiz/accounting/finaccount/ servicedef/
webapp/accounting/WEB-INF/ webapp/accounting/includes/ widget/
Author: jonesde
Date: Tue Mar 27 17:01:32 2007
New Revision: 523120
URL: http://svn.apache.org/viewvc?view=rev&rev=523120
Log:
Applied patch from Ashish in Jira #OFBIZ-849 plus a number of refinements and testing; also did various fixes to the balance calculating code and that is now working fine
Added:
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (with props)
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (with props)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
ofbiz/trunk/applications/accounting/ofbiz-component.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Tue Mar 27 17:01:32 2007
@@ -768,3 +768,14 @@
FormFieldTitle_parentInvoiceId=Parent Invoice Id
FormFieldTitle_parentInvoiceItemSeqId=Parent Invoice Item Seq Id
FormFieldTitle_workEffortId=Work Effort Id
+
+AccountingFinAccount=Financial Account
+AccountingFindFinAccount=Find Financial Account
+AccountingEditFinAccount=Create/Update Financial Account
+AccountingFinAccountTransations=Transactions
+AccountingFinAccountAuth=Authentications
+PageTitleFinAccount=Financial Account
+PageTitleEditFinAccount=Edit Financial Account
+PageTitleEditFinAccountRole=Edit Financial Account Role
+PageTitleEditFinAccountTrans=Edit Financial Account Transaction
+PageTitleEditFinAccountAuths=Edit Financial Account Authority
Modified: ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Tue Mar 27 17:01:32 2007
@@ -390,6 +390,18 @@
<key-map field-name="attrName"/>
</relation>
</entity>
+ <entity entity-name="FinAccountAuth" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Authorizations record">
+ <field name="finAccountAuthId" type="id-ne"/>
+ <field name="finAccountId" type="id-ne"/>
+ <field name="amount" type="currency-amount"/>
+ <field name="authorizationDate" type="date-time"/>
+ <field name="fromDate" type="date-time"/>
+ <field name="thruDate" type="date-time"/>
+ <prim-key field="finAccountAuthId"/>
+ <relation type="one" fk-name="FINACT_AUTH_FINACT" rel-entity-name="FinAccount">
+ <key-map field-name="finAccountId"/>
+ </relation>
+ </entity>
<entity entity-name="FinAccountRole" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Role Entity">
<field name="finAccountId" type="id-ne"></field>
<field name="partyId" type="id-ne"></field>
@@ -425,6 +437,7 @@
<field name="paymentId" type="id-ne"></field>
<field name="orderId" type="id"></field>
<field name="orderItemSeqId" type="id"><description>To be used along with orderId to point to an OrderItem that represents the purchase of a product to add money to the account.</description></field>
+ <field name="performedByPartyId" type="id"></field>
<prim-key field="finAccountTransId"/>
<relation type="one" fk-name="FINACCT_TX_TYPE" rel-entity-name="FinAccountTransType">
<key-map field-name="finAccountTransTypeId"/>
@@ -445,17 +458,8 @@
<key-map field-name="orderId"/>
<key-map field-name="orderItemSeqId"/>
</relation>
- </entity>
- <entity entity-name="FinAccountAuth" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Authorizations record">
- <field name="finAccountAuthId" type="id-ne"/>
- <field name="finAccountId" type="id-ne"/>
- <field name="amount" type="currency-amount"/>
- <field name="authorizationDate" type="date-time"/>
- <field name="fromDate" type="date-time"/>
- <field name="thruDate" type="date-time"/>
- <prim-key field="finAccountAuthId"/>
- <relation type="one" fk-name="FINACT_AUTH_FINACT" rel-entity-name="FinAccount">
- <key-map field-name="finAccountId"/>
+ <relation type="one" fk-name="FIN_ACT_TX_PBPTY" title="PerformedBy" rel-entity-name="Party">
+ <key-map field-name="performedByPartyId" rel-field-name="partyId"/>
</relation>
</entity>
<entity entity-name="FinAccountTransAttribute" package-name="org.ofbiz.accounting.finaccount" title="Financial Account Transaction Attribute Entity">
Modified: ofbiz/trunk/applications/accounting/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/ofbiz-component.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/accounting/ofbiz-component.xml Tue Mar 27 17:01:32 2007
@@ -33,13 +33,14 @@
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_old.xml"/>
<entity-resource type="group" reader-name="main" loader="main" location="entitydef/entitygroup.xml"/>
+ <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/UsTaxAccountGroups.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/AccountingSecurityData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGeneralChartOfAccounts.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoOrganizationData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/PaymentsInvoices.xml"/>
-
+
<!-- General Payment Service Definitions -->
<service-resource type="model" loader="main" location="servicedef/services_agreement.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_admin.xml"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Mar 27 17:01:32 2007
@@ -59,6 +59,8 @@
<if-empty field-name="newEntity.entryDate">
<set from-field="nowTimestamp" field="newEntity.entryDate"/>
</if-empty>
+
+ <set field="newEntity.performedByPartyId" from-field="userLogin.partyId"/>
<create-value value-name="newEntity"/>
<field-to-result field-name="newEntity.finAccountTransId" result-name="finAccountTransId"/>
@@ -145,9 +147,21 @@
<condition-expr field-name="finAccountId" env-name="finAccountId"/>
</entity-condition>
<iterate entry-name="finAccountTrans" list-name="finAccountTransList">
+ <if>
+ <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT"/></condition>
+ <then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
+ <else-if>
+ <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL"/></condition>
+ <then><calculate field-name="amountForCalc"><calcop operator="negative" field-name="finAccountTrans.amount"/></calculate></then>
+ </else-if>
+ <else-if>
+ <condition><if-compare field-name="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT"/></condition>
+ <then><set field="amountForCalc" from-field="finAccountTrans.amount"/></then>
+ </else-if>
+ </if>
<calculate field-name="actualBalanceSum" type="BigDecimal">
<calcop operator="add" field-name="actualBalanceSum">
- <calcop operator="get" field-name="finAccountTrans.amount"/>
+ <calcop operator="get" field-name="amountForCalc"/>
</calcop>
</calculate>
</iterate>
Modified: ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_finaccount.xml Tue Mar 27 17:01:32 2007
@@ -28,20 +28,20 @@
<service name="createFinAccount" engine="simple" default-entity-name="FinAccount"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="createFinAccount">
<description>Create a new Financial Account. If no finAccountId is provided, an auto-sequenced one will be used.</description>
+ <auto-attributes mode="INOUT" optional="true" include="pk"/>
<auto-attributes mode="IN" optional="true" include="nonpk">
<exclude field-name="actualBalance"/>
<exclude field-name="availableBalance"/>
</auto-attributes>
- <auto-attributes mode="INOUT" optional="true" include="pk"/>
</service>
<service name="updateFinAccount" engine="simple" default-entity-name="FinAccount"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="updateFinAccount">
<description>Update a Financial Account</description>
+ <auto-attributes mode="INOUT" optional="false" include="pk"/>
<auto-attributes mode="IN" optional="true" include="nonpk">
<exclude field-name="actualBalance"/>
<exclude field-name="availableBalance"/>
</auto-attributes>
- <auto-attributes mode="INOUT" optional="false" include="pk"/>
</service>
<service name="deleteFinAccount" engine="simple" default-entity-name="FinAccount"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="deleteFinAccount">
@@ -49,7 +49,7 @@
<auto-attributes mode="IN" optional="false" include="pk"/>
</service>
<service name="updateFinAccountBalancesFromTrans" engine="simple"
- location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="updateFinAccountActualBalanceFromTrans">
+ location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="updateFinAccountBalancesFromTrans">
<description>Update FinAccount.actualBalance and FinAccount.availableBalance based on a new FinAccountTrans; meant to be called as an EECA as it is for data maintenance</description>
<attribute name="finAccountTransId" type="String" mode="IN" optional="false"/>
</service>
@@ -62,8 +62,10 @@
<service name="createFinAccountTrans" engine="simple" default-entity-name="FinAccountTrans"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="createFinAccountTrans">
<description>Create a new Financial Account Transaction. Will use current timestamp for entryDate and trasanctionDate if none is provided.</description>
- <auto-attributes mode="IN" optional="true" include="nonpk"/>
<auto-attributes mode="OUT" optional="false" include="pk"/>
+ <auto-attributes mode="IN" optional="true" include="nonpk">
+ <exclude field-name="performedByPartyId"/>
+ </auto-attributes>
</service>
<service name="postFinAccountTransToGl" engine="simple"
location="org/ofbiz/accounting/finaccount/FinAccountGlPostServices.xml" invoke="postFinAccountTransToGl">
@@ -74,15 +76,15 @@
<service name="createFinAccountRole" engine="simple" default-entity-name="FinAccountRole"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="createFinAccountRole">
<description>Create a new Financial Account Role</description>
- <auto-attributes mode="IN" optional="true" include="nonpk"/>
<auto-attributes mode="IN" optional="false" include="pk"/>
+ <auto-attributes mode="IN" optional="true" include="nonpk"/>
<override name="fromDate" optional="true"/>
</service>
<service name="updateFinAccountRole" engine="simple" default-entity-name="FinAccountRole"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="updateFinAccountRole">
<description>Update a Financial Account Role</description>
- <auto-attributes mode="IN" optional="true" include="nonpk"/>
<auto-attributes mode="IN" optional="false" include="pk"/>
+ <auto-attributes mode="IN" optional="true" include="nonpk"/>
</service>
<service name="deleteFinAccountRole" engine="simple" default-entity-name="FinAccountRole"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="deleteFinAccountRole">
@@ -93,8 +95,8 @@
<service name="createFinAccountAuth" engine="simple" default-entity-name="FinAccountAuth"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="createFinAccountAuth">
<description>Lower level service for creating authorization against a fin account. Will use current time for authorizationDate and thruDate if not supplied.</description>
- <auto-attributes mode="IN" optional="true" include="nonpk"/>
<auto-attributes mode="OUT" optional="false" include="pk"/>
+ <auto-attributes mode="IN" optional="true" include="nonpk"/>
</service>
<service name="expireFinAccountAuth" engine="simple" default-entity-name="FinAccountAuth"
location="org/ofbiz/accounting/finaccount/FinAccountServices.xml" invoke="expireFinAccountAuth">
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?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Mar 27 17:01:32 2007
@@ -1227,7 +1227,88 @@
<response name="success" type="view" value="EditFixedAssetMaintOrders"/>
<response name="error" type="view" value="EditFixedAssetMaintOrders"/>
</request-map>
-
+ <!-- Fin Account -->
+ <request-map uri="FindFinAccount">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindFinAccount"/>
+ <response name="error" type="view" value="FindFinAccount"/>
+ </request-map>
+ <request-map uri="EditFinAccount">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditFinAccount"/>
+ <response name="error" type="view" value="EditFinAccount"/>
+ </request-map>
+ <request-map uri="createFinAccount">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createFinAccount"/>
+ <response name="success" type="view" value="EditFinAccount"/>
+ <response name="error" type="view" value="EditFinAccount"/>
+ </request-map>
+ <request-map uri="updateFinAccount">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateFinAccount"/>
+ <response name="success" type="view" value="EditFinAccount"/>
+ <response name="error" type="view" value="EditFinAccount"/>
+ </request-map>
+ <request-map uri="deleteFinAccount">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="deleteFinAccount"/>
+ <response name="success" type="view" value="FindFinAccount"/>
+ <response name="error" type="view" value="FindFinAccount"/>
+ </request-map>
+ <!-- Fin Account Roles -->
+ <request-map uri="EditFinAccountRoles">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditFinAccountRoles"/>
+ </request-map>
+ <request-map uri="createFinAccountRole">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createFinAccountRole"/>
+ <response name="success" type="view" value="EditFinAccountRoles"/>
+ <response name="error" type="view" value="EditFinAccountRoles"/>
+ </request-map>
+ <request-map uri="updateFinAccountRole">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="updateFinAccountRole"/>
+ <response name="success" type="view" value="EditFinAccountRoles"/>
+ <response name="error" type="view" value="EditFinAccountRoles"/>
+ </request-map>
+ <request-map uri="deleteFinAccountRole">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="deleteFinAccountRole"/>
+ <response name="success" type="view" value="EditFinAccountRoles"/>
+ <response name="error" type="view" value="EditFinAccountRoles"/>
+ </request-map>
+ <!-- Fin Account Transaction-->
+ <request-map uri="EditFinAccountTrans">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditFinAccountTrans"/>
+ <response name="error" type="view" value="EditFinAccountTrans"/>
+ </request-map>
+ <request-map uri="createFinAccountTrans">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createFinAccountTrans"/>
+ <response name="success" type="view" value="EditFinAccountTrans"/>
+ <response name="error" type="view" value="EditFinAccountTrans"/>
+ </request-map>
+ <!-- Fin Account Authority-->
+ <request-map uri="EditFinAccountAuths">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditFinAccountAuths"/>
+ <response name="error" type="view" value="EditFinAccountAuths"/>
+ </request-map>
+ <request-map uri="createFinAccountAuth">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createFinAccountAuth"/>
+ <response name="success" type="view" value="EditFinAccountAuths"/>
+ <response name="error" type="view" value="EditFinAccountAuths"/>
+ </request-map>
+ <request-map uri="expireFinAccountAuth">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="expireFinAccountAuth"/>
+ <response name="success" type="view" value="EditFinAccountAuths"/>
+ <response name="error" type="view" value="EditFinAccountAuths"/>
+ </request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -1377,6 +1458,13 @@
<view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/>
<!-- Fixed Asset Maintenance Order -->
<view-map name="EditFixedAssetMaintOrders" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetMaintOrders"/>
+ <!-- FinAccount -->
+ <view-map name="FindFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#FindFinAccount"/>
+ <view-map name="ListFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#ListFinAccount"/>
+ <view-map name="EditFinAccount" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccount"/>
+ <view-map name="EditFinAccountRoles" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountRoles"/>
+ <view-map name="EditFinAccountTrans" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountTrans"/>
+ <view-map name="EditFinAccountAuths" type="screen" page="component://accounting/widget/FinAccountScreens.xml#EditFinAccountAuths"/>
- <!-- end of view mappings -->
+ <!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/includes/appheader.ftl Tue Mar 27 17:01:32 2007
@@ -39,7 +39,7 @@
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.ListFixedAssets?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFixedAssets}</a></div>
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.TaxAuthorities?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTaxAuthorities}</a></div>
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.companies?default(unselectedLeftClassName)}">${uiLabelMap.AccountingCompanies}</a></div>
-
+ <div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.FindFinAccount?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFinAccount}</a></div>
<#if userLogin?has_content>
<div class="col-right"><a href="<@o...@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
<#else>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Mar 27 17:01:32 2007
@@ -232,6 +232,40 @@
</section>
</screen>
+ <screen name="CommonFinAccountDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="FindFinAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="finAccountId"/></not></condition>
+ <widgets>
+ <include-menu name="FinAccountTabBar" location="component://accounting/widget/Menus.xml"/>
+ <label style="head1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: [${uiLabelMap.CommonId}:${finAccountId}] ${${extraFunctionName}}"/>
+ </widgets>
+ </section>
+ </widgets>
+ <fail-widgets>
+ <label style="head3" text="${uiLabelMap.AcccountingViewPermissionError}"/>
+ </fail-widgets>
+ </section>
+ <decorator-section-include name="body"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+
<screen name="main">
<section>
<actions>
Added: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?view=auto&rev=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Tue Mar 27 17:01:32 2007
@@ -0,0 +1,193 @@
+<?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://www.ofbiz.org/dtds/widget-form.xsd">
+
+ <form name="FindFinAccounts" type="single" target="FindFinAccount">
+ <auto-fields-entity entity-name="FinAccount" default-field-type="find"/>
+ <field name="finAccountId"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="finAccountTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="FinAccountType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="finAccountCode"><text-find default-option="contains" ignore-case="true"/></field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+ <form name="ListFinAccounts" type="list" separate-columns="true" default-entity-name="FinAccount" list-name="listIt" paginate-target="FindFinAccount" paginate="true">
+ <actions>
+ <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" value="FinAccount"/>
+ <field-map field-name="orderBy" value="fromDate"/>
+ </service>
+ </actions>
+ <field name="finAccountId"> <hyperlink description="${finAccountId}" target="EditFinAccount?finAccountId=${finAccountId}"/> </field>
+ <field name="finAccountTypeId"><display-entity entity-name="FinAccountType" description="${description}"/></field>
+ <field name="finAccountName"><display/></field>
+ <field name="finAccountCode"><display/></field>
+ <field name="fromdate"><display/></field>
+ <field name="thrudate"><display/></field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink target="deleteFinAccount?finAccountId=${finAccountId}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ </form>
+
+ <form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount">
+ <alt-target use-when="finAccount==null" target="createFinAccount"/>
+ <auto-fields-service service-name="updateFinAccount"/>
+
+ <field name="finAccountId" use-when="finAccountId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field name="finAccountId" use-when="finAccount==null&&finAccountId==null"><ignored/></field>
+ <field name="finAccountId" use-when="finAccount==null&&finAccountId!=null" tooltip="${uiLabelMap.CommonCannotBeFound}: [${finAccountId}]" widget-style="tabletext"><display also-hidden="false"/></field>
+
+ <field name="finAccountCode"><text size="20"/></field>
+ <field name="finAccountPin"><text size="10"/></field>
+ <field name="finAccountTypeId">
+ <drop-down no-current-selected-key="DEPOSIT_ACCOUNT">
+ <entity-options description="${description}" entity-name="FinAccountType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="currencyUomId" title="${uiLabelMap.CommonCurrency}">
+ <drop-down no-current-selected-key="USD">
+ <entity-options description="${uomId} - ${description}" entity-name="Uom" key-field-name="uomId">
+ <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="organizationPartyId" widget-style="tabletext"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="ownerPartyId" widget-style="tabletext"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="postToGlAccountId" widget-style="selectBox"><lookup target-form-name="LookupGlAccount"/></field>
+ <field name="isFrozen">
+ <drop-down no-current-selected-key="N"><option key="N"/><option key="Y"/></drop-down>
+ </field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="actualBalance"><display/></field>
+ <field name="availableBalance"><display/></field>
+ </form>
+
+ <form name="ListFinAccountRoles" type="list" list-name="finAccountRoles" target="updateFinAccountRole" separate-columns="true">
+ <actions>
+ <entity-condition entity-name="FinAccountRole">
+ <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <order-by field-name="finAccountId"/>
+ </entity-condition>
+ </actions>
+ <field name="finAccountId"><hidden/></field>
+ <field name="roleTypeId" widget-style="tabletext"><display/></field>
+ <field name="partyId" widget-style="tabletext"> <display/></field>
+ <field name="fromDate" widget-style="tabletext"><display/></field>
+ <field name="thruDate" widget-style="inputBox"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="deleteLink" title="" widget-style="buttontext">
+ <hyperlink target="deleteFinAccountRole?finAccountId=${finAccountId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}"
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="AddFinAccountRole" type="single" target="createFinAccountRole">
+ <auto-fields-service service-name="createFinAccountRole"/>
+ <field name="finAccountId"><hidden/></field>
+ <field name="partyId"> <lookup target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeId">
+ <drop-down allow-empty="true">
+ <entity-options description="${description}" entity-name="RoleType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListFinAccountTransactions" type="list" list-name="finAccountTransactions" separate-columns="true">
+ <actions>
+ <entity-condition entity-name="FinAccountTrans">
+ <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ </entity-condition>
+ </actions>
+ <field name="finAccountId"><hidden/></field>
+ <field name="finAccountTrasnsId"><hidden/></field>
+ <field name="finAccountTransTypeId"><display-entity entity-name="FinAccountTransType" description="${description}"/></field>
+ <field name="partyId"><display/></field>
+ <field name="transactionDate"><display/></field>
+ <field name="entryDate"><display/></field>
+ <field name="paymentId"><display/></field>
+ <field name="amount"><display/></field>
+ <field name="orderId"><display/></field>
+ </form>
+ <form name="AddFinAccountTrans" type="single" target="createFinAccountTrans">
+ <auto-fields-service service-name="createFinAccountTrans"/>
+ <field name="finAccountId"><hidden/></field>
+ <field name="finAccountTransId"><hidden/></field>
+ <field name="finAccountTransTypeId">
+ <drop-down no-current-selected-key="ADJUSTMENT">
+ <entity-options description="${description}" entity-name="FinAccountTransType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="transactionDate"> <date-time/> </field>
+ <field name="entryDate"><date-time/></field>
+ <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
+ <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListFinAccountAuths" type="list" list-name="finAccountauths" target="expireFinAccountAuth" separate-columns="true">
+ <actions>
+ <entity-condition entity-name="FinAccountAuth">
+ <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <order-by field-name="finAccountAuthId"/>
+ </entity-condition>
+ </actions>
+ <auto-fields-entity entity-name="FinAccountAuth"/>
+ <field name="finAccountAuthId"><hidden/></field>
+ <field name="finAccountId"><hidden/></field>
+ <field name="amount"><display/></field>
+ <field name="authorizationDate"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ <field name="expireLink" title="" widget-style="buttontext">
+ <hyperlink target="expireFinAccountAuth?finAccountId=${finAccountId}&finAccountAuthId=${finAccountAuthId}"
+ description="${uiLabelMap.CommonExpire}" also-hidden="false"/>
+ </field>
+ </form>
+ <form name="AddFinAccountAuth" type="single" target="createFinAccountAuth">
+ <auto-fields-service service-name="createFinAccountAuth"/>
+ <field name="finAccountId"><hidden/></field>
+ <field name="finAccountAuthId"><hidden/></field>
+ <field name="amount"><text/></field>
+ <field name="authorizationDate"><date-time/></field>
+ <field name="fromDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+</forms>
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?view=auto&rev=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Mar 27 17:01:32 2007
@@ -0,0 +1,139 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+
+ <screen name="FindFinAccount">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleFinAccount"/>
+ <set field="headerItem" value="FindFinAccount"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container>
+ <container><label style="head1" text="${uiLabelMap.AccountingFindFinAccount}"/></container>
+ <include-form name="FindFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="ListFinAccounts" location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditFinAccount">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditFinAccount"/>
+ <set field="tabButtonItem" value="EditFinAccount"/>
+ <set field="finAccountId" from-field="parameters.finAccountId"/>
+ <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <label style="head1" text="${uiLabelMap.AccountingEditFinAccount}"/>
+ <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container>
+ <include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditFinAccountRoles">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditFinAccountRole"/>
+ <set field="tabButtonItem" value="EditFinAccountRoles"/>
+ <set field="labelTitleProperty" value="PageTitleEditFinAccountRole"/>
+
+ <set field="finAccountId" from-field="parameters.finAccountId"/>
+ <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <set field="roleTypeId" from-field="parameters.roleTypeId"/>
+ <set field="fromDate" from-field="parameters.fromDate"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container>
+ <include-form name="ListFinAccountRoles" location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="AddFinAccountRole" location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditFinAccountTrans">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditFinAccountTrans"/>
+ <set field="tabButtonItem" value="EditFinAccountTrans"/>
+ <set field="labelTitleProperty" value="PageTitleEditFinAccountTrans"/>
+ <set field="finAccountId" from-field="parameters.finAccountId"/>
+ <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <set field="finAccountTransId" from-field="parameters.finAccountTransId"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container>
+ <include-form name="ListFinAccountTransactions" location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="AddFinAccountTrans" location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditFinAccountAuths">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditFinAccountAuths"/>
+ <set field="tabButtonItem" value="EditFinAccountAuths"/>
+ <set field="labelTitleProperty" value="PageTitleEditFinAccountAuths"/>
+ <set field="finAccountId" from-field="parameters.finAccountId"/>
+ <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <set field="finAccountAuthId" from-field="parameters.finAccountAuthId"/>
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonFinAccountDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container><link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/></container>
+ <include-form name="ListFinAccountAuths" location="component://accounting/widget/FinAccountForms.xml"/>
+ <include-form name="AddFinAccountAuth" location="component://accounting/widget/FinAccountForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?view=diff&rev=523120&r1=523119&r2=523120
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Tue Mar 27 17:01:32 2007
@@ -373,5 +373,21 @@
</menu-item>
</menu>
+ <menu name="FinAccountTabBar" default-menu-item-name="EditFinAccount" default-selected-style="tabButtonSelected"
+ default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
+ orientation="horizontal" type="simple">
+ <menu-item name="EditFinAccount" title="${uiLabelMap.AccountingFinAccount}">
+ <link target="EditFinAccount?finAccountId=${finAccountId}"/>
+ </menu-item>
+ <menu-item name="EditFinAccountRoles" title="${uiLabelMap.PartyRoles}">
+ <link target="EditFinAccountRoles?finAccountId=${finAccountId}"/>
+ </menu-item>
+ <menu-item name="EditFinAccountTrans" title="${uiLabelMap.AccountingFinAccountTransations}">
+ <link target="EditFinAccountTrans?finAccountId=${finAccountId}"/>
+ </menu-item>
+ <menu-item name="EditFinAccountAuths" title="${uiLabelMap.AccountingFinAccountAuth}">
+ <link target="EditFinAccountAuths?finAccountId=${finAccountId}"/>
+ </menu-item>
+ </menu>
</menus>