svn commit: r737563 [1/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...

[mrisaliti]

Author: mrisaliti
Date: Sun Jan 25 18:33:55 2009
New Revision: 737563

URL: http://svn.apache.org/viewvc?rev=737563&view=rev
Log:
Artifact cleaning on accounting component after recent changes on xsd files (OFBIZ-2137)

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
    ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
    ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
    ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
    ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/CostScreens.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlForms.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
    ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
    ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
    ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
    ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
    ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
    ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
    ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Sun Jan 25 18:33:55 2009
@@ -565,7 +565,7 @@
         <make-value value-field="invoiceContactMech" entity-name="InvoiceContactMech"/>
         <set-pk-fields map="parameters" value-field="invoiceContactMech"/>
         <create-value value-field="invoiceContactMech"/>
-        <field-to-result field="contactMechId" map-name="invoiceContactMech"/>
+        <field-to-result field="contactMechId" result-name="invoiceContactMech"/>
     </simple-method>
     
     <simple-method method-name="updateInvoiceItemType"  short-description="Updates a InvoiceItemType Record">

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml Sun Jan 25 18:33:55 2009
@@ -25,7 +25,7 @@
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id sequence-name="BillingAccount" field="billingAccountId"/>
-        <to-string field-name="billingAccountId"/>
+        <to-string field="billingAccountId"/>
         <set from-field="billingAccountId" field="newEntity.billingAccountId"/>
         <field-to-result field="billingAccountId" result-name="billingAccountId"/>  
                       
@@ -71,7 +71,7 @@
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id sequence-name="BillingAccountTerm" field="billingAccountTermId"/>
-        <to-string field-name="billingAccountTermId"/>
+        <to-string field="billingAccountTermId"/>
         <set from-field="billingAccountTermId" field="newEntity.billingAccountTermId"/>
         <field-to-result field="billingAccountTermId" result-name="billingAccountTermId"/>          
         

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/tax/TaxAuthorityServices.xml Sun Jan 25 18:33:55 2009
@@ -221,7 +221,7 @@
                 <and>
                     <not><if-empty field="taxAuthority.taxIdFormatPattern"/></not>
                     <not><if-empty field="parameters.partyTaxId"/></not>
-                    <not><if-regexp field-name="parameters.partyTaxId" expr="${taxAuthority.taxIdFormatPattern}"/></not>
+                    <not><if-regexp field="parameters.partyTaxId" expr="${taxAuthority.taxIdFormatPattern}"/></not>
                 </and>
             </condition>
             <then>

Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml Sun Jan 25 18:33:55 2009
@@ -38,7 +38,7 @@
         <set field="orderItemSeqId" value="00001"/>
         <set field="shipmentId" value="10000"/>
 
-        <entity-one entity-name="UserLogin" value-name="userLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -52,11 +52,11 @@
         <set field="serviceCtx.orderItemSeqId" from-field="orderItemSeqId"/>
         
         <call-service service-name="receiveInventoryProduct" in-map-name="serviceCtx"/>
-        <entity-condition  entity-name="AcctgTransEntry" list-name="acctgTransEntries">
-            <condition-expr field-name="productId" env-name="productId"/>
+        <entity-condition  entity-name="AcctgTransEntry" list="acctgTransEntries">
+            <condition-expr field-name="productId" from-field="productId"/>
         </entity-condition>
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
+        <iterate list="acctgTransEntries" entry="acctgTransEntry">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                 <assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="UNINVOICED_SHIP_RCPT"/>
@@ -90,25 +90,25 @@
         -->
 
         <set field="invoiceId" value="10000"/>
-        <entity-one entity-name="UserLogin" value-name="userLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
         <set field="serviceCtx.statusId" value="INVOICE_READY"/>
         <set field="serviceCtx.invoiceId" from-field="invoiceId"/>
         <call-service service-name="setInvoiceStatus" in-map-name="serviceCtx"/>
-        <entity-one entity-name="Invoice" value-name="invoice">
-            <field-map field-name="invoiceId" env-name="invoiceId"/>
+        <entity-one entity-name="Invoice" value-field="invoice">
+            <field-map field-name="invoiceId" from-field="invoiceId"/>
         </entity-one>
         <get-related value-field="invoice" relation-name="AcctgTrans" list="acctgTransList"/>
-        <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
+        <first-from-list list="acctgTransList" entry="acctgTrans"/>
         <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntries"/>
         
         <set field="debitTotal" type="BigDecimal" value="0.0"/>
         <set field="creditTotal" type="BigDecimal" value="0.0"/>
         
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
+        <iterate list="acctgTransEntries" entry="acctgTransEntry">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                 <assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
@@ -143,7 +143,7 @@
          -->
 
         <set field="paymentId" value="10000"/>
-        <entity-one entity-name="UserLogin" value-name="userLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -151,18 +151,18 @@
         <set field="serviceCtx.statusId" value="PMNT_SENT"/>
 
         <call-service service-name="setPaymentStatus" in-map-name="serviceCtx"/>
-        <entity-one entity-name="Payment" value-name="payment">
-            <field-map field-name="paymentId" env-name="paymentId"/>
+        <entity-one entity-name="Payment" value-field="payment">
+            <field-map field-name="paymentId" from-field="paymentId"/>
         </entity-one>
         <get-related value-field="payment" relation-name="AcctgTrans" list="acctgTransList"/>
-        <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
+        <first-from-list list="acctgTransList" entry="acctgTrans"/>
         <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntries"/>
 
         <set field="debitTotal" type="BigDecimal" value="0.0"/>
         <set field="creditTotal" type="BigDecimal" value="0.0"/>
         
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate list-name="acctgTransEntries" entry-name="acctgTransEntry">
+        <iterate list="acctgTransEntries" entry="acctgTransEntry">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
             <!--<assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="GENERAL_CHECKING_ACCOUNT"/>
@@ -209,7 +209,7 @@
         <set field="quantity" value="2" type="BigDecimal"/>
         <set field="productId" value="GZ-2644"/>
 
-        <entity-one entity-name="UserLogin" value-name="userLogin" auto-field-map="false">
+        <entity-one entity-name="UserLogin" value-field="userLogin" auto-field-map="false">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -221,12 +221,12 @@
         <set field="serviceCtx.quantity" from-field="quantity"/>
         <call-service service-name="issueOrderItemShipGrpInvResToShipment" in-map-name="serviceCtx"/>
 
-        <entity-condition entity-name="AcctgTransEntry" list-name="acctgTransEntryList">
-            <condition-expr field-name="productId" operator="equals" env-name="productId"/>
+        <entity-condition entity-name="AcctgTransEntry" list="acctgTransEntryList">
+            <condition-expr field-name="productId" operator="equals" from-field="productId"/>
         </entity-condition>
         
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
+        <iterate list="acctgTransEntryList" entry="acctgTransEntry">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                 <assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="INVENTORY_ACCOUNT"/>
@@ -263,7 +263,7 @@
 
         <set field="invoiceId" value="CI1"/>
         
-        <entity-one entity-name="UserLogin" value-name="userLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -271,15 +271,15 @@
         <set field="serviceCtx.statusId" value="INVOICE_READY"/>
         <call-service service-name="setInvoiceStatus" in-map-name="serviceCtx"/>
 
-        <entity-one entity-name="Invoice" value-name="invoice">
-            <field-map field-name="invoiceId" env-name="invoiceId"/>
+        <entity-one entity-name="Invoice" value-field="invoice">
+            <field-map field-name="invoiceId" from-field="invoiceId"/>
         </entity-one>
         <get-related value-field="invoice" relation-name="AcctgTrans" list="acctgTransList"/>
-        <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
+        <first-from-list list="acctgTransList" entry="acctgTrans"/>
         <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntries"/>
 
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate entry-name="acctgTransEntry" list-name="acctgTransEntries">
+        <iterate entry="acctgTransEntry" list="acctgTransEntries">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
             <!--<assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="SALES_ACCOUNT"/>
@@ -312,7 +312,7 @@
         -->
 
         <set field="paymentId" value="10000"/>
-        <entity-one entity-name="UserLogin" value-name="userLogin">
+        <entity-one entity-name="UserLogin" value-field="userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>
@@ -320,17 +320,17 @@
         <set field="serviceCtx.statusId" value="PMNT_RECEIVED"/>
         <call-service service-name="setPaymentStatus" in-map-name="serviceCtx"/>
 
-        <entity-one entity-name="Payment" value-name="payment">
-            <field-map field-name="paymentId" env-name="paymentId"/>
+        <entity-one entity-name="Payment" value-field="payment">
+            <field-map field-name="paymentId" from-field="paymentId"/>
         </entity-one>
         <get-related value-field="payment" relation-name="AcctgTrans" list="acctgTransList"/>
-        <first-from-list list-name="acctgTransList" entry-name="acctgTrans"/>
+        <first-from-list list="acctgTransList" entry="acctgTrans"/>
         <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntries"/>
         <set field="debitTotal" type="BigDecimal" value="0.0"/>
         <set field="creditTotal" type="BigDecimal" value="0.0"/>
 
         <assert><not><if-empty field="acctgTransEntries"/></not></assert>
-        <iterate entry-name="acctgTransEntry" list-name="acctgTransEntries">
+        <iterate entry="acctgTransEntry" list="acctgTransEntries">
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
             <!--<assert>
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
@@ -373,14 +373,14 @@
 
         <set field="workEffortId" value="10001"/>
         <set field="serviceCtx.workEffortId" from-field="workEffortId"/>
-        <entity-one entity-name="UserLogin" value-name="serviceCtx.userLogin">
+        <entity-one entity-name="UserLogin" value-field="serviceCtx.userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <call-service service-name="issueProductionRunTask" in-map-name="serviceCtx"/>
 
-        <entity-condition entity-name="WorkEffortAndInventoryAssign" list-name="workEffortAndInventoryAssigns">
+        <entity-condition entity-name="WorkEffortAndInventoryAssign" list="workEffortAndInventoryAssigns">
             <condition-list combine="and">
-                <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+                <condition-expr field-name="workEffortId" from-field="workEffortId"/>
                 <condition-list combine="or">
                     <condition-expr field-name="productId" operator="equals" value="MAT_A_COST"/>
                     <condition-expr field-name="productId" operator="equals" value="MAT_B_COST"/>
@@ -391,7 +391,7 @@
 
         <set field="totalIssuedQty_MAT_A_COST" value="0.0" type="BigDecimal"/>
         <set field="totalIssuedQty_MAT_B_COST" value="0.0" type="BigDecimal"/>
-        <iterate list-name="workEffortAndInventoryAssigns" entry-name="workEffortAndInventoryAssign">
+        <iterate list="workEffortAndInventoryAssigns" entry="workEffortAndInventoryAssign">
             <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_A_COST">  
                 <calculate field="totalIssuedQty_MAT_A_COST">
                     <calcop operator="add">
@@ -415,15 +415,15 @@
             <if-compare field="totalIssuedQty_MAT_A_COST" operator="equals" value="4.0" type="BigDecimal"/>
             <if-compare field="totalIssuedQty_MAT_B_COST" operator="equals" value="6.0" type="BigDecimal"/>
         </assert>
-        <entity-and entity-name="AcctgTrans" list-name="acctgTransList">
+        <entity-and entity-name="AcctgTrans" list="acctgTransList">
             <field-map field-name="acctgTransTypeId" value="INVENTORY"/>
         </entity-and>
         <assert><not><if-empty field="acctgTransList"/></not></assert>
 
-        <iterate list-name="acctgTransList" entry-name="acctgTrans">
+        <iterate list="acctgTransList" entry="acctgTrans">
             <get-related list="acctgTransEntryList" relation-name="AcctgTransEntry" value-field="acctgTrans"/>
             <assert><not><if-empty field="acctgTransEntryList"/></not></assert>
-            <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
+            <iterate list="acctgTransEntryList" entry="acctgTransEntry">
                 <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                     <assert>
                         <or>
@@ -462,19 +462,19 @@
         <set field="workEffortId" value="10001"/>
         <set field="serviceCtx.productionRunId" from-field="productionRunId"/>
         <set field="serviceCtx.workEffortId" from-field="workEffortId"/>
-        <entity-one entity-name="UserLogin" value-name="serviceCtx.userLogin">
+        <entity-one entity-name="UserLogin" value-field="serviceCtx.userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <call-service service-name="changeProductionRunTaskStatus" in-map-name="serviceCtx"/>
 
-        <entity-one entity-name="WorkEffort" value-name="workEffort">
-            <field-map field-name="workEffortId" env-name="workEffortId"/>
+        <entity-one entity-name="WorkEffort" value-field="workEffort">
+            <field-map field-name="workEffortId" from-field="workEffortId"/>
         </entity-one>
         <get-related value-field="workEffort" relation-name="AcctgTrans" list="acctgTransList"/>
         <assert><not><if-empty field="acctgTransList"></if-empty></not></assert>
-        <iterate list-name="acctgTransList" entry-name="acctgTrans">
+        <iterate list="acctgTransList" entry="acctgTrans">
             <get-related value-field="acctgTrans" relation-name="AcctgTransEntry" list="acctgTransEntryList"/>
-            <iterate list-name="acctgTransEntryList" entry-name="acctgTransEntry">
+            <iterate list="acctgTransEntryList" entry="acctgTransEntry">
                 <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
                     <assert>
                         <if-compare field="acctgTransEntry.productId" operator="equals" value="PROD_COST"/>
@@ -509,32 +509,32 @@
 
         <set field="workEffortId" value="10000"/>
         <set field="serviceCtx.workEffortId" from-field="workEffortId"/>
-        <entity-one entity-name="UserLogin" value-name="serviceCtx.userLogin">
+        <entity-one entity-name="UserLogin" value-field="serviceCtx.userLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <call-service service-name="productionRunProduce" in-map-name="serviceCtx"/>
         
         <!-- For credit entry -->
-        <entity-and entity-name="AcctgTransEntry" list-name="acctgTransEntryList">
+        <entity-and entity-name="AcctgTransEntry" list="acctgTransEntryList">
             <field-map field-name="productId" value="PROD_COST"/>
             <field-map field-name="glAccountTypeId" value="WIP_INVENTORY"/>
             <field-map field-name="glAccountId" value="142000"/>
             <order-by field-name="-createdStamp"/>
         </entity-and>
-        <first-from-list list-name="acctgTransEntryList" entry-name="acctgTransEntry"/>
+        <first-from-list list="acctgTransEntryList" entry="acctgTransEntry"/>
         <assert>
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C"/>
             <if-compare field="acctgTransEntry.origAmount" operator="equals" value="328" type="BigDecimal"/>
         </assert>
         
         <!-- For debit entry -->
-        <entity-and entity-name="AcctgTransEntry" list-name="acctgTransEntryList">
+        <entity-and entity-name="AcctgTransEntry" list="acctgTransEntryList">
             <field-map field-name="productId" value="PROD_COST"/>
             <field-map field-name="glAccountTypeId" value="INVENTORY_ACCOUNT"/>
             <field-map field-name="glAccountId" value="140000"/>
             <order-by field-name="-createdStamp"/>
         </entity-and>
-        <first-from-list list-name="acctgTransEntryList" entry-name="acctgTransEntry"/>
+        <first-from-list list="acctgTransEntryList" entry="acctgTransEntry"/>
         <assert>
             <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D"/>
             <if-compare field="acctgTransEntry.origAmount" operator="equals" value="328" type="BigDecimal"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sun Jan 25 18:33:55 2009
@@ -53,9 +53,9 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
         <actions>
             <set field="entityName" value="Agreement"/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <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="requestParameters"/>
+                <field-map field-name="entityName" from-field="entityName"/>
                 <field-map field-name="orderBy" from-field="parameters.sortField"/>
             </service>
         </actions>
@@ -181,8 +181,8 @@
         <actions>
             <entity-condition entity-name="AgreementTerm">
                 <condition-list>
-                    <condition-expr field-name="agreementId" env-name="agreementId"/>
-                    <condition-expr field-name="agreementItemSeqId" env-name="null"/>
+                    <condition-expr field-name="agreementId" from-field="agreementId"/>
+                    <condition-expr field-name="agreementItemSeqId" from-field="null"/>
                 </condition-list>
             </entity-condition>
         </actions>
@@ -500,8 +500,8 @@
     <form name="ListAgreementWorkEffortAppls" type="list" target="updateAgreementWorkEffortAppl" list-name="agreementWorkEffortAppls"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list-name="agreementWorkEffortAppls">
-                <field-map env-name="agreementId" field-name="agreementId" />
+            <entity-and entity-name="AgreementWorkEffortAppl" use-cache="true" list="agreementWorkEffortAppls">
+                <field-map from-field="agreementId" field-name="agreementId" />
             </entity-and>
         </actions>  
         <field name="agreementItemSeqId"><display/></field>
@@ -513,8 +513,8 @@
     <form name="ListAgreementRoles" list-name="agreementRoles" type="list" paginate-target="FindAgreementRoles"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-and entity-name="AgreementRole" use-cache="true" list-name="agreementRoles">
-                <field-map field-name="agreementId" env-name="agreementId"/>
+            <entity-and entity-name="AgreementRole" use-cache="true" list="agreementRoles">
+                <field-map field-name="agreementId" from-field="agreementId"/>
             </entity-and>
         </actions>
         <auto-fields-entity entity-name="AgreementRole" default-field-type="display"/>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Sun Jan 25 18:33:55 2009
@@ -24,8 +24,8 @@
     <form name="ListFixedAssets" type="list" list-name="listIt" paginate-target="ListFixedAssets"
         odd-row-style="alternate-row" header-row-style="header-row-2" 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="FixedAsset"/>
             </service>
         </actions>
@@ -197,7 +197,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="FixedAssetStdCost">
-                <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
+                <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
                 <order-by field-name="fromDate"/>
             </entity-condition>
         </actions>            
@@ -246,7 +246,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="FixedAssetIdent">
-                <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
+                <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
             </entity-condition>
         </actions>
         <auto-fields-service service-name="updateFixedAssetIdent"/>
@@ -283,7 +283,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="FixedAssetRegistration">
-                <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
+                <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
             </entity-condition>
         </actions>
         <auto-fields-service service-name="updateFixedAssetRegistration"/>
@@ -314,8 +314,8 @@
     <form name="ListFixedAssetMaints" type="list" list-name="listIt" paginate-target="ListFixedAssetMaints" paginate="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" 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="FixedAssetMaint"/>
                 <field-map field-name="orderBy" value="-maintHistSeqId"/>
             </service>
@@ -398,8 +398,8 @@
         <actions>
             <set field="findParams.fixedAssetId" from-field="parameters.fixedAssetId"/>
             <set field="findParams.maintHistSeqId" from-field="parameters.maintHistSeqId" default-value=""/>
-            <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-                <field-map field-name="inputFields" env-name="findParams"/>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="findParams"/>
                 <field-map field-name="entityName" value="FixedAssetMeter"/>
                 <field-map field-name="orderBy" value="-readingDate"/>
             </service>
@@ -441,10 +441,10 @@
     <form name="ListFixedAssetMaintOrders" type="list" list-name="fixedAssetMaintOrders" target="updateFixedAssetMaintOrder"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="FixedAssetMaintOrder" list-name="fixedAssetMaintOrders">
+            <entity-condition entity-name="FixedAssetMaintOrder" list="fixedAssetMaintOrders">
                 <condition-list combine="and">
-                    <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
-                    <condition-expr field-name="maintHistSeqId" env-name="maintHistSeqId"/>
+                    <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
+                    <condition-expr field-name="maintHistSeqId" from-field="maintHistSeqId"/>
                 </condition-list>
             </entity-condition>
         </actions>
@@ -474,8 +474,8 @@
     <form name="ListPartyFixedAssetAssignments" type="list"  list-name="listPartyFixedAssets"  target="updatePartyFixedAssetAssignment"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="PartyFixedAssetAssignment" list-name="listPartyFixedAssets">
-                <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/>
+            <entity-condition entity-name="PartyFixedAssetAssignment" list="listPartyFixedAssets">
+                <condition-expr field-name="fixedAssetId" from-field="fixedAssetId"/>
                 <order-by field-name="fromDate" />
             </entity-condition>
         </actions>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sun Jan 25 18:33:55 2009
@@ -48,21 +48,21 @@
     <form name="ListInvoices" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice" paginate-target="findInvoices"
         odd-row-style="alternate-row" header-row-style="header-row-2" 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="Invoice"/>
                 <field-map field-name="orderBy" from-field="parameters.sortField"/>
             </service>
         </actions>
         <row-actions>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
-                <field-map field-name="partyId" env-name="partyIdFrom"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+                <field-map field-name="partyId" from-field="partyIdFrom"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
-                <field-map field-name="partyId" env-name="partyId"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+                <field-map field-name="partyId" from-field="partyId"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
             <set field="amountToApply" value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId));}"/>
