You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/01/25 19:33:56 UTC
svn commit: r737563 [2/3] - in /ofbiz/trunk/applications/accounting:
script/org/ofbiz/accounting/invoice/ script/org/ofbiz/accounting/payment/
script/org/ofbiz/accounting/tax/ script/org/ofbiz/accounting/test/
webapp/accounting/agreement/ webapp/accoun...
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Sun Jan 25 18:33:55 2009
@@ -82,11 +82,11 @@
<set field="taxAuthPartyId" from-field="parameters.taxAuthPartyId"/>
<set field="taxAuthGeoId" from-field="parameters.taxAuthGeoId"/>
- <entity-one entity-name="TaxAuthority" value-name="taxAuthority"/>
- <entity-one entity-name="PartyNameView" value-name="taxAuthPartyName" auto-field-map="false">
- <field-map field-name="partyId" env-name="taxAuthority.taxAuthPartyId"/>
+ <entity-one entity-name="TaxAuthority" value-field="taxAuthority"/>
+ <entity-one entity-name="PartyNameView" value-field="taxAuthPartyName" auto-field-map="false">
+ <field-map field-name="partyId" from-field="taxAuthority.taxAuthPartyId"/>
</entity-one>
- <get-related-one value-name="taxAuthority" relation-name="TaxAuthGeo" to-value-name="taxAuthGeo" use-cache="true"/>
+ <get-related-one value-field="taxAuthority" relation-name="TaxAuthGeo" to-value-field="taxAuthGeo" use-cache="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -100,8 +100,8 @@
<section>
<condition>
<and>
- <not><if-empty field-name="taxAuthPartyId"/></not>
- <not><if-empty field-name="taxAuthGeoId"/></not>
+ <not><if-empty field="taxAuthPartyId"/></not>
+ <not><if-empty field="taxAuthGeoId"/></not>
</and>
</condition>
<widgets>
@@ -133,7 +133,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="organizationPartyId"/></not>
+ <not><if-empty field="organizationPartyId"/></not>
</condition>
<widgets>
<include-menu name="PartyTopTabBar" location="component://accounting/widget/Menus.xml"/>
@@ -150,8 +150,8 @@
<section>
<actions>
<set field="tabButtonItemTop" value="PartyAccounts"/>
- <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
- <field-map field-name="partyId" env-name="organizationPartyId"/>
+ <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" from-field="organizationPartyId"/>
</entity-one>
</actions>
<widgets>
@@ -172,8 +172,8 @@
<section>
<actions>
<set field="tabButtonItemTop" value="PartyAccounts"/>
- <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
- <field-map field-name="partyId" env-name="organizationPartyId"/>
+ <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" from-field="organizationPartyId"/>
</entity-one>
</actions>
<widgets>
@@ -195,8 +195,8 @@
<section>
<actions>
<set field="tabButtonItemTop" value="PartyAccounts"/>
- <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
- <field-map field-name="partyId" env-name="organizationPartyId"/>
+ <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" from-field="organizationPartyId"/>
</entity-one>
</actions>
<widgets>
@@ -218,20 +218,20 @@
<section>
<actions>
<set field="headerItem" value="main"/>
- <entity-condition entity-name="PaymentType" list-name="paymentTypes">
+ <entity-condition entity-name="PaymentType" list="paymentTypes">
<order-by field-name="paymentTypeId"/>
</entity-condition>
- <entity-condition entity-name="InvoiceType" list-name="invoiceTypes">
+ <entity-condition entity-name="InvoiceType" list="invoiceTypes">
<order-by field-name="invoiceTypeId"/>
</entity-condition>
- <entity-condition entity-name="PaymentMethodType" list-name="paymentMethodTypes">
+ <entity-condition entity-name="PaymentMethodType" list="paymentMethodTypes">
<order-by field-name="paymentMethodTypeId"/>
</entity-condition>
- <entity-condition entity-name="StatusItem" list-name="invoiceStatus">
+ <entity-condition entity-name="StatusItem" list="invoiceStatus">
<condition-expr field-name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
<order-by field-name="statusId"/>
</entity-condition>
- <entity-condition entity-name="StatusItem" list-name="paymentStatus">
+ <entity-condition entity-name="StatusItem" list="paymentStatus">
<condition-expr field-name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
<order-by field-name="statusId"/>
</entity-condition>
Modified: ofbiz/trunk/applications/accounting/widget/CostScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CostScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CostScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CostScreens.xml Sun Jan 25 18:33:55 2009
@@ -30,8 +30,8 @@
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
- <entity-condition entity-name="CostComponentCalc" list-name="allCostComponentCalcs"/>
- <entity-one entity-name="CostComponentCalc" value-name="costComponentCalc"/>
+ <entity-condition entity-name="CostComponentCalc" list="allCostComponentCalcs"/>
+ <entity-one entity-name="CostComponentCalc" value-field="costComponentCalc"/>
</actions>
<widgets>
<decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Sun Jan 25 18:33:55 2009
@@ -41,8 +41,8 @@
<form name="ListFinAccounts" type="list" separate-columns="true" default-entity-name="FinAccount" list-name="listIt" paginate-target="FindFinAccount" paginate="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <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="FinAccount"/>
<field-map field-name="orderBy" value="fromDate"/>
</service>
@@ -58,8 +58,8 @@
<form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
- <field-map field-name="statusId" env-name="finAccount.statusId"/>
+ <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
+ <field-map field-name="statusId" from-field="finAccount.statusId"/>
</entity-one>
</actions>
<alt-target use-when="finAccount==null" target="createFinAccount"/>
@@ -117,7 +117,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FinAccountRole">
- <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <condition-expr field-name="finAccountId" from-field="finAccountId"/>
<order-by field-name="finAccountId"/>
</entity-condition>
</actions>
@@ -153,7 +153,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FinAccountTrans">
- <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <condition-expr field-name="finAccountId" from-field="finAccountId"/>
</entity-condition>
</actions>
<auto-fields-entity entity-name="FinAccountTrans" default-field-type="display"/>
@@ -185,7 +185,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="FinAccountAuth">
- <condition-expr field-name="finAccountId" env-name="finAccountId"/>
+ <condition-expr field-name="finAccountId" from-field="finAccountId"/>
<order-by field-name="finAccountAuthId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sun Jan 25 18:33:55 2009
@@ -37,7 +37,7 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field-name="finAccountId"/></not></condition>
+ <condition><not><if-empty field="finAccountId"/></not></condition>
<widgets>
<include-menu name="FinAccountTabBar" location="component://accounting/widget/Menus.xml"/>
</widgets>
@@ -95,7 +95,7 @@
<set field="tabButtonItem" value="EditFinAccount"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
</actions>
<widgets>
<decorator-screen name="CommonFinAccountDecorator" location="${parameters.finAccountDecoratorLocation}">
@@ -110,7 +110,7 @@
</container>
<container style="screenlet-body">
<section>
- <condition><not><if-empty field-name="finAccountId"/></not></condition>
+ <condition><not><if-empty field="finAccountId"/></not></condition>
<widgets>
<container style="button-bar">
<link target="EditFinAccount" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.AccountingFinAccount}" style="buttontext"/>
@@ -134,7 +134,7 @@
<set field="titleProperty" value="PageTitleEditFinAccountRole"/>
<set field="tabButtonItem" value="EditFinAccountRoles"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="roleTypeId" from-field="parameters.roleTypeId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
@@ -158,7 +158,7 @@
<set field="titleProperty" value="PageTitleEditFinAccountTrans"/>
<set field="tabButtonItem" value="EditFinAccountTrans"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<set field="finAccountTransId" from-field="parameters.finAccountTransId"/>
</actions>
<widgets>
@@ -180,7 +180,7 @@
<set field="titleProperty" value="PageTitleEditFinAccountAuths"/>
<set field="tabButtonItem" value="EditFinAccountAuths"/>
<set field="finAccountId" from-field="parameters.finAccountId"/>
- <entity-one entity-name="FinAccount" value-name="finAccount"/>
+ <entity-one entity-name="FinAccount" value-field="finAccount"/>
<set field="finAccountAuthId" from-field="parameters.finAccountAuthId"/>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sun Jan 25 18:33:55 2009
@@ -31,7 +31,7 @@
<decorator-section name="pre-body">
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<include-menu name="FixedAssetTabBar" location="component://accounting/widget/Menus.xml"/>
@@ -47,7 +47,7 @@
<widgets>
<section>
<condition>
- <not><if-empty field-name="fixedAssetId"/></not>
+ <not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
<container style="h1"><label text="${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container>
@@ -125,7 +125,7 @@
<set field="titleProperty" value="PageTitleEditFixedAsset"/>
<set field="tabButtonItem" value="EditFixedAsset"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -154,9 +154,9 @@
<set field="labelTitleProperty" value="AccountingFixedAssetProducts"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-condition entity-name="FixedAssetProduct" list-name="fixedAssetProducts" >
- <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-condition entity-name="FixedAssetProduct" list="fixedAssetProducts" >
+ <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
<order-by field-name="productId"/>
<order-by field-name="fixedAssetProductTypeId"/>
<order-by field-name="fromDate"/>
@@ -181,7 +181,7 @@
<actions>
<set field="tabButtonItem" value="ListFixedAssetCalendar"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -253,7 +253,7 @@
<actions>
<set field="tabButtonItem" value="ListFixedAssetCalendar"/>
<set field="titleProperty" value="PageTitleWorkEffortRelatedSummary"/>
- <entity-one entity-name="WorkEffort" value-name="workEffort"/>
+ <entity-one entity-name="WorkEffort" value-field="workEffort"/>
<set field="fixedAssetId" from-field="workEffort.fixedAssetId"/>
</actions>
<widgets>
@@ -275,7 +275,7 @@
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
- <entity-one entity-name="FixedAsset" value-name="fixedAsset" auto-field-map="true"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset" auto-field-map="true"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -299,7 +299,7 @@
<set field="labelTitleProperty" value="PageTitleEditFixedAssetIdents"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fixedAssetIdentTypeId" from-field="parameters.fixedAssetIdentTypeId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -322,7 +322,7 @@
<set field="labelTitleProperty" value="PageTitleEditFixedAssetRegistrations"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -346,7 +346,7 @@
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
<decorator-section name="pre-body">
<section>
- <condition><not><if-empty field-name="maintHistSeqId"/></not></condition>
+ <condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<include-menu name="FixedAssetMaintTabBar" location="component://accounting/widget/Menus.xml"/>
</widgets>
@@ -367,7 +367,7 @@
<set field="labelTitleProperty" value="PageTitleListFixedAssetMaints"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -388,12 +388,12 @@
<set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
</actions>
<widgets>
<section>
- <condition><if-empty field-name="maintHistSeqId"/></condition>
+ <condition><if-empty field="maintHistSeqId"/></condition>
<actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions>
<widgets/>
</section>
@@ -402,7 +402,7 @@
<section>
<condition>
<and>
- <not><if-empty field-name="maintHistSeqId"/></not>
+ <not><if-empty field="maintHistSeqId"/></not>
<if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
</and>
</condition>
@@ -426,8 +426,8 @@
<set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}">
@@ -451,7 +451,7 @@
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="trail" from-field="parameters.trail" default-value="${parameters.fixedAssetId}"/>
<set field="fixedAssetId" from-field="parameters.trail"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
@@ -475,9 +475,9 @@
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
<set field="orderId" from-field="parameters.orderId"/>
<set field="orderItemSeqId" from-field="parameters.orderItemSeqId"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/>
- <entity-one entity-name="FixedAssetMaintOrder" value-name="fixedAssetMaintOrder"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="FixedAssetMaint" value-field="fixedAssetMaint"/>
+ <entity-one entity-name="FixedAssetMaintOrder" value-field="fixedAssetMaintOrder"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}">
@@ -502,8 +502,8 @@
<set field="partyId" from-field="parameters.partyId"/>
<set field="roleTypeId" from-field="parameters.roleTypeId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
- <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <entity-one entity-name="PartyFixedAssetAssignment" value-name="partyFixedAssetAssignment"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+ <entity-one entity-name="PartyFixedAssetAssignment" value-field="partyFixedAssetAssignment"/>
</actions>
<widgets>
<decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}">
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sun Jan 25 18:33:55 2009
@@ -66,21 +66,21 @@
<form name="ListAcctgTrans" type="list" title="List Accounting Transactions" list-name="acctgTransList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="AcctgTransAndEntries" list-name="acctgTransList" distinct="true">
+ <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransList" distinct="true">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glJournalId" operator="equals" env-name="parameters.glJournalId" ignore-if-empty="true"/>
- <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
- <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/>
- <condition-expr field-name="paymentId" operator="equals" env-name="parameters.paymentId" ignore-if-empty="true"/>
- <condition-expr field-name="productId" operator="equals" env-name="parameters.productId" ignore-if-empty="true"/>
- <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId" ignore-if-empty="true"/>
- <condition-expr field-name="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
- <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
+ <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/>
+ <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/>
+ <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/>
+ <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/>
+ <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/>
+ <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/>
+ <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
<select-field field-name="acctgTransId"/>
<select-field field-name="transactionDate"/>
@@ -216,23 +216,23 @@
<form name="ListFindAcctgTransEntriesByAccount" type="list" title="List Accounting Transaction Entries" list-name="acctgTransEntryList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="AcctgTransAndEntries" list-name="acctgTransEntryList">
+ <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransEntryList">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="glAccountId" operator="equals" env-name="parameters.glAccountId" ignore-if-empty="true"/>
- <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glJournalId" operator="equals" env-name="parameters.glJournalId" ignore-if-empty="true"/>
- <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
- <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
- <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/>
- <condition-expr field-name="paymentId" operator="equals" env-name="parameters.paymentId" ignore-if-empty="true"/>
- <condition-expr field-name="productId" operator="equals" env-name="parameters.productId" ignore-if-empty="true"/>
- <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId" ignore-if-empty="true"/>
- <condition-expr field-name="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
- <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
+ <condition-expr field-name="glAccountId" operator="equals" from-field="parameters.glAccountId" ignore-if-empty="true"/>
+ <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/>
+ <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/>
+ <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/>
+ <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/>
+ <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/>
+ <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/>
+ <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="glAccountId"/>
<order-by field-name="-transactionDate"/>
@@ -288,23 +288,23 @@
<form name="ListFindAcctgTransEntriesByDate" type="list" title="List Accounting Transaction Entries" list-name="acctgTransEntryList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="AcctgTransAndEntries" list-name="acctgTransEntryList">
+ <entity-condition entity-name="AcctgTransAndEntries" list="acctgTransEntryList">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="glAccountId" operator="equals" env-name="parameters.glAccountId" ignore-if-empty="true"/>
- <condition-expr field-name="acctgTransTypeId" operator="equals" env-name="parameters.acctgTransTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glFiscalTypeId" operator="equals" env-name="parameters.glFiscalTypeId" ignore-if-empty="true"/>
- <condition-expr field-name="glJournalId" operator="equals" env-name="parameters.glJournalId" ignore-if-empty="true"/>
- <condition-expr field-name="isPosted" operator="equals" env-name="parameters.isPosted" ignore-if-empty="true"/>
- <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
- <condition-expr field-name="invoiceId" operator="equals" env-name="parameters.invoiceId" ignore-if-empty="true"/>
- <condition-expr field-name="paymentId" operator="equals" env-name="parameters.paymentId" ignore-if-empty="true"/>
- <condition-expr field-name="productId" operator="equals" env-name="parameters.productId" ignore-if-empty="true"/>
- <condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId" ignore-if-empty="true"/>
- <condition-expr field-name="shipmentId" operator="equals" env-name="parameters.shipmentId" ignore-if-empty="true"/>
- <condition-expr field-name="acctgTransId" operator="equals" env-name="parameters.acctgTransId" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
- <condition-expr field-name="transactionDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
+ <condition-expr field-name="glAccountId" operator="equals" from-field="parameters.glAccountId" ignore-if-empty="true"/>
+ <condition-expr field-name="acctgTransTypeId" operator="equals" from-field="parameters.acctgTransTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glFiscalTypeId" operator="equals" from-field="parameters.glFiscalTypeId" ignore-if-empty="true"/>
+ <condition-expr field-name="glJournalId" operator="equals" from-field="parameters.glJournalId" ignore-if-empty="true"/>
+ <condition-expr field-name="isPosted" operator="equals" from-field="parameters.isPosted" ignore-if-empty="true"/>
+ <condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId" ignore-if-empty="true"/>
+ <condition-expr field-name="invoiceId" operator="equals" from-field="parameters.invoiceId" ignore-if-empty="true"/>
+ <condition-expr field-name="paymentId" operator="equals" from-field="parameters.paymentId" ignore-if-empty="true"/>
+ <condition-expr field-name="productId" operator="equals" from-field="parameters.productId" ignore-if-empty="true"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="parameters.workEffortId" ignore-if-empty="true"/>
+ <condition-expr field-name="shipmentId" operator="equals" from-field="parameters.shipmentId" ignore-if-empty="true"/>
+ <condition-expr field-name="acctgTransId" operator="equals" from-field="parameters.acctgTransId" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/>
+ <condition-expr field-name="transactionDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-transactionDate"/>
</entity-condition>
@@ -659,7 +659,7 @@
<actions>
<entity-condition entity-name="AcctgTransEntry">
<condition-list>
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<condition-expr field-name="reconcileStatusId" operator="equals" value="AES_NOT_RECONCILED"/>
<condition-expr field-name="glAccountId" operator="equals" value="${glAccountId}"/>
</condition-list>
@@ -694,7 +694,7 @@
<actions>
<entity-condition entity-name="GlReconciliationEntry">
<condition-list>
- <condition-expr field-name="glReconciliationId" env-name="glReconciliationId"/>
+ <condition-expr field-name="glReconciliationId" from-field="glReconciliationId"/>
</condition-list>
</entity-condition>
</actions>
@@ -725,8 +725,8 @@
<entity-condition entity-name="GlReconciliation">
<condition-list>
<condition-expr field-name="glAccountId" operator="equals" value="${glAccountId}"/>
- <condition-expr field-name="reconciledDate" operator="greater-equals" env-name="parameters.fromDate" ignore-if-empty="true"/>
- <condition-expr field-name="reconciledDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+ <condition-expr field-name="reconciledDate" operator="greater-equals" from-field="parameters.fromDate" ignore-if-empty="true"/>
+ <condition-expr field-name="reconciledDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sun Jan 25 18:33:55 2009
@@ -28,7 +28,7 @@
<set field="tabButtonItem" value="PartyAccountsSummary"/>
<set field="labelTitleProperty" value="AccountingPartyAccountsSummary"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
- <!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
+ <!-- entity-condition entity-name="GlAccountOrganization" list="entityList" use-cache="true" >
<condition-expr field-name="glAccountId" operator="greater" value="0" />
</entity-condition -->
</actions>
@@ -94,7 +94,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
<container style="screenlet">
@@ -138,8 +138,8 @@
<section>
<condition>
<and>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
- <if-compare field-name="parameters.reportType" operator="equals" value="byAccount"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.reportType" operator="equals" value="byAccount"/>
</and>
</condition>
<widgets>
@@ -158,8 +158,8 @@
<section>
<condition>
<and>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
- <if-compare field-name="parameters.reportType" operator="equals" value="byDate"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.reportType" operator="equals" value="byDate"/>
</and>
</condition>
<widgets>
@@ -217,12 +217,12 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="acctgTransId" from-field="parameters.acctgTransId"/>
- <entity-one entity-name="AcctgTrans" value-name="acctgTrans"/>
- <entity-one entity-name="AcctgTransEntry" value-name="acctgTransEntry">
+ <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
+ <entity-one entity-name="AcctgTransEntry" value-field="acctgTransEntry">
<field-map field-name="acctgTransId"/>
- <field-map field-name="acctgTransEntrySeqId" env-name="parameters.editAcctgTransEntrySeqId"/>
+ <field-map field-name="acctgTransEntrySeqId" from-field="parameters.editAcctgTransEntrySeqId"/>
</entity-one>
- <entity-and entity-name="AcctgTransEntry" list-name="acctgTransEntries">
+ <entity-and entity-name="AcctgTransEntry" list="acctgTransEntries">
<field-map field-name="acctgTransId"/>
<order-by field-name="acctgTransEntrySeqId"/>
</entity-and>
@@ -232,7 +232,7 @@
<decorator-section name="body">
<section>
<condition>
- <not><if-empty field-name="acctgTransId"/></not>
+ <not><if-empty field="acctgTransId"/></not>
</condition>
<widgets>
<container>
@@ -241,7 +241,7 @@
<container style="h3">
<section>
<condition>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y"/>
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/>
</condition>
<widgets>
<label text="${uiLabelMap.PageTitleViewTransaction}"/>
@@ -257,7 +257,7 @@
<link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=Y&fromAcctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/>
<section>
<condition>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y"/>
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/>
</condition>
<widgets>
<include-form name="ViewAcctgTrans" location="component://accounting/widget/GlForms.xml"/>
@@ -273,7 +273,7 @@
<container style="screenlet">
<section>
<condition>
- <if-compare field-name="acctgTrans.isPosted" operator="equals" value="Y"/>
+ <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/>
</condition>
<widgets>
<container style="screenlet-title-bar">
@@ -302,7 +302,7 @@
</section>
<section>
<condition>
- <if-compare field-name="acctgTrans.isPosted" operator="not-equals" value="Y"/>
+ <if-compare field="acctgTrans.isPosted" operator="not-equals" value="Y"/>
</condition>
<widgets>
<container>
@@ -341,7 +341,7 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
<set field="partyId" from-field="parameters.organizationPartyId"/>
- <entity-condition entity-name="AcctgTrans" list-name="transactions">
+ <entity-condition entity-name="AcctgTrans" list="transactions">
<condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
<order-by field-name="transactionDate"/>
</entity-condition>
@@ -376,9 +376,9 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
<!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
- <entity-condition entity-name="Payment" list-name="payments">
+ <entity-condition entity-name="Payment" list="payments">
<condition-list combine="and">
- <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="partyIdFrom" operator="equals" from-field="organizationPartyId"/>
<condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
<condition-list combine="or">
<condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
@@ -425,9 +425,9 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
<!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
- <entity-condition entity-name="Payment" list-name="payments">
+ <entity-condition entity-name="Payment" list="payments">
<condition-list combine="and">
- <condition-expr field-name="partyIdFrom" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="partyIdFrom" operator="equals" from-field="organizationPartyId"/>
<condition-expr field-name="statusId" operator="equals" value="PMNT_NOT_PAID"/>
<condition-list combine="or">
<condition-expr field-name="paymentMethodTypeId" operator="equals" value="PERSONAL_CHECK"/>
@@ -519,7 +519,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
<container style="screenlet">
@@ -550,7 +550,7 @@
<set field="tabButtonItem" from-field="parameters.tabButtonItem" global="true"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<set field="glReconciliationId" from-field="parameters.glReconciliationId" global="true"/>
- <entity-one entity-name="GlReconciliation" value-name="glReconciliation"/>
+ <entity-one entity-name="GlReconciliation" value-field="glReconciliation"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}">
@@ -624,7 +624,7 @@
</container>
<section>
<condition>
- <if-compare field-name="parameters.performSearch" operator="equals" value="Y"/>
+ <if-compare field="parameters.performSearch" operator="equals" value="Y"/>
</condition>
<widgets>
<container style="screenlet">
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Sun Jan 25 18:33:55 2009
@@ -32,7 +32,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" paginate-target="ListGlAccountOrganization">
<actions>
<entity-condition entity-name="GlAccountOrganizationAndClass">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="glAccountId"/>
</entity-condition>
</actions>
@@ -330,9 +330,9 @@
<form name="ListGlAccountTypeDefaults" type="list" target="" list-name="glAccountTypeDefaults"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="GlAccountTypeDefault" list-name="glAccountTypeDefaults">
+ <entity-condition entity-name="GlAccountTypeDefault" list="glAccountTypeDefaults">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
</condition-list>
<order-by field-name="glAccountTypeId"/>
</entity-condition>
@@ -386,7 +386,7 @@
<form name="AddSalInvoiceItemTypeGlAssignment" type="single" target="addSalInvoiceItemTypeGlAssignment"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="GlAccountClass" value-name="revenueGlAccountClass">
+ <entity-one entity-name="GlAccountClass" value-field="revenueGlAccountClass">
<field-map field-name="glAccountClassId" value="REVENUE"/>
</entity-one>
<set field="revenueAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}" type="List"/>
@@ -432,7 +432,7 @@
<form name="AddPurInvoiceItemTypeGlAssignment" type="single" target="addPurInvoiceItemTypeGlAssignment"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <entity-one entity-name="GlAccountClass" value-name="expenseGlAccountClass">
+ <entity-one entity-name="GlAccountClass" value-field="expenseGlAccountClass">
<field-map field-name="glAccountClassId" value="EXPENSE"/>
</entity-one>
<set field="expenseAccountClassIds" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}" type="List"/>
@@ -506,9 +506,9 @@
</entity-condition>
</actions>
<row-actions>
- <entity-one entity-name="PaymentMethodType" value-name="paymentMethodType"/>
+ <entity-one entity-name="PaymentMethodType" value-field="paymentMethodType"/>
<set field="defaultGlAccountId" value="${paymentMethodType.defaultGlAccountId}"/>
- <entity-one entity-name="GlAccount" value-name="glAccount"/>
+ <entity-one entity-name="GlAccount" value-field="glAccount"/>
<set field="description" value="${glAccount.description}"/>
</row-actions>
<auto-fields-entity entity-name="PaymentMethodTypeGlAccount" default-field-type="display"/>
@@ -605,7 +605,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="GlJournal">
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
<order-by field-name="glJournalId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Sun Jan 25 18:33:55 2009
@@ -25,8 +25,8 @@
<section>
<actions>
<set field="tabButtonItemTop" value="Admin"/>
- <entity-one entity-name="PartyNameView" value-name="currentOrganization" auto-field-map="false">
- <field-map field-name="partyId" env-name="organizationPartyId"/>
+ <entity-one entity-name="PartyNameView" value-field="currentOrganization" auto-field-map="false">
+ <field-map field-name="partyId" from-field="organizationPartyId"/>
</entity-one>
</actions>
<widgets>
@@ -35,7 +35,7 @@
<include-menu name="PartyAdminTabBar" location="component://accounting/widget/Menus.xml"/>
<section>
<condition>
- <if-compare field-name="tabButtonItem" operator="equals" value="GlAccountAssignment"/>
+ <if-compare field="tabButtonItem" operator="equals" value="GlAccountAssignment"/>
</condition>
<widgets>
<include-menu name="PartyAdminAssignTabBar" location="component://accounting/widget/Menus.xml"/>
@@ -58,14 +58,14 @@
<set field="titleProperty" value="AccountingAvailableInternalOrganizations"/>
<set field="headerItem" value="companies"/>
<set field="labelTitleProperty" value="${uiLabelMap.AccountingAvailableInternalOrganizations}"/>
- <entity-condition entity-name="PartyRole" list-name="parties">
+ <entity-condition entity-name="PartyRole" list="parties">
<condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-condition>
- <service service-name="acctgPrefPermissionCheck" result-map-name="permResult">
+ <service service-name="acctgPrefPermissionCheck" result-map="permResult">
<field-map field-name="mainAction" value="UPDATE"/>
</service>
<set field="hasPrefPermission" from-field="permResult.hasPermission"/>
- <service service-name="basicGeneralLedgerPermissionCheck" result-map-name="permResult">
+ <service service-name="basicGeneralLedgerPermissionCheck" result-map="permResult">
<field-map field-name="mainAction" value="VIEW"/>
</service>
<set field="hasBasicPermission" from-field="permResult.hasPermission"/>
@@ -122,16 +122,16 @@
<set field="labelTitleProperty" value="${uiLabelMap.AccountingTimePeriod}"/>
<set field="tabButtonItem" value="TimePeriods"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <entity-condition entity-name="CustomTimePeriod" list-name="openTimePeriods">
+ <entity-condition entity-name="CustomTimePeriod" list="openTimePeriods">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
<condition-expr field-name="isClosed" operator="equals" value="N"/>
</condition-list>
<order-by field-name="thruDate"/>
</entity-condition>
- <entity-condition entity-name="CustomTimePeriod" list-name="closedTimePeriods">
+ <entity-condition entity-name="CustomTimePeriod" list="closedTimePeriods">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
<condition-expr field-name="isClosed" operator="equals" value="Y"/>
</condition-list>
<order-by field-name="periodTypeId"/>
@@ -200,8 +200,8 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
<set field="partyId" from-field="parameters.organizationPartyId"/>
- <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference"/>
- <service service-name="getPartyAccountingPreferences" result-map-name="result">
+ <entity-one entity-name="PartyAcctgPreference" value-field="partyAcctgPreference"/>
+ <service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="agregatedPartyAcctgPreference" from-field="result.partyAccountingPreference"/>
@@ -236,7 +236,7 @@
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are
stored in UomConversion, we need to change the logic here -->
- <entity-condition entity-name="UomConversionDated" list-name="conversions">
+ <entity-condition entity-name="UomConversionDated" list="conversions">
<order-by field-name="uomId"/>
<order-by field-name="uomIdTo"/>
<order-by field-name="fromDate"/>
@@ -262,7 +262,7 @@
<set field="labelTitleProperty" value="${uiLabelMap.AccountingGlJournals}"/>
<set field="tabButtonItem" value="SetupGlJournals"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <entity-one entity-name="GlJournal" value-name="glJournal"/>
+ <entity-one entity-name="GlJournal" value-field="glJournal"/>
</actions>
<widgets>
<decorator-screen name="CommonAdminDecorator">
@@ -395,8 +395,8 @@
<set field="tabButtonItem2" value="ProductGlAccounts"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="ProductGlAccount" list-name="productGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="ProductGlAccount" list="productGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="glAccountTypeId"/>
</entity-condition>
</actions>
@@ -423,11 +423,11 @@
<set field="tabButtonItem2" value="FinAccountTypeGlAccounts"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="FinAccountTypeGlAccount" list-name="finAccountTypeGlAccounts">
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
+ <entity-condition entity-name="FinAccountTypeGlAccount" list="finAccountTypeGlAccounts">
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
<order-by field-name="finAccountTypeId"/>
</entity-condition>
- <entity-condition entity-name="FinAccountType" list-name="finAccountTypes" use-cache="true">
+ <entity-condition entity-name="FinAccountType" list="finAccountTypes" use-cache="true">
<order-by field-name="finAccountTypeId"/>
</entity-condition>
</actions>
@@ -455,8 +455,8 @@
<set field="tabButtonItem2" value="ProductCategoryGlAccounts"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="ProductCategoryGlAccount" list-name="productCategoryGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="ProductCategoryGlAccount" list="productCategoryGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="glAccountTypeId"/>
</entity-condition>
</actions>
@@ -483,8 +483,8 @@
<set field="labelTitleProperty" value="${uiLabelMap.AccountingVarianceReasonGlAccounts}"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="VarianceReasonGlAccount" list-name="varianceReasonGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="VarianceReasonGlAccount" list="varianceReasonGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="glAccountId"/>
</entity-condition>
</actions>
@@ -510,8 +510,8 @@
<set field="tabButtonItem2" value="CreditCardTypeGlAccount"/>
<set field="labelTitleProperty" value="${uiLabelMap.AccountingCreditCardTypeGlAccount}"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="CreditCardTypeGlAccount" list-name="creditCardTypeGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="CreditCardTypeGlAccount" list="creditCardTypeGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
</entity-condition>
</actions>
<widgets>
@@ -536,8 +536,8 @@
<set field="tabButtonItem2" value="TaxAuthorityGlAccounts"/>
<set field="labelTitleProperty" value="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
- <entity-condition entity-name="TaxAuthorityGlAccount" list-name="taxAuthorityGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="TaxAuthorityGlAccount" list="taxAuthorityGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="taxAuthGeoId"/>
<order-by field-name="taxAuthPartyId"/>
</entity-condition>
@@ -565,8 +565,8 @@
<set field="tabButtonItem" value="GlAccountAssignment"/>
<set field="tabButtonItem2" value="PartyGlAccounts"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <entity-condition entity-name="PartyGlAccount" list-name="partyGlAccounts">
- <condition-expr field-name="organizationPartyId" env-name="organizationPartyId"/>
+ <entity-condition entity-name="PartyGlAccount" list="partyGlAccounts">
+ <condition-expr field-name="organizationPartyId" from-field="organizationPartyId"/>
<order-by field-name="partyId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Jan 25 18:33:55 2009
@@ -26,9 +26,9 @@
<actions>
<set field="entityName" value="GlAccountOrganization"/>
<set field="noConditionFind" value="Y"/>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" env-name="entityName"/>
+ <service 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"/>
</service>
</actions>
<auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
@@ -66,9 +66,9 @@
<actions>
<set field="entityName" value="GlAccount"/>
<set field="noConditionFind" value="Y"/>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
- <field-map field-name="entityName" env-name="entityName"/>
+ <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="noConditionFind" value="Y"/>
</service>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Sun Jan 25 18:33:55 2009
@@ -60,7 +60,7 @@
<section>
<actions>
<set field="glAccountId" from-field="parameters.glAccountId"/>
- <entity-one entity-name="GlAccount" value-name="glAccount"/>
+ <entity-one entity-name="GlAccount" value-field="glAccount"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -142,7 +142,7 @@
<set field="glAccountId" from-field="requestParameters.glAccountId"/>
<set field="trail" from-field="requestParameters.trail"/>
- <entity-one entity-name="GlAccount" value-name="glAccount"/>
+ <entity-one entity-name="GlAccount" value-field="glAccount"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -196,7 +196,7 @@
<set field="titleProperty" value="PageTitleViewGlAccountEntries"/>
<set field="tabButtonItem" value="ListGlAccountOrganization"/>
<set field="glAccountId" from-field="requestParameters.glAccountId"/>
- <entity-and entity-name="AcctgTransEntry" list-name="entries">
+ <entity-and entity-name="AcctgTransEntry" list="entries">
<field-map field-name="glAccountId"/>
</entity-and>
</actions>
@@ -243,7 +243,7 @@
<set field="titleProperty" value="PageTitleViewAccountingTransaction"/>
<set field="headerItem" value="chartofaccounts"/>
<set field="acctgTransId" from-field="requestParameters.acctgTransId"/>
- <entity-and entity-name="AcctgTransEntry" list-name="entries">
+ <entity-and entity-name="AcctgTransEntry" list="entries">
<field-map field-name="acctgTransId"/>
</entity-and>
</actions>
@@ -327,7 +327,7 @@
<set field="titleProperty" value="PageTitleListAccounts"/>
<set field="labelTitleProperty" value="PageTitleListAccounts"/>
<set field="tabButtonItem" value="Chartofaccounts"/>
- <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list-name="entityList" use-cache="true" >
+ <!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list="entityList" use-cache="true" >
<limit-range start="0" size="20" />
</entity-and -->
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
@@ -381,7 +381,7 @@
<screen name="GlAccountDetail">
<section>
<actions>
- <entity-one entity-name="GlAccount" value-name="currentValue" use-cache="true">
+ <entity-one entity-name="GlAccount" value-field="currentValue" use-cache="true">
<field-map field-name="glAccountId"/>
</entity-one>
</actions>
@@ -400,7 +400,7 @@
<set field="labelTitleProperty" value=""/> -->
<set field="glAccountId" from-field="parameters.glAccountId"/>
- <entity-one entity-name="GlAccount" value-name="glAccount"/>
+ <entity-one entity-name="GlAccount" value-field="glAccount"/>
</actions>
<widgets>
<decorator-screen name="CommonAccountDecorator">
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml Sun Jan 25 18:33:55 2009
@@ -28,7 +28,7 @@
<set field="tabButtonItem" value="InvoiceItemTypes"/>
<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="10"/>
- <entity-condition entity-name="InvoiceItemType" list-name="invoiceItemTypes">
+ <entity-condition entity-name="InvoiceItemType" list="invoiceItemTypes">
<order-by field-name="invoiceItemTypeId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Jan 25 18:33:55 2009
@@ -145,7 +145,7 @@
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
<entity-one entity-name="Invoice" value-field="invoice"/>
<entity-one entity-name="InvoiceType" value-field="invoiceType">
- <field-map field-name="invoiceTypeId" env-name="invoice.invoiceTypeId"/>
+ <field-map field-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/>
</entity-one>
</actions>
<widgets>
@@ -202,19 +202,19 @@
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
<entity-and entity-name="InvoiceRole" list="invoiceRoles">
- <field-map env-name="parameters.invoiceId" field-name="invoiceId"/>
+ <field-map from-field="parameters.invoiceId" field-name="invoiceId"/>
<order-by field-name="partyId"/>
</entity-and>
<entity-and entity-name="InvoiceStatus" list="invoiceStatus">
- <field-map env-name="parameters.invoiceId" field-name="invoiceId"/>
+ <field-map from-field="parameters.invoiceId" field-name="invoiceId"/>
<order-by field-name="statusDate"/>
</entity-and>
<entity-and entity-name="InvoiceTerm" list="invoiceTerms">
- <field-map env-name="parameters.invoiceId" field-name="invoiceId"/>
+ <field-map from-field="parameters.invoiceId" field-name="invoiceId"/>
<order-by field-name="invoiceTermId"/>
</entity-and>
<entity-and entity-name="TimeEntry" list="timeEntries">
- <field-map env-name="parameters.invoiceId" field-name="invoiceId"/>
+ <field-map from-field="parameters.invoiceId" field-name="invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
</entity-and>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
@@ -306,7 +306,7 @@
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice" auto-field-map="true"/>
<entity-and entity-name="InvoiceStatus" list="invoiceStatus">
- <field-map env-name="invoice.invoiceId" field-name="invoiceId"/>
+ <field-map from-field="invoice.invoiceId" field-name="invoiceId"/>
<order-by field-name="statusDate"/>
</entity-and>
</actions>
@@ -440,7 +440,7 @@
<entity-one entity-name="Invoice" value-field="invoice" />
<entity-one entity-name="InvoiceItem" value-field="invoiceItem"/>
<entity-and entity-name="InvoiceItem" list="invoiceItems">
- <field-map field-name="invoiceId" env-name="parameters.invoiceId"/>
+ <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
</entity-and>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy"/>
@@ -500,7 +500,7 @@
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
<entity-and entity-name="TimeEntry" list="timeEntries">
- <field-map field-name="invoiceId" env-name="parameters.invoiceId"/>
+ <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
<order-by field-name="timeEntryId"/>
</entity-and>
</actions>
@@ -535,7 +535,7 @@
<set field="invoiceId" from-field="parameters.invoiceId"/>
<entity-one entity-name="Invoice" value-field="invoice"/>
<entity-and entity-name="InvoiceRole" list="invoiceRoles">
- <field-map env-name="invoiceId" field-name="invoiceId"/>
+ <field-map from-field="invoiceId" field-name="invoiceId"/>
<order-by field-name="partyId"/>
</entity-and>
</actions>