You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/09/01 23:34:36 UTC
svn commit: r810248 [2/13] - in /ofbiz/branches/executioncontext20090812: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/data/helpdata/ applications/accounting/documents/
applications/accounting/script/org/ofbi...
Propchange: ofbiz/branches/executioncontext20090812/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 1 21:33:41 2009
@@ -1 +1 @@
-/ofbiz/trunk:803908-805009,805456-807293
+/ofbiz/trunk:803908-805009,805456-809760
Modified: ofbiz/branches/executioncontext20090812/BranchReadMe.txt
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/BranchReadMe.txt?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/BranchReadMe.txt (original)
+++ ofbiz/branches/executioncontext20090812/BranchReadMe.txt Tue Sep 1 21:33:41 2009
@@ -82,5 +82,5 @@
The structure is cached. When an artifact requests the user's permissions,
a permission object (OFBizPermission) uses the supplied artifact ID to traverse
the tree, accumulating permissions along the way. This is how permission
-inheritance is acheived. The permission object is then queried if the user
+inheritance is achieved. The permission object is then queried if the user
has the requested permission and the result is returned to the artifact.
Modified: ofbiz/branches/executioncontext20090812/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/LICENSE?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/LICENSE (original)
+++ ofbiz/branches/executioncontext20090812/LICENSE Tue Sep 1 21:33:41 2009
@@ -90,7 +90,7 @@
ofbiz/trunk/framework/webapp/lib/ezmorph-0.9.1.jar
ofbiz/trunk/framework/webapp/lib/rome-0.9.jar
ofbiz/trunk/framework/webapp/lib/serializer-2.7.0.jar
-ofbiz/trunk/framework/webapp/lib/xalan-2.7.0.jar
+ofbiz/trunk/framework/webapp/lib/xalan-2.7.1.jar
ofbiz/trunk/framework/webapp/lib/xmlrpc-client-3.0.jar
ofbiz/trunk/framework/webapp/lib/xmlrpc-common-3.0.jar
ofbiz/trunk/framework/webapp/lib/xmlrpc-server-3.0.jar
@@ -2573,3 +2573,60 @@
http://backport-jsr166.sourceforge.net/
framework/base/lib/backport-util-concurrent-Java50-3.1.jar
This file is licensed into the public domain.
+====================================================================================
+Apache Ofbiz includes docbook templates in the /applications/content/template/docbook
+directory with the following licence:
+Copyright
+---------
+Copyright (C) 1999-2007 Norman Walsh
+Copyright (C) 2003 JiÅÃ Kosek
+Copyright (C) 2004-2007 Steve Ball
+Copyright (C) 2005-2008 The DocBook Project
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the ``Software''), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Contacting the Author
+---------------------
+The DocBook XSL stylesheets are maintained by Norman Walsh,
+<nd...@nwalsh.com>, and members of the DocBook Project,
+<do...@sf.net>
+===============================================================
+The docbook schemas in te file docbook.xsd, docbook.dtd xlink.xsl
+and xml.xsl are distributed under the GNU Free Documentation License
+GNU Free Documentation License
+It was allowed by the author to use the docbook files within the
+Apache OFBiz system in an email to H.Bakker from N.Walsh dd
+Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT)
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/config/AccountingUiLabels.xml Tue Sep 1 21:33:41 2009
@@ -7998,6 +7998,10 @@
<value xml:lang="en">Reconciliation</value>
<value xml:lang="hi_IN">मिलाप</value>
</property>
+ <property key="AccountingReconciliationError">
+ <value xml:lang="en">Can not Reconcile finAccountTrans [${finAccountTrans.finAccountTransId}], glReconciliationId not exist</value>
+ <value xml:lang="hi_IN">finAccountTrans [${finAccountTrans.finAccountTransId}] à¤à¤¾ पà¥à¤¨à¤°à¥à¤®à¤¿à¤²à¤¾à¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¥, glReconciliationId मà¥à¤à¥à¤¦ नहà¥à¤ हà¥</value>
+ </property>
<property key="AccountingReferenceNumber">
<value xml:lang="ar">رÙÙ
اÙÙ
رجع</value>
<value xml:lang="en">Reference Number</value>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoOrganizationData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoOrganizationData.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoOrganizationData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/data/DemoOrganizationData.xml Tue Sep 1 21:33:41 2009
@@ -73,4 +73,154 @@
<RateAmount rateTypeId="DISCOUNTED" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="55.0"/>
<RateAmount rateTypeId="OVERTIME" rateCurrencyUomId="USD" periodTypeId="RATE_HOUR" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="_NA_" fromDate="2000-01-01 00:00:00.000" rateAmount="125.0"/>
+ <!-- An Enterprise Internal Organization -->
+
+ <Party partyId="Enterprise" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="Enterprise" groupName="Large Enterprise, Inc." logoImageUrl="http://ofbiz.apache.org/images/ofbiz_logo.gif"/>
+ <PartyRole partyId="Enterprise" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="Enterprise" roleTypeId="PARENT_ORGANIZATION"/>
+
+ <!-- Top tier divisions -->
+
+ <Party partyId="bu_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="bu_div" groupName="Business Unit Division"/>
+ <PartyRole partyId="bu_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="bu_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="Enterprise" partyIdTo="bu_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="md_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="md_div" groupName="Market Development Division"/>
+ <PartyRole partyId="md_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="md_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="Enterprise" partyIdTo="md_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="cf_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="cf_div" groupName="Corporate Functions Division"/>
+ <PartyRole partyId="cf_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="cf_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="Enterprise" partyIdTo="cf_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="PARENT_ORGANIZATION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <!-- Business unit divisions -->
+
+ <Party partyId="gizmo_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="gizmo_div" groupName="Gizmo Business Unit"/>
+ <PartyRole partyId="gizmo_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="gizmo_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="bu_div" partyIdTo="gizmo_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="widget_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="widget_div" groupName="Widget Business Unit"/>
+ <PartyRole partyId="widget_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="widget_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="bu_div" partyIdTo="widget_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <!-- Market development divisions -->
+
+ <Party partyId="na_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="na_div" groupName="North America"/>
+ <PartyRole partyId="na_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="na_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="na_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="sa_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="sa_div" groupName="Central and South America"/>
+ <PartyRole partyId="sa_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="sa_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="sa_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="we_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="we_div" groupName="Western Europe"/>
+ <PartyRole partyId="we_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="we_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="we_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="asia_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="asia_div" groupName="Asia"/>
+ <PartyRole partyId="asia_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="asia_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="asia_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="anz_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="anz_div" groupName="Australia and New Zealand"/>
+ <PartyRole partyId="anz_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="anz_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="anz_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="india_div" partyTypeId="PARTY_GROUP"/>
+ <PartyGroup partyId="india_div" groupName="India"/>
+ <PartyRole partyId="india_div" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="india_div" roleTypeId="DIVISION"/>
+ <PartyRelationship partyIdFrom="md_div" partyIdTo="india_div" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DIVISION" fromDate="2001-05-13 00:00:00.000"/>
+
+ <!-- Business Unit departments -->
+
+ <Party partyId="RECEIVING" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="RECEIVING" groupName="Receiving Department"/>
+ <PartyRole partyId="RECEIVING" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="RECEIVING" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="gizmo_div" partyIdTo="RECEIVING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+ <PartyRelationship partyIdFrom="widget_div" partyIdTo="RECEIVING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="PRODUCTION" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="PRODUCTION" groupName="Production Department"/>
+ <PartyRole partyId="PRODUCTION" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="PRODUCTION" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="gizmo_div" partyIdTo="PRODUCTION" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+ <PartyRelationship partyIdFrom="widget_div" partyIdTo="PRODUCTION" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="SHIPPING" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="SHIPPING" groupName="Shipping Department"/>
+ <PartyRole partyId="SHIPPING" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="SHIPPING" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="gizmo_div" partyIdTo="SHIPPING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+ <PartyRelationship partyIdFrom="widget_div" partyIdTo="SHIPPING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="MAINTENANCE" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="MAINTENANCE" groupName="Maintenance Department"/>
+ <PartyRole partyId="MAINTENANCE" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="MAINTENANCE" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="gizmo_div" partyIdTo="MAINTENANCE" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+ <PartyRelationship partyIdFrom="widget_div" partyIdTo="MAINTENANCE" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <!-- Corporate Functions departments -->
+
+ <Party partyId="LEGAL" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="LEGAL" groupName="Legal Department"/>
+ <PartyRole partyId="LEGAL" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="LEGAL" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="LEGAL" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="PUBLIC_REL" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="PUBLIC_REL" groupName="Public Relations"/>
+ <PartyRole partyId="PUBLIC_REL" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="PUBLIC_REL" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="PUBLIC_REL" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="HUMAN_RES" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="HUMAN_RES" groupName="Human Resources"/>
+ <PartyRole partyId="HUMAN_RES" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="HUMAN_RES" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="HUMAN_RES" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="INFO_TECH" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="INFO_TECH" groupName="Information Technology"/>
+ <PartyRole partyId="INFO_TECH" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="INFO_TECH" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="INFO_TECH" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="R_AND_D" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="R_AND_D" groupName="Research and Development"/>
+ <PartyRole partyId="R_AND_D" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="R_AND_D" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="R_AND_D" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <Party partyId="LOGISTICS" partyTypeId="PARTY_GROUP" createdDate="2004-03-27 09:37:40.989" createdByUserLogin="admin" lastModifiedDate="2004-03-27 09:37:40.989" lastModifiedByUserLogin="admin"/>
+ <PartyGroup partyId="LOGISTICS" groupName="Logistics"/>
+ <PartyRole partyId="LOGISTICS" roleTypeId="INTERNAL_ORGANIZATIO"/>
+ <PartyRole partyId="LOGISTICS" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="LOGISTICS" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
+ <PartyRole partyId="ACCOUNTING" roleTypeId="DEPARTMENT"/>
+ <PartyRelationship partyIdFrom="cf_div" partyIdTo="ACCOUNTING" partyRelationshipTypeId="GROUP_ROLLUP" roleTypeIdFrom="DIVISION" roleTypeIdTo="DEPARTMENT" fromDate="2001-05-13 00:00:00.000"/>
+
</entity-engine-xml>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/data/helpdata/HELP_ACCOUNTING.xml Tue Sep 1 21:33:41 2009
@@ -1,30 +1,27 @@
-<?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.
--->
-<root>
- <generalTitle>
- The Content Manager.
- </generalTitle>
- <general>
- <section>
- <text>The Content Management System (CMS) is designed to store data once and then allow it to be reused in multiple arrangements.</text>
- </section>
- </general>
-</root>
-
+<?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.
+-->
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd">
+ <para>
+ The help screen text
+ </para>
+</section>
+
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/finaccount/FinAccountServices.xml Tue Sep 1 21:33:41 2009
@@ -654,37 +654,28 @@
<if-not-empty field="finAccountTrans.glReconciliationId">
<get-related-one relation-name="GlReconciliation" value-field="finAccountTrans" to-value-field="glReconciliation"/>
<set-service-fields service-name="updateGlReconciliation" map="glReconciliation" to-map="updateGlReconciliationMap"/>
- </if-not-empty>
- <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT">
- <set-service-fields service-name="reconcileAdjustmentFinAcctgTrans" map="parameters" to-map="reconcileAdjustmentFinAcctgTransMap"/>
- <set field="reconcileAdjustmentFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
- <set field="reconcileAdjustmentFinAcctgTransMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
- <call-service service-name="reconcileAdjustmentFinAcctgTrans" in-map-name="reconcileAdjustmentFinAcctgTransMap"/>
- <if-not-empty field="finAccountTrans.glReconciliationId">
+ <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="ADJUSTMENT">
+ <set-service-fields service-name="reconcileAdjustmentFinAcctgTrans" map="parameters" to-map="reconcileAdjustmentFinAcctgTransMap"/>
+ <set field="reconcileAdjustmentFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
+ <set field="reconcileAdjustmentFinAcctgTransMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <call-service service-name="reconcileAdjustmentFinAcctgTrans" in-map-name="reconcileAdjustmentFinAcctgTransMap"/>
<set field="updateGlReconciliationMap.reconciledBalance" value="${glReconciliation.reconciledBalance + finAccountTrans.amount}"/>
- </if-not-empty>
- </if-compare>
- <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT">
- <set-service-fields service-name="reconcileDepositFinAcctgTrans" map="parameters" to-map="reconcileDepositFinAcctgTransMap"/>
- <set field="reconcileDepositFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
- <call-service service-name="reconcileDepositFinAcctgTrans" in-map-name="reconcileDepositFinAcctgTransMap"/>
- <if-not-empty field="finAccountTrans.glReconciliationId">
+ </if-compare>
+ <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="DEPOSIT">
+ <set-service-fields service-name="reconcileDepositFinAcctgTrans" map="parameters" to-map="reconcileDepositFinAcctgTransMap"/>
+ <set field="reconcileDepositFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
+ <call-service service-name="reconcileDepositFinAcctgTrans" in-map-name="reconcileDepositFinAcctgTransMap"/>
<set field="updateGlReconciliationMap.reconciledBalance" value="${glReconciliation.reconciledBalance + finAccountTrans.amount}"/>
- </if-not-empty>
- </if-compare>
- <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL">
- <set-service-fields service-name="reconcileWithdrawalFinAcctgTrans" map="parameters" to-map="reconcileWithdrawalFinAcctgTransMap"/>
- <set field="reconcileWithdrawalFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
- <call-service service-name="reconcileWithdrawalFinAcctgTrans" in-map-name="reconcileWithdrawalFinAcctgTransMap"/>
- <if-not-empty field="finAccountTrans.glReconciliationId">
+ </if-compare>
+ <if-compare field="finAccountTrans.finAccountTransTypeId" operator="equals" value="WITHDRAWAL">
+ <set-service-fields service-name="reconcileWithdrawalFinAcctgTrans" map="parameters" to-map="reconcileWithdrawalFinAcctgTransMap"/>
+ <set field="reconcileWithdrawalFinAcctgTransMap.finAccountTrans" from-field="finAccountTrans"/>
+ <call-service service-name="reconcileWithdrawalFinAcctgTrans" in-map-name="reconcileWithdrawalFinAcctgTransMap"/>
<set field="updateGlReconciliationMap.reconciledBalance" value="${glReconciliation.reconciledBalance - finAccountTrans.amount}"/>
- </if-not-empty>
- </if-compare>
-
- <set-service-fields service-name="setFinAccountTransStatus" map="finAccountTrans" to-map="setFinAccountTransStatusMap"/>
- <set field="setFinAccountTransStatusMap.statusId" value="FINACT_TRNS_APPROVED"/>
- <call-service service-name="setFinAccountTransStatus" in-map-name="setFinAccountTransStatusMap"/>
- <if-not-empty field="finAccountTrans.glReconciliationId">
+ </if-compare>
+ <set-service-fields service-name="setFinAccountTransStatus" map="finAccountTrans" to-map="setFinAccountTransStatusMap"/>
+ <set field="setFinAccountTransStatusMap.statusId" value="FINACT_TRNS_APPROVED"/>
+ <call-service service-name="setFinAccountTransStatus" in-map-name="setFinAccountTransStatusMap"/>
<set field="isGlReconciliationReconciledMap.glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
<call-service service-name="isGlReconciliationReconciled" in-map-name="isGlReconciliationReconciledMap">
<result-to-field result-name="isReconciled"/>
@@ -695,6 +686,10 @@
</if-empty>
</if-compare>
<call-service service-name="updateGlReconciliation" in-map-name="updateGlReconciliationMap"/>
+ <else>
+ <add-error><fail-property resource="AccountingUiLabels" property="AccountingReconciliationError"/></add-error>
+ <check-errors/>
+ </else>
</if-not-empty>
</simple-method>
@@ -712,6 +707,10 @@
</if-compare>
<get-related relation-name="AcctgTransEntry" list="acctgTransEntries" value-field="acctgTrans"/>
<iterate list="acctgTransEntries" entry="acctgTransEntry">
+ <set-service-fields service-name="createGlReconciliationEntry" map="acctgTransEntry" to-map="createGlReconciliationEntryMap"/>
+ <set field="createGlReconciliationEntryMap.glReconciliationId" from-field="finAccountTrans.glReconciliationId"/>
+ <set field="createGlReconciliationEntryMap.reconciledAmount" from-field="acctgTransEntry.amount"/>
+ <call-service service-name="createGlReconciliationEntry" in-map-name="createGlReconciliationEntryMap"/>
<set-service-fields service-name="updateAcctgTransEntry" map="acctgTransEntry" to-map="updateAcctgTransEntryMap"/>
<set field="updateAcctgTransEntryMap.reconcileStatusId" value="AES_RECONCILED"/>
<call-service service-name="updateAcctgTransEntry" in-map-name="updateAcctgTransEntryMap"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/ledger/GeneralLedgerServices.xml Tue Sep 1 21:33:41 2009
@@ -895,9 +895,12 @@
<call-class-method class-name="org.ofbiz.accounting.util.UtilAccounting" method-name="getDescendantGlAccountClassIds" ret-field="incomeAccountClassIds">
<field field="incomeGlAccountClass" type="GenericValue"/>
</call-class-method>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="isPosted" operator="equals" value="Y"/>
<condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId"/>
<condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate"/>
@@ -914,14 +917,14 @@
</entity-condition>
<set field="findCustomTimePeriodsMap.findDate" from-field="parameters.fromDate" type="Timestamp"/>
- <set field="findCustomTimePeriodsMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="findCustomTimePeriodsMap.organizationPartyId" from-field="organizationPartyId"/>
<call-service service-name="findCustomTimePeriods" in-map-name="findCustomTimePeriodsMap">
<result-to-field result-name="customTimePeriodList"/>
</call-service>
<first-from-list list="customTimePeriodList" entry="customTimePeriod"/>
<set field="acctgTransEntriesAndTransTotalMap.isPosted" value="Y"/>
- <set field="acctgTransEntriesAndTransTotalMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="acctgTransEntriesAndTransTotalMap.organizationPartyId" from-field="organizationPartyId"/>
<set field="acctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" from-field="customTimePeriod.fromDate" type="Timestamp"/>
<set field="acctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" from-field="parameters.thruDate" type="Timestamp"/>
@@ -1041,7 +1044,10 @@
</call-class-method>
<!-- retrieve the last closed date for the same type of time period -->
- <set field="findLastClosedDateInMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
+ <set field="findLastClosedDateInMap.organizationPartyId" from-field="organizationPartyId"/>
<set field="findLastClosedDateInMap.findDate" from-field="parameters.thruDate"/>
<call-service service-name="findLastClosedDate" in-map-name="findLastClosedDateInMap">
<result-to-field result-name="lastClosedDate"/>
@@ -1055,7 +1061,7 @@
<if-not-empty field="lastClosedTimePeriod">
<entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="customTimePeriodId" operator="equals" from-field="lastClosedTimePeriod.customTimePeriodId"/>
<condition-expr field-name="glAccountClassId" operator="in" from-field="assetAccountClassIds"/>
</condition-list>
@@ -1066,7 +1072,7 @@
</iterate>
<entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="customTimePeriodId" operator="equals" from-field="lastClosedTimePeriod.customTimePeriodId"/>
<condition-expr field-name="glAccountClassId" operator="in" from-field="liabilityAccountClassIds"/>
</condition-list>
@@ -1077,7 +1083,7 @@
</iterate>
<entity-condition entity-name="GlAccountAndHistory" list="glAccountAndHistories">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="customTimePeriodId" operator="equals" from-field="lastClosedTimePeriod.customTimePeriodId"/>
<condition-expr field-name="glAccountClassId" operator="in" from-field="equityAccountClassIds"/>
</condition-list>
@@ -1090,7 +1096,7 @@
<entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="isPosted" operator="equals" value="Y"/>
<condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId"/>
<condition-expr field-name="transactionDate" operator="greater-equals" from-field="lastClosedDate"/>
@@ -1117,7 +1123,7 @@
</iterate>
<entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="isPosted" operator="equals" value="Y"/>
<condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId"/>
<condition-expr field-name="transactionDate" operator="greater-equals" from-field="lastClosedDate"/>
@@ -1144,7 +1150,7 @@
</iterate>
<entity-condition entity-name="AcctgTransAndEntries" list="acctgTransAndEntries">
<condition-list combine="and">
- <condition-expr field-name="organizationPartyId" operator="equals" from-field="parameters.organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="in" from-field="partyIds"/>
<condition-expr field-name="isPosted" operator="equals" value="Y"/>
<condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId"/>
<condition-expr field-name="transactionDate" operator="greater-equals" from-field="lastClosedDate"/>
@@ -1171,7 +1177,7 @@
</iterate>
<!-- retrieve the last closed date for the same type of time period -->
- <set field="prepareIncomeStatementInMap.organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="prepareIncomeStatementInMap.organizationPartyId" from-field="organizationPartyId"/>
<set field="prepareIncomeStatementInMap.glFiscalTypeId" from-field="parameters.glFiscalTypeId"/>
<set field="prepareIncomeStatementInMap.fromDate" from-field="lastClosedDate"/>
<set field="prepareIncomeStatementInMap.thruDate" from-field="parameters.thruDate"/>
@@ -1180,7 +1186,7 @@
</call-service>
<!-- get the retained earnings account -->
<entity-one entity-name="GlAccountTypeDefault" value-field="retainedEarningsAccount" use-cache="true">
- <field-map field-name="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <field-map field-name="organizationPartyId"/>
<field-map field-name="glAccountTypeId" value="RETAINED_EARNINGS"/>
</entity-one>
<if-not-empty field="retainedEarningsAccount">
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Tue Sep 1 21:33:41 2009
@@ -91,7 +91,7 @@
<set-nonpk-fields value-field="newPayment" map="parameters"/>
<!-- fields :- comments, paymentRefNum, finAccountTransId, statusId can editable for Payment -->
<set field="oldPayment.statusId" from-field="newPayment.statusId"/>
- <set field="oldPayment.comments" from-field="newPayment.commets"/>
+ <set field="oldPayment.comments" from-field="newPayment.comments"/>
<set field="oldPayment.paymentRefNum" from-field="newPayment.paymentRefNum" set-if-null="true"/>
<set field="oldPayment.finAccountTransId" from-field="newPayment.finAccountTransId" set-if-null="true"/>
<if-compare-field field="oldPayment" to-field="newPayment" operator="not-equals">
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml Tue Sep 1 21:33:41 2009
@@ -71,4 +71,143 @@
</iterate>
<log level="info" message="Commission Invoice ${invoicesCreated} is created successfully for ${partyIds}"/>
</simple-method>
+
+ <simple-method method-name="testGlPostingOnCancelInvoice" short-description="Test case to verify GL postings for Cancel Invoice functionality" login-required="false">
+ <!-- Precondition :
+ * Invoice is in ready status so accounting transaction is already posted to the GL
+ * GL Accounts associated with Invoice :8008 are ACCOUNTS PAYABLE and UNINVOICED ITEM RECEIPTS
+ * Credit in account 210000 - ACCOUNTS PAYABLE ;debitTotal $303.41 ; creditTotal:$1651.7 ; debitCreditDifference : $ -1348.42
+ * Debit in account 214000 - UNINVOICED ITEM RECEIPTS;debitTotal :$408 ; creditTotal:$48 ; debitCreditDifference : $360
+ -->
+
+ <!-- Post condition : After Cancel Invoice process reverse accounting transactions are automatically posted to the GL.
+ * ACCOUNTS PAYABLE 210000 - debitTotal $351.41 ; creditTotal:$1651.7 ; debitCreditDifference : $ -1300
+ * UNINVOICED ITEM RECEIPTS 214000 - debitTotal :$408 ; creditTotal:$96 ; debitCreditDifference : $312
+ -->
+ <entity-one entity-name="UserLogin" value-field="userLogin">
+ <field-map field-name="userLoginId" value="system"/>
+ </entity-one>
+ <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2009-01-01 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="payableDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
+ </call-service>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="214000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="uninvoicedDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="uninvoicedCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="uninvoicedDebitCreditDifference"/>
+ </call-service>
+ <log level="info" message="BEFORE RUNNING CANCEL INVOICE : ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
+ <log level="info" message="BEFORE RUNNING CANCEL INVOICE :UNINVOICED RECEIPTS;debitTotal :${uninvoicedDebitTotal} ; creditTotal:${uninvoicedCreditTotal} ; debitCreditDifference : ${uninvoicedDebitCreditDifference}"/>
+ <set field="invoiceId" value="8008"/>
+ <set field="cancelInvoiceMap.userLogin" from-field="userLogin"/>
+ <set field="cancelInvoiceMap.invoiceId" from-field="invoiceId"/>
+ <call-service service-name="cancelInvoice" in-map-name="cancelInvoiceMap"/>
+
+ <set field="totalPayableDebitAmount" value="${payableDebitTotal + 48}" type="BigDecimal"/>
+ <set field="totalPayableDebitCreditDifference" value="${payableDebitCreditDifference + 48}" type="BigDecimal"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="payableDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
+ </call-service>
+ <assert>
+ <if-compare-field field="totalPayableDebitAmount" operator="equals" to-field="payableDebitTotal" type="BigDecimal"/>
+ <if-compare-field field="totalPayableDebitCreditDifference" operator="equals" to-field="payableDebitCreditDifference" type="BigDecimal"/>
+ </assert>
+ <check-errors/>
+ <set field="totalUnInvoicedCreditAmount" value="${uninvoicedCreditTotal + 48}" type="BigDecimal"/>
+ <set field="totalUnInvoicedDebitCreditDifference" value="${uninvoicedDebitCreditDifference - 48}" type="BigDecimal"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="214000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="uninvoicedDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="uninvoicedCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="uninvoicedDebitCreditDifference"/>
+ </call-service>
+ <assert>
+ <if-compare-field field="totalUnInvoicedCreditAmount" operator="equals" to-field="uninvoicedCreditTotal" type="BigDecimal"/>
+ <if-compare-field field="totalUnInvoicedDebitCreditDifference" operator="equals" to-field="uninvoicedDebitCreditDifference" type="BigDecimal"/>
+ </assert>
+ <check-errors/>
+ <log level="info" message="AFTER RUNNING CANCEL INVOICE : ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
+ <log level="info" message="AFTER RUNNING CANCEL INVOICE : UNINVOICED RECEIPTS ;debitTotal :${uninvoicedDebitTotal} ; creditTotal:${uninvoicedCreditTotal} ; debitCreditDifference : ${uninvoicedDebitCreditDifference}"/>
+ </simple-method>
+
+ <simple-method method-name="testGlPostingOnCancelCheckRun" short-description="Test case to verify GL postings for Cancel Check Run functionality" login-required="false">
+ <!-- Precondition :
+ * Two invoices are associated with PaymentGroupId 9000 which are 8001 and 8002
+ * Invoices are in ready status so accounting transactions are already posted to the GL
+ * GL Accounts associated with Invoices are ACCOUNTS PAYABLE and UNDEPOSITED RECEIPTS
+ * ACCOUNTS PAYABLE 210000 - debitTotal $351.41 ; creditTotal:$1651.7 ; debitCreditDifference : $ -1300
+ * UNDEPOSITED RECEIPTS 112000 - debitTotal :$40 ; creditTotal:$116.85 ; debitCreditDifference : $ -76.85
+ -->
+
+ <!-- Post condition : After Cancel Check Run process accounting transactions are automatically posted to the GL.
+ * ACCOUNTS PAYABLE 210000 - debitTotal $468.55 ; creditTotal:$1885.4 ; debitCreditDifference : $ -1416.5
+ * UNDEPOSITED RECEIPTS 112000 - debitTotal :$156.85 ; creditTotal:$116.85 ; debitCreditDifference : $40
+ -->
+ <entity-one entity-name="UserLogin" value-field="userLogin">
+ <field-map field-name="userLoginId" value="system"/>
+ </entity-one>
+ <set field="getAcctgTransEntriesAndTransTotalMap.userLogin" from-field="userLogin"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.organizationPartyId" value="Company"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodStartDate" value="2009-01-01 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.customTimePeriodEndDate" value="2009-12-31 16:55:01.0" type="Timestamp"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="payableDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
+ </call-service>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="112000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="undepositedDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="undepositedCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="undepositedDebitCreditDifference"/>
+ </call-service>
+ <log level="info" message="BEFORE RUNNING CANCEL CHECK RUN : ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
+ <log level="info" message="BEFORE RUNNING CANCEL CHECK RUN : UNDEPOSITED RECEIPTS ;debitTotal :${undepositedDebitTotal} ; creditTotal:${undepositedCreditTotal} ; debitCreditDifference : ${undepositedDebitCreditDifference}"/>
+ <set field="paymentGroupId" value="9000"/>
+ <set field="cancelCheckRunPaymentsMap.userLogin" from-field="userLogin"/>
+ <set field="cancelCheckRunPaymentsMap.paymentGroupId" from-field="paymentGroupId"/>
+ <call-service service-name="cancelCheckRunPayments" in-map-name="cancelCheckRunPaymentsMap"/>
+ <set field="totalPayableDebitAmount" value="${payableDebitTotal + 116.85}" type="BigDecimal"/>
+ <set field="totalPayableCreditAmount" value="${payableCreditTotal + 233.7}" type="BigDecimal"/>
+ <set field="totalPayableDebitCreditDifference" value="${payableDebitCreditDifference -116.85}" type="BigDecimal"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="210000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="payableDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="payableCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="payableDebitCreditDifference"/>
+ </call-service>
+ <assert>
+ <if-compare-field field="totalPayableDebitAmount" operator="equals" to-field="payableDebitTotal" type="BigDecimal"/>
+ <if-compare-field field="totalPayableCreditAmount" operator="equals" to-field="payableCreditTotal" type="BigDecimal"/>
+ <if-compare-field field="totalPayableDebitCreditDifference" operator="equals" to-field="payableDebitCreditDifference" type="BigDecimal"/>
+ </assert>
+ <check-errors/>
+ <set field="totalUndepositedDebitAmount" value="${undepositedDebitTotal + 116.85}" type="BigDecimal"/>
+ <set field="totalUndepositedDebitCreditDifference" value="${undepositedDebitCreditDifference + 116.85}" type="BigDecimal"/>
+ <set field="getAcctgTransEntriesAndTransTotalMap.glAccountId" value="112000"/>
+ <call-service service-name="getAcctgTransEntriesAndTransTotal" in-map-name="getAcctgTransEntriesAndTransTotalMap">
+ <result-to-field result-name="debitTotal" field="undepositedDebitTotal"/>
+ <result-to-field result-name="creditTotal" field="undepositedCreditTotal"/>
+ <result-to-field result-name="debitCreditDifference" field="undepositedDebitCreditDifference"/>
+ </call-service>
+ <assert>
+ <if-compare-field field="totalUndepositedDebitAmount" operator="equals" to-field="undepositedDebitTotal" type="BigDecimal"/>
+ <if-compare-field field="totalUndepositedDebitCreditDifference" operator="equals" to-field="undepositedDebitCreditDifference" type="BigDecimal"/>
+ </assert>
+ <check-errors/>
+ <log level="info" message="AFTER RUNNING CANCEL CHECK RUN: ACCOUNTS PAYABLE ;debitTotal :${payableDebitTotal} ; creditTotal:${payableCreditTotal} ; debitCreditDifference : ${payableDebitCreditDifference}"/>
+ <log level="info" message="AFTER RUNNING CANCEL CHECK RUN : UNDEPOSITED RECEIPTS ;debitTotal :${undepositedDebitTotal} ; creditTotal:${undepositedCreditTotal} ; debitCreditDifference : ${undepositedDebitCreditDifference}"/>
+ </simple-method>
+
</simple-methods>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas.xml Tue Sep 1 21:33:41 2009
@@ -153,10 +153,6 @@
<condition field-name="productTypeId" operator="equals" value="ASSET_USAGE"/>
<action service="createFixedAssetAndLinkToProduct" mode="sync"/>
</eca>
- <eca service="createPaymentApplication" event="commit">
- <condition field-name="invoiceId" operator="is-not-empty"/>
- <action service="createAcctgTransAndEntriesForPaymentApplication" mode="sync"/>
- </eca>
<eca service="setInvoiceStatus" event="commit">
<condition field-name="invoiceId" operator="is-not-empty"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/servicedef/secas_ledger.xml Tue Sep 1 21:33:41 2009
@@ -133,4 +133,9 @@
<condition field-name="statusId" operator="equals" value="INVOICE_CANCELLED"/>
<action service="cancelInvoice" mode="sync"/>
</eca>
+
+ <eca service="createPaymentApplication" event="commit">
+ <condition field-name="invoiceId" operator="is-not-empty"/>
+ <action service="createAcctgTransAndEntriesForPaymentApplication" mode="sync"/>
+ </eca>
</service-eca>
\ No newline at end of file
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/testdef/invoicetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/testdef/invoicetests.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/testdef/invoicetests.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/testdef/invoicetests.xml Tue Sep 1 21:33:41 2009
@@ -24,4 +24,15 @@
<test-case case-name="auto-tests-CommissionRun">
<simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml" name="testCommissionRun"/>
</test-case>
+
+ <!--Test case to verify GL postings for Cancel Invoice process-->
+ <test-case case-name="auto-tests-glPostingOnCancelInvoice">
+ <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml" name="testGlPostingOnCancelInvoice"/>
+ </test-case>
+
+ <!--Test case to verify GL postings for Cancel Check Run process-->
+ <test-case case-name="auto-tests-glPostingOnCancelCheckRun">
+ <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoInvoiceTests.xml" name="testGlPostingOnCancelCheckRun"/>
+ </test-case>
+
</test-suite>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy Tue Sep 1 21:33:41 2009
@@ -35,7 +35,7 @@
decimals = UtilNumber.getBigDecimalScale("ledger.decimals");
rounding = UtilNumber.getBigDecimalRoundingMode("ledger.rounding");
-exprs = [EntityCondition.makeCondition("organizationPartyId", EntityOperator.EQUALS, organizationPartyId)];
+exprs = [EntityCondition.makeCondition("organizationPartyId", EntityOperator.IN, partyIds)];
if (fromDate) {
exprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
} else return;
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Tue Sep 1 21:33:41 2009
@@ -57,6 +57,8 @@
<field-map field-name="inputFields" from-field="requestParameters"/>
<field-map field-name="entityName" from-field="entityName"/>
<field-map field-name="orderBy" from-field="parameters.sortField"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="Agreement" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Tue Sep 1 21:33:41 2009
@@ -27,6 +27,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="FixedAsset"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="fixedAssetId" widget-style="linktext">
@@ -334,6 +336,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="FixedAssetMaint"/>
<field-map field-name="orderBy" value="-maintHistSeqId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="maintHistSeqId">
@@ -423,6 +427,8 @@
<field-map field-name="inputFields" from-field="findParams"/>
<field-map field-name="entityName" value="FixedAssetMeter"/>
<field-map field-name="orderBy" value="-readingDate"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="fixedAssetId"><hidden/></field>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Tue Sep 1 21:33:41 2009
@@ -53,6 +53,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="InvoiceAndType"/>
<field-map field-name="orderBy" from-field="parameters.sortField"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<row-actions>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Tue Sep 1 21:33:41 2009
@@ -42,6 +42,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="FixedAsset"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="fixedAssetId" widget-style="buttontext">
@@ -67,6 +69,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="BillingAccount"/>
<field-map field-name="orderBy" value="billingAccountId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext">
@@ -104,6 +108,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="GlAccount"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}" widget-style="buttontext">
@@ -130,6 +136,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Payment"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="paymentId" widget-style="buttontext">
@@ -172,6 +180,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Invoice"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="invoiceId" widget-style="buttontext">
@@ -233,6 +243,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="AgreementItem"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="agreementId"><display/></field>
@@ -258,6 +270,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PaymentGroupMember"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="paymentGroupId" widget-style="buttontext">
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/webapp/accounting/payment/PaymentForms.xml Tue Sep 1 21:33:41 2009
@@ -54,6 +54,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PaymentAndType"/>
<field-map field-name="orderBy" value="effectiveDate DESC"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<row-actions>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/FinAccountForms.xml Tue Sep 1 21:33:41 2009
@@ -46,6 +46,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="FinAccount"/>
<field-map field-name="orderBy" value="finAccountId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="FinAccount" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlForms.xml Tue Sep 1 21:33:41 2009
@@ -755,14 +755,14 @@
</actions>
<field name="acctgTransId">
- <hyperlink also-hidden="false" description="${acctgTransId}" target="EditAcctgTrans">
+ <hyperlink description="${acctgTransId}" target="EditAcctgTrans">
<parameter param-name="acctgTransId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
<field name="acctgTransEntrySeqId"><display/></field>
<field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}" also-hidden="false">
+ <hyperlink target="GlAccountNavigate" description="${glAccountId}">
<parameter param-name="glAccountId"/>
</hyperlink>
</field>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlSetupForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlSetupForms.xml Tue Sep 1 21:33:41 2009
@@ -1040,6 +1040,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="GlAccountCategory"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="glAccountCategoryId" widget-style="buttontext">
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/GlobalGlAccountsForms.xml Tue Sep 1 21:33:41 2009
@@ -29,6 +29,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
@@ -72,6 +74,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName"/>
<field-map field-name="noConditionFind" value="Y"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGatewayConfigForms.xml Tue Sep 1 21:33:41 2009
@@ -43,6 +43,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PaymentGatewayConfig"/>
<field-map field-name="orderBy" value="description"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PaymentGatewayConfig" default-field-type="display"/>
@@ -326,6 +328,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PaymentGatewayConfigType"/>
<field-map field-name="orderBy" value="description DESC"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PaymentGatewayConfigType" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/PaymentGroupForms.xml Tue Sep 1 21:33:41 2009
@@ -35,6 +35,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PaymentGroup"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<row-actions>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/ReportFinancialSummaryScreens.xml Tue Sep 1 21:33:41 2009
@@ -561,6 +561,8 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TransactionTotals"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<service service-name="getPartyAccountingPreferences" result-map="result" auto-field-map="true"/>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
@@ -643,6 +645,8 @@
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
@@ -669,6 +673,8 @@
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
<set field="thruDate" from-field="parameters.thruDate" type="Timestamp"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
@@ -913,6 +919,8 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="MonthlyTrialBalance"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy"/>
<set field="financialYearFromDate" from-field="financialYearFromDate" type="Timestamp"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
@@ -986,6 +994,8 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" type="String"/>
+ <set field="partyIds" value="${groovy:org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, 'GROUP_ROLLUP')}" type="List"/>
+ <set field="partyIds[]" from-field="organizationPartyId"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/MonthlyTrialBalance.groovy"/>
<set field="financialYearFromDate" from-field="financialYearFromDate" type="Timestamp"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/TaxAuthorityForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/TaxAuthorityForms.xml Tue Sep 1 21:33:41 2009
@@ -339,6 +339,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="orderBy" value="partyId"/>
<field-map field-name="entityName" value="PartyTaxAuthInfo"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/TransactionForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/TransactionForms.xml Tue Sep 1 21:33:41 2009
@@ -72,6 +72,8 @@
<field-map field-name="inputFields" from-field="requestParameters"/>
<field-map field-name="entityName" from-field="entityName"/>
<field-map field-name="orderBy" from-field="orderBy"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PaymentGatewayResponse" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/accounting/widget/ap/forms/VendorForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/accounting/widget/ap/forms/VendorForms.xml Tue Sep 1 21:33:41 2009
@@ -26,6 +26,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Vendor"/>
<field-map field-name="orderBy" value="partyId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
Modified: ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/commonext/ofbiz-component.xml Tue Sep 1 21:33:41 2009
@@ -25,7 +25,7 @@
<classpath type="dir" location="config"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/EntityDiagramGroupData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtSeedData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>