@@ -92,14 +92,14 @@
             <set field="total" value="${bsh:
                 import java.text.NumberFormat;
                 return(NumberFormat.getNumberInstance(context.get(&quot;locale&quot;)).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)));}"/>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
-                <field-map field-name="partyId" env-name="invoice.partyIdFrom"/>
-                <field-map field-name="compareDate" env-name="invoice.invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+                <field-map field-name="partyId" from-field="invoice.partyIdFrom"/>
+                <field-map field-name="compareDate" from-field="invoice.invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
-                <field-map field-name="partyId" env-name="invoice.partyId"/>
-                <field-map field-name="compareDate" env-name="invoice.invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+                <field-map field-name="partyId" from-field="invoice.partyId"/>
+                <field-map field-name="compareDate" from-field="invoice.invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
         </actions>
@@ -176,7 +176,7 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="AcctgTransAndEntries">
-                <condition-expr field-name="invoiceId" env-name="invoiceId"/>
+                <condition-expr field-name="invoiceId" from-field="invoiceId"/>
                 <order-by field-name="acctgTransEntrySeqId"/>
             </entity-condition>
         </actions>
@@ -468,10 +468,10 @@
     <form name="SendPerEmail" type="single" target="executeSendPerEmail" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <service service-name="getPartyEmail" result-map-name="mapFrom">
+            <service service-name="getPartyEmail" result-map="mapFrom">
                 <field-map field-name="partyId" value="${invoice.partyIdFrom}"/>
             </service>
-            <service service-name="getPartyEmail" result-map-name="mapTo">
+            <service service-name="getPartyEmail" result-map="mapTo">
                 <field-map field-name="partyId" value="${invoice.partyId}"/>
             </service>
         </actions>
@@ -500,8 +500,8 @@
     <form name="ListTimeEntries" type="list" list-name="timeEntries"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
-            <entity-one entity-name="Timesheet" value-name="timesheet">
-                <field-map field-name="timesheetId" env-name="timesheetId"/>
+            <entity-one entity-name="Timesheet" value-field="timesheet">
+                <field-map field-name="timesheetId" from-field="timesheetId"/>
             </entity-one>
         </row-actions>
         <field name="invoiceId"><hidden/></field>
@@ -546,8 +546,8 @@
     <form name="ListInvoicePaymentInfo" type="list" list-name="invoicePaymentInfoList"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <service service-name="getInvoicePaymentInfoList" result-map-list-name="invoicePaymentInfoList">
-                <field-map field-name="invoiceId" env-name="parameters.invoiceId"/>
+            <service service-name="getInvoicePaymentInfoList" result-map-list="invoicePaymentInfoList">
+                <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
             </service>
         </actions>
         <field name="invoiceId"><hidden/></field>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Sun Jan 25 18:33:55 2009
@@ -39,8 +39,8 @@
     <form name="listLookupFixedAsset" list-name="listIt" title="" type="list" paginate-target="LookupFixedAsset"
         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="FixedAsset"/>
             </service>
         </actions>
@@ -63,8 +63,8 @@
     <form name="listBillingAccount" list-name="listIt" title="" type="list" paginate-target="LookupBillingAccount"
         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="BillingAccount"/>
                 <field-map field-name="orderBy" value="billingAccountId"/>
             </service>
@@ -101,8 +101,8 @@
     <form name="listLookupGlAccount" list-name="listIt" title="" type="list" paginate-target="LookupGlAccount"
         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="GlAccount"/>
             </service>
         </actions>
@@ -127,8 +127,8 @@
     <form name="listPayment" list-name="listIt" title="" type="list" paginate-target="LookupPayment"
         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="Payment"/>
             </service>
         </actions>
@@ -169,8 +169,8 @@
     <form name="listInvoice" list-name="listIt" title="" type="list" paginate-target="LookupInvoice"
         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="Invoice"/>
             </service>
         </actions>
@@ -199,8 +199,8 @@
     <form name="listAgreements" list-name="listIt" title="" type="list" target="LookupAgreement"
         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="Agreement"/>
             </service>
         </actions>
@@ -230,8 +230,8 @@
     <form name="listAgreementItems" list-name="listIt" title="" type="list" target="LookupAgreementItem"
         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="AgreementItem"/>
             </service>
         </actions>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Sun Jan 25 18:33:55 2009
@@ -41,11 +41,11 @@
                         <or>
                             <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
                             <!-- can always see own invoice -->
-                            <if-compare field-name="invoice.partyIdFrom" operator="equals" value="${userLogin.partyId}" />
-                            <if-compare field-name="invoice.partyId" operator="equals" value="${userLogin.partyId}" />
+                            <if-compare field="invoice.partyIdFrom" operator="equals" value="${userLogin.partyId}" />
+                            <if-compare field="invoice.partyId" operator="equals" value="${userLogin.partyId}" />
                             <!-- or is a contact of a company who owns the invoice-->
-                            <if-compare field-name="invoice.partyIdFrom" operator="equals" value="${myCompanyId}" />
-                            <if-compare field-name="invoice.partyId" operator="equals" value="${myCompanyId}" />
+                            <if-compare field="invoice.partyIdFrom" operator="equals" value="${myCompanyId}" />
+                            <if-compare field="invoice.partyId" operator="equals" value="${myCompanyId}" />
                         </or>
                     </condition>
                     <widgets>

Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Sun Jan 25 18:33:55 2009
@@ -24,17 +24,17 @@
         <node name="node-root" render-style="simple">
             <sub-node node-name="node-body">
                 <entity-and entity-name="GlAccount">
-                    <field-map field-name="parentGlAccountId" env-name="null"/>
+                    <field-map field-name="parentGlAccountId" from-field="null"/>
                     <order-by field-name="glAccountId"/>
                 </entity-and>
             </sub-node>
         </node>
         <node name="node-body">
-            <entity-one entity-name="GlAccount" value-name="glAccount"></entity-one>
+            <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one>
             <link target="GlAccountNavigate?glAccountId=${glAccountId}&amp;trail=${currentNodeTrailPiped}" text="${glAccountId} ${glAccount.accountName} ${postedBalance}"/>
             <sub-node node-name="node-body">
                 <entity-and entity-name="GlAccount">
-                    <field-map field-name="parentGlAccountId" env-name="glAccountId"/>
+                    <field-map field-name="parentGlAccountId" from-field="glAccountId"/>
                     <order-by field-name="glAccountId"/>
                 </entity-and>
             </sub-node>
@@ -45,7 +45,7 @@
         <node name="node-root" render-style="simple">
             <sub-node node-name="node-body">
                 <entity-and entity-name="FixedAsset">
-                    <field-map field-name="parentFixedAssetId" env-name="fixedAssetId"/>
+                    <field-map field-name="parentFixedAssetId" from-field="fixedAssetId"/>
                     <order-by field-name="fixedAssetName"/>
                 </entity-and>
             </sub-node>
@@ -54,7 +54,7 @@
             <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}" text="${fixedAssetId} ${fixedAssetName} ${instanceOfProductId} ${fixedAssetTypeId} "/>
             <sub-node node-name="node-body">
                 <entity-and entity-name="FixedAsset">
-                    <field-map field-name="parentFixedAssetId" env-name="fixedAssetId"/>
+                    <field-map field-name="parentFixedAssetId" from-field="fixedAssetId"/>
                     <order-by field-name="fixedAssetName"/>
                 </entity-and>
             </sub-node>

Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sun Jan 25 18:33:55 2009
@@ -35,13 +35,13 @@
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field-name="agreement"/></not>
+                                        <not><if-empty field="agreement"/></not>
                                     </condition>
                                     <widgets>
                                         <include-menu name="AgreementTabBar" location="component://accounting/widget/Menus.xml"/>
                                         <section>
                                             <condition>
-                                                <not><if-empty field-name="agreementItem"/></not>
+                                                <not><if-empty field="agreementItem"/></not>
                                             </condition>
                                             <widgets>
                                                 <include-menu name="AgreementItemTabBar" location="component://accounting/widget/Menus.xml"/>
@@ -112,14 +112,14 @@
                 <set field="headerItem" value="agreements"/>
                 <set field="tabButtonItem" value="AgreementMain"/>
                 <set field="agreementId" from-field="parameters.agreementId"/>
-                <entity-one entity-name="Agreement" value-name="agreement"/>
+                <entity-one entity-name="Agreement" value-field="agreement"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <not><if-empty field-name="agreement"/></not>
+                                <not><if-empty field="agreement"/></not>
                             </condition>
                             <widgets>
                                 <container style="button-bar">
@@ -156,9 +156,9 @@
                 <set field="titleProperty" value="PageTitleListAgreementItems"/>
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-and entity-name="AgreementItem" list-name="agreementItems">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-and entity-name="AgreementItem" list="agreementItems">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -197,8 +197,8 @@
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />                
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -234,7 +234,7 @@
                 <set field="tabButtonItem" value="AgreementTerms"/>
                 <set field="buttonBarItem" value="EditAgreementTerms"/>
                 <set field="agreementId" from-field="parameters.agreementId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -256,11 +256,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementPromoAppls"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementPromoAppl" list-name="agreementPromoAppls">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementPromoAppl" list="agreementPromoAppls">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                     <order-by field-name="sequenceNum"/>
                 </entity-and>
             </actions>
@@ -299,9 +299,9 @@
                 <set field="buttonBarItem" value="ListAgreementPromoAppls"/>
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementTermId" from-field="parameters.agreementTermId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
-                <entity-one entity-name="AgreementPromoAppl" value-name="agreementPromoAppl" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
+                <entity-one entity-name="AgreementPromoAppl" value-field="agreementPromoAppl" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -336,11 +336,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementItemTerms"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementTerm" list-name="agreementTerms">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementTerm" list="agreementTerms">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -379,9 +379,9 @@
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <set field="agreementTermId" from-field="parameters.agreementTermId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
-                <entity-one entity-name="AgreementTerm" value-name="agreementTerm" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
+                <entity-one entity-name="AgreementTerm" value-field="agreementTerm" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -416,11 +416,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementItemProducts"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementProductAppl" list-name="agreementProducts">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementProductAppl" list="agreementProducts">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -457,11 +457,11 @@
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementProductAppl" list-name="agreementProducts">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementProductAppl" list="agreementProducts">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -526,9 +526,9 @@
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <set field="productId" from-field="parameters.productId"/>
 
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-one entity-name="AgreementProductAppl" value-name="agreementProductAppl" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-one entity-name="AgreementProductAppl" value-field="agreementProductAppl" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -563,11 +563,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementItemSupplierProducts"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="SupplierProduct" list-name="agreementProducts">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="SupplierProduct" list="agreementProducts">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -604,11 +604,11 @@
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="SupplierProduct" list-name="agreementProducts">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="SupplierProduct" list="agreementProducts">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -672,16 +672,16 @@
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-one entity-name="SupplierProduct" value-name="agreementProductAppl" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-one entity-name="SupplierProduct" value-field="agreementProductAppl" auto-field-map="true"/>
             </actions>
             <widgets>
             <section>
             <condition>
                 <and>
-                    <not><if-empty field-name="agreement.partyIdTo"/></not>
-                    <not><if-empty field-name="agreementItem.currencyUomId"/></not>
+                    <not><if-empty field="agreement.partyIdTo"/></not>
+                    <not><if-empty field="agreementItem.currencyUomId"/></not>
                 </and>
             </condition>
             <widgets>
@@ -728,11 +728,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementItemParties"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementPartyApplic" list-name="agreementParties">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementPartyApplic" list="agreementParties">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -771,9 +771,9 @@
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <set field="partyId" from-field="parameters.partyId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-one entity-name="AgreementPartyApplic" value-name="agreementPartyApplic" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-one entity-name="AgreementPartyApplic" value-field="agreementPartyApplic" auto-field-map="true"/>
            </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -808,11 +808,11 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementItems"/>
                 <set field="buttonBarItem" value="ListAgreementGeographicalApplic"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem"/>
-                <entity-and entity-name="AgreementGeographicalApplic" list-name="agreementGeographicalApplics">
-                    <field-map env-name="agreement.agreementId" field-name="agreementId"/>
-                    <field-map env-name="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem"/>
+                <entity-and entity-name="AgreementGeographicalApplic" list="agreementGeographicalApplics">
+                    <field-map from-field="agreement.agreementId" field-name="agreementId"/>
+                    <field-map from-field="agreementItem.agreementItemSeqId" field-name="agreementItemSeqId"/>
                 </entity-and>
             </actions>
             <widgets>
@@ -851,9 +851,9 @@
                 <set field="agreementId" from-field="parameters.agreementId"/>
                 <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
                 <set field="geoId" from-field="parameters.geoId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
-                <entity-one entity-name="AgreementItem" value-name="agreementItem" auto-field-map="true"/>
-                <entity-one entity-name="AgreementGeographicalApplic" value-name="agreementGeographicalApplic" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
+                <entity-one entity-name="AgreementItem" value-field="agreementItem" auto-field-map="true"/>
+                <entity-one entity-name="AgreementGeographicalApplic" value-field="agreementGeographicalApplic" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -888,7 +888,7 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementWorkEffortAppls"/>
                 <set field="agreementId" from-field="parameters.agreementId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
@@ -909,7 +909,7 @@
                 <set field="headerItem" value="agreement"/>
                 <set field="tabButtonItem" value="AgreementRoles"/>
                 <set field="agreementId" from-field="parameters.agreementId"/>
-                <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
+                <entity-one entity-name="Agreement" value-field="agreement" auto-field-map="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sun Jan 25 18:33:55 2009
@@ -52,22 +52,22 @@
     <form name="ListBillingAccountInvoices" type="list" list-name="billingAccountInvoices" paginate-target="BillingAccountInvoices" default-entity-name="Invoice"
         odd-row-style="alternate-row"  header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="Invoice" list-name="billingAccountInvoices">
+            <entity-condition entity-name="Invoice" list="billingAccountInvoices">
                 <condition-list>
-                    <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
-                    <condition-expr field-name="statusId" env-name="parameters.statusId" ignore-if-empty="true"/>
+                    <condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
+                    <condition-expr field-name="statusId" from-field="parameters.statusId" ignore-if-empty="true"/>
                 </condition-list>
             </entity-condition>
         </actions>
         <row-actions>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
-                <field-map field-name="partyId" env-name="partyIdFrom"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultFrom">
+                <field-map field-name="partyId" from-field="partyIdFrom"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
-            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
-                <field-map field-name="partyId" env-name="partyId"/>
-                <field-map field-name="compareDate" env-name="invoiceDate"/>
+            <service service-name="getPartyNameForDate" result-map="partyNameResultTo">
+                <field-map field-name="partyId" from-field="partyId"/>
+                <field-map field-name="compareDate" from-field="invoiceDate"/>
                 <field-map field-name="lastNameFirst" value="Y"/>
             </service>
             <set field="paidInvoice" value="${bsh: org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(BigDecimal.ZERO)==0}" type="Boolean"/>
@@ -146,8 +146,8 @@
     <form name="ListBillingAccountRoles" type="list"  list-name="billingAccountRoleList" target="updateBillingAccountRole"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="BillingAccountRole" list-name="billingAccountRoleList">
-                <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
+            <entity-condition entity-name="BillingAccountRole" list="billingAccountRoleList">
+                <condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
                 <order-by field-name="roleTypeId"/>
             </entity-condition>
         </actions>
@@ -189,8 +189,8 @@
     <form name="ListBillingAccountTerms" type="list" list-name="billingAccountTermsList" default-entity-name="BillingAccountTerm" paginate-target="EditBillingAccountTerms"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="BillingAccountTerm" list-name="billingAccountTermsList">
-                <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
+            <entity-condition entity-name="BillingAccountTerm" list="billingAccountTermsList">
+                <condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
             </entity-condition>
         </actions>
         <field name="billingAccountId"><hidden/></field>
@@ -234,8 +234,8 @@
     <form name="ListBillingAccountPayments" type="list" list-name="payments" paginate-target="BillingAccountPayments"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="PaymentAndApplication" list-name="payments">
-                <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
+            <entity-condition entity-name="PaymentAndApplication" list="payments">
+                <condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
             </entity-condition>
         </actions>
         <field name="paymentId" widget-style="buttontext">

Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sun Jan 25 18:33:55 2009
@@ -33,7 +33,7 @@
                             <widgets>
                                 <section>
                                     <condition>
-                                        <not><if-empty field-name="billingAccount"/></not>
+                                        <not><if-empty field="billingAccount"/></not>
                                     </condition>
                                     <widgets>
                                         <include-menu name="BillingAccountTabBar" location="component://accounting/widget/Menus.xml"/>
@@ -64,12 +64,12 @@
                     <decorator-section name="body">
                         <section>
                             <condition>
-                                <if-empty field-name="parameters.partyId"/>
+                                <if-empty field="parameters.partyId"/>
                             </condition>
                             <widgets>
                                 <section>
                                     <actions>
-                                        <entity-condition entity-name="BillingAccount" list-name="billingAccounts"/>
+                                        <entity-condition entity-name="BillingAccount" list="billingAccounts"/>
                                     </actions>
                                     <widgets>
                                         <screenlet title="${uiLabelMap.PageTitleFindBillingAccount}">
@@ -82,8 +82,8 @@
                             <fail-widgets>
                                 <section>
                                     <actions>
-                                        <entity-condition entity-name="BillingAccountAndRole" list-name="billingAccounts">
-                                            <condition-expr field-name="partyId" env-name="parameters.partyId"/>
+                                        <entity-condition entity-name="BillingAccountAndRole" list="billingAccounts">
+                                            <condition-expr field-name="partyId" from-field="parameters.partyId"/>
                                         </entity-condition>
                                     </actions>
                                     <widgets>
@@ -108,7 +108,7 @@
                 <set field="tabButtonItem" value="EditBillingAccount"/>
                 <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />                
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="roleTypeId" from-field="parameters.roleTypeId"/>
             </actions>
@@ -131,7 +131,7 @@
                 <set field="tabButtonItem" value="EditBillingAccountRoles"/>
                 
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonBillingAccountDecorator">
@@ -154,7 +154,7 @@
                 
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
                 <set field="billingAccountTermId" from-field="parameters.billingAccountTermId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonBillingAccountDecorator">
@@ -175,10 +175,10 @@
                         </container>
                         <section>
                             <condition>
-                                <not><if-empty field-name="parameters.billingAccountTermId"/></not>
+                                <not><if-empty field="parameters.billingAccountTermId"/></not>
                             </condition>
                             <actions>
-                                <entity-one entity-name="BillingAccountTerm" value-name="billingAccountTerm"/>
+                                <entity-one entity-name="BillingAccountTerm" value-field="billingAccountTerm"/>
                             </actions>
                             <widgets>
                                 <container style="screenlet">
@@ -227,7 +227,7 @@
                 
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
                 <set field="billingAccountTermId" from-field="parameters.billingAccountTermId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonBillingAccountDecorator">
@@ -249,7 +249,7 @@
                 <set field="tabButtonItem" value="BillingAccountOrders"/>
                     
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
                 <script location="component://accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy"/>
             </actions>
             <widgets>
@@ -282,10 +282,10 @@
                 <set field="tabButtonItem" value="BillingAccountPayments"/>
 
                 <set field="billingAccountId" from-field="parameters.billingAccountId"/>
-                <entity-one entity-name="BillingAccount" value-name="billingAccount"/>
-                <entity-condition entity-name="BillingAccountAndRole" list-name="billToCustomers" filter-by-date="true">
+                <entity-one entity-name="BillingAccount" value-field="billingAccount"/>
+                <entity-condition entity-name="BillingAccountAndRole" list="billToCustomers" filter-by-date="true">
                     <condition-list>
-                        <condition-expr field-name="billingAccountId" env-name="billingAccountId"/>
+                        <condition-expr field-name="billingAccountId" from-field="billingAccountId"/>
                         <condition-expr field-name="roleTypeId" value="BILL_TO_CUSTOMER"/>
                     </condition-list>
                 </entity-condition>