OFBiz › OFBiz - Commits

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

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r737563 [3/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/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sun Jan 25 18:33:55 2009
@@ -42,7 +42,7 @@
<menu name="InvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="invoiceOverview" title="${uiLabelMap.AccountingInvoiceOverview}">
<condition>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
</condition>
<link target="invoiceOverview?invoiceId=${invoice.invoiceId}"/>
</menu-item>
@@ -50,11 +50,11 @@
<menu-item name="editInvoice" title="${uiLabelMap.AccountingInvoiceHeader}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -64,11 +64,11 @@
<menu-item name="listInvoiceItems" title="${uiLabelMap.AccountingInvoiceItems}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -78,11 +78,11 @@
<menu-item name="EditInvoiceTimeEntries" title="${uiLabelMap.AccountingInvoiceTimeEntries}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -92,11 +92,11 @@
<menu-item name="invoiceRoles" title="${uiLabelMap.AccountingInvoiceRoles}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -106,12 +106,12 @@
<menu-item name="editInvoiceApplications" title="${uiLabelMap.AccountingApplications}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
</or>
</and>
</condition>
@@ -120,7 +120,7 @@

<menu-item name="sendPerEmail" title="${uiLabelMap.CommonSendPerEmail}">
<condition>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
</condition>
<link target="sendPerEmail?invoiceId=${invoice.invoiceId}"/>
</menu-item>
@@ -131,21 +131,21 @@
</menu-item>
<menu-item name="copyInvoice" title="${uiLabelMap.CommonCopy}">
<condition>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
</condition>
<link target="copyInvoice?invoiceIdToCopyFrom=${invoiceId}"/>
</menu-item>
<menu-item name="pdf" title="${uiLabelMap.AccountingInvoicePDF}">
<condition>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
</condition>
<link target="invoice.pdf?invoiceId=${invoice.invoiceId}" target-window="_BLANK"/>
</menu-item>
<menu-item name="pdfDfltCur" title="${uiLabelMap.AccountingInvoicePDFDefaultCur}(${defaultOrganizationPartyCurrencyUomId})">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
- <if-compare-field field-name="invoice.currencyUomId" operator="not-equals" to-field-name="defaultOrganizationPartyCurrencyUomId"/>
+ <not><if-empty field="invoice.invoiceId"/></not>
+ <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultOrganizationPartyCurrencyUomId"/>
</and>
</condition>
<link target="invoice.pdf?invoiceId=${invoice.invoiceId}&currency=${defaultOrganizationPartyCurrencyUomId}" target-window="_BLANK"/>
@@ -153,10 +153,10 @@
<menu-item name="statusToApproved" title="${uiLabelMap.AccountingInvoiceStatusToApproved}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -165,11 +165,11 @@
<menu-item name="statusToReceived" title="${uiLabelMap.AccountingInvoiceStatusToReceived}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <not><if-empty field="invoice.invoiceId"/></not>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
<or>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="CUST_RTN_INVOICE"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="CUST_RTN_INVOICE"/>
</or>
</and>
</condition>
@@ -179,14 +179,14 @@
<condition>
<or>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
+ <not><if-empty field="invoice.invoiceId"/></not>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
</and>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
+ <not><if-empty field="invoice.invoiceId"/></not>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
</and>
</or>
</condition>
@@ -195,12 +195,12 @@
<menu-item name="statusToReady" title="${uiLabelMap.AccountingInvoiceStatusToReady}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_APPROVED"/>
</or>
</and>
</condition>
@@ -209,9 +209,9 @@
<menu-item name="statusToPaid" title="${uiLabelMap.AccountingInvoiceStatusToPaid}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_READY"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_READY"/>
</or>
</and>
</condition>
@@ -220,9 +220,9 @@
<menu-item name="statusToWriteoff" title="${uiLabelMap.AccountingInvoiceStatusToWriteoff}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_READY"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_READY"/>
</or>
</and>
</condition>
@@ -231,10 +231,10 @@
<menu-item name="statusToInProcess" title="${uiLabelMap.AccountingInvoiceStatusToInProcess}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -243,11 +243,11 @@
<menu-item name="statusToCancelled" title="${uiLabelMap.AccountingInvoiceStatusToCancelled}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
- <if-compare field-name="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_SENT"/>
+ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_RECEIVED"/>
</or>
</and>
</condition>
@@ -256,10 +256,10 @@
<menu-item name="saveInvoiceAsTemplate" title="${uiLabelMap.ProjectMgrSaveAsTemplate}">
<condition>
<and>
- <not><if-empty field-name="invoice.invoiceId"/></not>
+ <not><if-empty field="invoice.invoiceId"/></not>
<or>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE"/>
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="PURCHASE_INVOICE"/>
</or>
</and>
</condition>
@@ -270,13 +270,13 @@
<menu name="PaymentTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="find" title="${uiLabelMap.CommonFind}" >
<condition>
- <if-compare field-name="tabButtonItem" operator="not-equals" value="find"/>
+ <if-compare field="tabButtonItem" operator="not-equals" value="find"/>
</condition>
<link target="findPayments"/>
</menu-item>
<menu-item name="paymentOverview" title="${uiLabelMap.AccountingPaymentTabOverview}">
<condition>
- <not><if-empty field-name="payment.paymentId"/></not>
+ <not><if-empty field="payment.paymentId"/></not>
</condition>
<link target="paymentOverview?paymentId=${payment.paymentId}"/>
</menu-item>
@@ -284,11 +284,11 @@
<menu-item name="editPayment" title="${uiLabelMap.AccountingPaymentTabHeader}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
+ <not><if-empty field="payment.paymentId"/></not>
<or>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_SENT"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_SENT"/>
</or>
</and>
</condition>
@@ -297,11 +297,11 @@
<menu-item name="editPaymentApplications" title="${uiLabelMap.AccountingPaymentTabApplications}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
+ <not><if-empty field="payment.paymentId"/></not>
<or>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_SENT"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_SENT"/>
</or>
</and>
</condition>
@@ -316,16 +316,16 @@
</actions>
<menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
<condition>
- <not><if-empty field-name="payment.paymentId"/></not>
+ <not><if-empty field="payment.paymentId"/></not>
</condition>
<link target="newPayment"/>
</menu-item>
<menu-item name="statusToSend" title="${uiLabelMap.AccountingPaymentTabStatusToSent}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
- <if-compare field-name="isDisbursement" operator="equals" value="true"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <not><if-empty field="payment.paymentId"/></not>
+ <if-compare field="isDisbursement" operator="equals" value="true"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
</and>
</condition>
<link target="setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_SENT"/>
@@ -333,9 +333,9 @@
<menu-item name="statusToReceived" title="${uiLabelMap.AccountingPaymentTabStatusToReceived}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
- <if-compare field-name="isDisbursement" operator="equals" value="false"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <not><if-empty field="payment.paymentId"/></not>
+ <if-compare field="isDisbursement" operator="equals" value="false"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
</and>
</condition>
<link target="setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_RECEIVED"/>
@@ -343,8 +343,8 @@
<menu-item name="statusToCancelled" title="${uiLabelMap.AccountingPaymentTabStatusToCancelled}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <not><if-empty field="payment.paymentId"/></not>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
</and>
</condition>
<link target="javascript:confirmActionLink('You want to cancel this payment number ${payment.paymentId}?','setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_CANCELLED')" url-mode="plain"/>
@@ -352,10 +352,10 @@
<menu-item name="statusToConfirmed" title="${uiLabelMap.AccountingPaymentTabStatusToConfirmed}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
+ <not><if-empty field="payment.paymentId"/></not>
<or>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_SENT"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_SENT"/>
</or>
</and>
</condition>
@@ -364,8 +364,8 @@
<menu-item name="printAsCheck" title="${uiLabelMap.AccountingPrintAsCheck}">
<condition>
<and>
- <not><if-empty field-name="payment.paymentId"/></not>
- <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <not><if-empty field="payment.paymentId"/></not>
+ <if-compare field="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
</and>
</condition>
<link target="printChecks.pdf?paymentId=${payment.paymentId}"/>
@@ -632,14 +632,14 @@

<menu-item name="ListAgreementItemSupplierProducts" title="${uiLabelMap.ProductProducts}">
<condition>
- <if-compare field-name="agreement.agreementTypeId" operator="equals" value="PURCHASE_AGREEMENT"/>
+ <if-compare field="agreement.agreementTypeId" operator="equals" value="PURCHASE_AGREEMENT"/>
</condition>
<link target="ListAgreementItemSupplierProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/>
</menu-item>

<menu-item name="ListAgreementItemProducts" title="${uiLabelMap.ProductProducts}">
<condition>
- <if-compare field-name="agreement.agreementTypeId" operator="not-equals" value="PURCHASE_AGREEMENT"/>
+ <if-compare field="agreement.agreementTypeId" operator="not-equals" value="PURCHASE_AGREEMENT"/>
</condition>
<link target="ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&agreementItemSeqId=${agreementItem.agreementItemSeqId}"/>
</menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Sun Jan 25 18:33:55 2009
@@ -28,7 +28,7 @@
<set field="titleProperty" value="CommonPaymentMethodType"/>
<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="PaymentMethodType" list-name="paymentMethodTypes">
+ <entity-condition entity-name="PaymentMethodType" list="paymentMethodTypes">
<order-by field-name="paymentMethodTypeId"/>
</entity-condition>
</actions>

Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Jan 25 18:33:55 2009
@@ -109,7 +109,7 @@
<set field="tabButtonItem" value="editPayment"/>
<set field="paymentId" from-field="parameters.paymentId"/>
<entity-one entity-name="Payment" value-field="payment">
- <field-map field-name="paymentId" env-name="parameters.paymentId"/>
+ <field-map field-name="paymentId" from-field="parameters.paymentId"/>
</entity-one>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
</actions>
@@ -156,10 +156,10 @@
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy"/>
<entity-one entity-name="PartyNameView" value-field="partyNameViewTo">
- <field-map field-name="partyId" env-name="payment.partyIdTo"/>
+ <field-map field-name="partyId" from-field="payment.partyIdTo"/>
</entity-one>
<entity-one entity-name="PartyNameView" value-field="partyNameViewFrom">
- <field-map field-name="partyId" env-name="payment.partyIdFrom"/>
+ <field-map field-name="partyId" from-field="payment.partyIdFrom"/>
</entity-one>
<entity-condition entity-name="PaymentApplication" list="paymentApplications">
<condition-expr field-name="paymentId" operator="equals" value="${paymentId}"/>
@@ -541,7 +541,7 @@
<container style="h3">
<label text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"/>
</container>
- </container>
+ </container>
<container style="screenlet-body">
<section>
<widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sun Jan 25 18:33:55 2009
@@ -76,7 +76,7 @@
<form name="TrialBalanceList" type="list" list-name="trialBalances"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId"/>
</entity-one>
<set field="showDebit" value="${bsh:(postedBalance.compareTo(java.math.BigDecimal.ZERO) >= 0 && org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)) || (postedBalance.compareTo(java.math.BigDecimal.ZERO) < 0 && org.ofbiz.accounting.util.UtilAccounting.isCreditAccount(glAccount))}" type="Boolean"/>
@@ -118,7 +118,7 @@
<form name="IncomeStatementList" type="list" list-name="glAccountTotalsList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId"/>
</entity-one>
</row-actions>
@@ -166,7 +166,7 @@
<form name="BalanceSheetAssetList" type="list" list-name="assetBalancesList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId"/>
</entity-one>
</row-actions>
@@ -178,7 +178,7 @@
<form name="BalanceSheetLiabilityList" type="list" list-name="liabilityBalancesList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId"/>
</entity-one>
</row-actions>
@@ -190,7 +190,7 @@
<form name="BalanceSheetEquityList" type="list" list-name="equityBalancesList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <entity-one entity-name="GlAccount" value-name="glAccount">
+ <entity-one entity-name="GlAccount" value-field="glAccount">
<field-map field-name="glAccountId"/>
</entity-one>
</row-actions>

Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Sun Jan 25 18:33:55 2009
@@ -105,11 +105,11 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="currencyUomId" from-field="parameters.currencyUomId"/>

- <entity-one entity-name="PartyNameView" value-name="organizationPartyName" auto-field-map="false" use-cache="true">
- <field-map field-name="partyId" env-name="organizationPartyId"/>
+ <entity-one entity-name="PartyNameView" value-field="organizationPartyName" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" from-field="organizationPartyId"/>
</entity-one>
- <entity-one entity-name="Uom" value-name="currencyUom" auto-field-map="false" use-cache="true">
- <field-map field-name="uomId" env-name="currencyUomId"/>
+ <entity-one entity-name="Uom" value-field="currencyUom" auto-field-map="false" use-cache="true">
+ <field-map field-name="uomId" from-field="currencyUomId"/>
</entity-one>
</actions>
<widgets></widgets>
@@ -125,8 +125,8 @@
<set field="titleProperty" value="PageTitleSalesInvoiceByProductCategorySummary"/>

<set field="rootProductCategoryId" from-field="parameters.rootProductCategoryId"/>
- <entity-one entity-name="ProductCategory" value-name="rootProductCategory" auto-field-map="false" use-cache="true">
- <field-map field-name="productCategoryId" env-name="rootProductCategoryId"/>
+ <entity-one entity-name="ProductCategory" value-field="rootProductCategory" auto-field-map="false" use-cache="true">
+ <field-map field-name="productCategoryId" from-field="rootProductCategoryId"/>
</entity-one>

<script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy"/>
@@ -280,15 +280,15 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="TrialBalance"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map-name="result">
+ <service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
<set field="currencyUomId" from-field="partyAcctgPreference.baseCurrencyUomId"/>
- <entity-condition entity-name="GlAccountOrganization" list-name="trialBalances" filter-by-date="true">
+ <entity-condition entity-name="GlAccountOrganization" list="trialBalances" filter-by-date="true">
<condition-list>
- <condition-expr field-name="organizationPartyId" operator="equals" env-name="organizationPartyId"/>
- <condition-expr field-name="postedBalance" operator="not-equals" env-name="null"/>
+ <condition-expr field-name="organizationPartyId" operator="equals" from-field="organizationPartyId"/>
+ <condition-expr field-name="postedBalance" operator="not-equals" from-field="null"/>
</condition-list>
<order-by field-name="glAccountId"/>
</entity-condition>
@@ -324,7 +324,7 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="IncomeStatement"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map-name="result">
+ <service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
@@ -346,7 +346,7 @@
</container>
<section>
<condition>
- <not><if-empty field-name="parameters.totalNetIncome"/></not>
+ <not><if-empty field="parameters.totalNetIncome"/></not>
</condition>
<widgets>
<container style="screenlet">
@@ -377,7 +377,7 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="BalanceSheet"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map-name="result">
+ <service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
@@ -402,9 +402,9 @@
<section>
<condition>
<or>
- <not><if-empty field-name="assetBalancesList"/></not>
- <not><if-empty field-name="liabilityBalancesList"/></not>
- <not><if-empty field-name="equityBalancesList"/></not>
+ <not><if-empty field="assetBalancesList"/></not>
+ <not><if-empty field="liabilityBalancesList"/></not>
+ <not><if-empty field="equityBalancesList"/></not>
</or>
</condition>
<widgets>
@@ -453,7 +453,7 @@
<set field="tabButtonItem" value="OrganizationAccountingReports"/>
<set field="tabButtonItem2" value="ComparativeBalanceSheet"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
- <service service-name="getPartyAccountingPreferences" result-map-name="result">
+ <service service-name="getPartyAccountingPreferences" result-map="result">
<field-map field-name="organizationPartyId"/>
</service>
<set field="partyAcctgPreference" from-field="result.partyAccountingPreference"/>
@@ -478,9 +478,9 @@
<section>
<condition>
<or>
- <not><if-empty field-name="assetBalancesList"/></not>
- <not><if-empty field-name="liabilityBalancesList"/></not>
- <not><if-empty field-name="equityBalancesList"/></not>
+ <not><if-empty field="assetBalancesList"/></not>
+ <not><if-empty field="liabilityBalancesList"/></not>
+ <not><if-empty field="equityBalancesList"/></not>
</or>
</condition>
<widgets>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Sun Jan 25 18:33:55 2009
@@ -23,7 +23,7 @@
<form name="FindTaxAuthority" type="list" list-name="taxAuthorityList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="TaxAuthority" list-name="taxAuthorityList">
+ <entity-condition entity-name="TaxAuthority" list="taxAuthorityList">
<order-by field-name="taxAuthGeoId"/>
<order-by field-name="taxAuthPartyId"/>
</entity-condition>
@@ -69,10 +69,10 @@
<form name="ListTaxAuthorityCategories" type="list" list-name="taxAuthorityCategoryList" target="updateTaxAuthorityCategory"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="TaxAuthorityCategory" list-name="taxAuthorityCategoryList">
+ <entity-condition entity-name="TaxAuthorityCategory" list="taxAuthorityCategoryList">
<condition-list combine="and">
- <condition-expr field-name="taxAuthPartyId" env-name="taxAuthPartyId"/>
- <condition-expr field-name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+ <condition-expr field-name="taxAuthPartyId" from-field="taxAuthPartyId"/>
+ <condition-expr field-name="taxAuthGeoId" from-field="taxAuthGeoId"/>
</condition-list>
<order-by field-name="productCategoryId"/>
</entity-condition>
@@ -103,10 +103,10 @@
<form name="ListTaxAuthorityAssocs" type="list" list-name="taxAuthorityAssocList" target="updateTaxAuthorityAssoc"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="TaxAuthorityAssoc" list-name="taxAuthorityAssocList">
+ <entity-condition entity-name="TaxAuthorityAssoc" list="taxAuthorityAssocList">
<condition-list combine="and">
- <condition-expr field-name="taxAuthPartyId" env-name="taxAuthPartyId"/>
- <condition-expr field-name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+ <condition-expr field-name="taxAuthPartyId" from-field="taxAuthPartyId"/>
+ <condition-expr field-name="taxAuthGeoId" from-field="taxAuthGeoId"/>
</condition-list>
<order-by field-name="toTaxAuthGeoId"/>
</entity-condition>
@@ -160,10 +160,10 @@
<form name="ListTaxAuthorityGlAccounts" type="list" list-name="taxAuthorityGlAccountList" target="updateTaxAuthorityGlAccount"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="TaxAuthorityGlAccount" list-name="taxAuthorityGlAccountList">
+ <entity-condition entity-name="TaxAuthorityGlAccount" list="taxAuthorityGlAccountList">
<condition-list combine="and">
- <condition-expr field-name="taxAuthPartyId" env-name="taxAuthPartyId"/>
- <condition-expr field-name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+ <condition-expr field-name="taxAuthPartyId" from-field="taxAuthPartyId"/>
+ <condition-expr field-name="taxAuthGeoId" from-field="taxAuthGeoId"/>
</condition-list>
<order-by field-name="glAccountId"/>
</entity-condition>
@@ -200,10 +200,10 @@
<form name="ListTaxAuthorityRateProducts" type="list" list-name="taxAuthorityRateProductList" target="updateTaxAuthorityRateProduct" separate-columns="true"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="TaxAuthorityRateProduct" list-name="taxAuthorityRateProductList">
+ <entity-condition entity-name="TaxAuthorityRateProduct" list="taxAuthorityRateProductList">
<condition-list combine="and">
- <condition-expr field-name="taxAuthPartyId" env-name="taxAuthPartyId"/>
- <condition-expr field-name="taxAuthGeoId" env-name="taxAuthGeoId"/>
+ <condition-expr field-name="taxAuthPartyId" from-field="taxAuthPartyId"/>
+ <condition-expr field-name="taxAuthGeoId" from-field="taxAuthGeoId"/>
</condition-list>
<order-by field-name="fromDate"/>
</entity-condition>
@@ -307,8 +307,8 @@
<form name="ListTaxAuthorityParties" type="list" title="" list-name="listIt"
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="orderBy" value="partyId"/>
<field-map field-name="entityName" value="PartyTaxAuthInfo"/>
</service>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Sun Jan 25 18:33:55 2009
@@ -60,7 +60,7 @@

<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="TaxAuthority" value-field="taxAuthority"/>
</actions>
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
@@ -232,7 +232,7 @@
<set field="partyId" from-field="parameters.partyId"/>
<set field="fromDate" from-field="parameters.fromDate"/>

- <entity-one entity-name="PartyTaxAuthInfo" value-name="partyTaxAuthInfo"/>
+ <entity-one entity-name="PartyTaxAuthInfo" value-field="partyTaxAuthInfo"/>
</actions>
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Sun Jan 25 18:33:55 2009
@@ -44,10 +44,10 @@
<actions>
<set field="entityName" value="PaymentGatewayResponse"/>
<set field="orderBy" value="transactionDate DESC"/>
- <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"/>
- <field-map field-name="orderBy" env-name="orderBy"/>
+ <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="orderBy"/>
</service>
</actions>
<auto-fields-entity entity-name="PaymentGatewayResponse" default-field-type="display"/>

Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Sun Jan 25 18:33:55 2009
@@ -89,7 +89,7 @@
<set field="paymentGatewayResponseId" from-field="parameters.paymentGatewayResponseId"/>
<set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/>

- <entity-one entity-name="PaymentGatewayResponse" value-name="paymentGatewayResponse" auto-field-map="true"/>
+ <entity-one entity-name="PaymentGatewayResponse" value-field="paymentGatewayResponse" auto-field-map="true"/>

<script location="component://accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy"/>
</actions>
@@ -140,8 +140,8 @@
<set field="orderId" from-field="parameters.orderId"/>
<set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/>

- <entity-one entity-name="OrderPaymentPreference" value-name="opp">
- <field-map field-name="orderPaymentPreferenceId" env-name="orderPaymentPreferenceId"/>
+ <entity-one entity-name="OrderPaymentPreference" value-field="opp">
+ <field-map field-name="orderPaymentPreferenceId" from-field="orderPaymentPreferenceId"/>
</entity-one>
<set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/>

@@ -180,8 +180,8 @@
<set field="orderId" from-field="parameters.orderId"/>
<set field="orderPaymentPreferenceId" from-field="parameters.orderPaymentPreferenceId"/>

- <entity-one entity-name="OrderPaymentPreference" value-name="opp">
- <field-map field-name="orderPaymentPreferenceId" env-name="orderPaymentPreferenceId"/>
+ <entity-one entity-name="OrderPaymentPreference" value-field="opp">
+ <field-map field-name="orderPaymentPreferenceId" from-field="orderPaymentPreferenceId"/>
</entity-one>
<set field="paymentMethodTypeId" from-field="opp.paymentMethodTypeId"/>

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sun Jan 25 18:33:55 2009
@@ -39,20 +39,20 @@
<section>
<actions>
<set field="tabButtonItem" value="main"></set>
- <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>
@@ -94,7 +94,7 @@
<container>
<container style="lefthalf">
<container style="lefthalf">
- <iterate-section list-name="paymentTypes" entry-name="paymentType">
+ <iterate-section list="paymentTypes" entry="paymentType">
<section>
<widgets>
<include-menu name="ApMainPaymentTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
@@ -103,7 +103,7 @@
</iterate-section>
</container>
<container style="righthalf">
- <iterate-section list-name="paymentMethodTypes" entry-name="paymentMethodType">
+ <iterate-section list="paymentMethodTypes" entry="paymentMethodType">
<section>
<widgets>
<include-menu name="ApMainPaymentMethodTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
@@ -114,7 +114,7 @@
</container>
<container style="righthalf">
<container style="left">
- <iterate-section list-name="paymentStatus" entry-name="paymentsStatus">
+ <iterate-section list="paymentStatus" entry="paymentsStatus">
<section>
<widgets>
<include-menu name="ApMainPaymentStatusMenu" location="component://accounting/widget/ap/Menus.xml" />
@@ -131,7 +131,7 @@
<container>
<container style="lefthalf">
<container style="lefthalf">
- <iterate-section list-name="invoiceTypes" entry-name="invoiceType">
+ <iterate-section list="invoiceTypes" entry="invoiceType">
<section>
<widgets>
<include-menu name="ApMainInvoiceTypeMenu" location="component://accounting/widget/ap/Menus.xml" />
@@ -140,7 +140,7 @@
</iterate-section>
</container>
<container style="right">
- <iterate-section list-name="invoiceStatus" entry-name="invoicesStatus">
+ <iterate-section list="invoiceStatus" entry="invoicesStatus">
<section>
<widgets>
<include-menu name="ApMainInvoiceStatusMenu" location="component://accounting/widget/ap/Menus.xml" />

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Sun Jan 25 18:33:55 2009
@@ -23,7 +23,7 @@
<form name="ListReports" type="list" separate-columns="true" title="${uiLabelMap.AccountingInvoice} ${uiLabelMap.CommonList}" list-name="listIt" target="" default-entity-name="Invoice"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="Invoice" list-name="invoices">
+ <entity-condition entity-name="Invoice" list="invoices">
<condition-list>
<condition-expr field-name="statusId" value="INVOICE_SENT"/>
<condition-expr field-name="dueDate" operator="greater" value="${nowTimestamp}"/>
@@ -33,14 +33,14 @@
</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="amountToApply" value="${bsh:

Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Sun Jan 25 18:33:55 2009
@@ -22,8 +22,8 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="ListVendors" type="list" list-name="listIt" paginate-target="findVendors" 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="Vendor"/>
<field-map field-name="orderBy" value="partyId"/>
</service>
@@ -38,7 +38,7 @@
</form>
<form name="EditVendor" type="single" target="updateVendor" title="" default-map-name="vendor">
<actions>
- <entity-one entity-name="Vendor" value-name="vendor"/>
+ <entity-one entity-name="Vendor" value-field="vendor"/>
</actions>
<alt-target use-when="partyId==null" target="createVendor"/>
<alt-target use-when="partyId!=null&&vendor!=null" target="updateVendor"/>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sun Jan 25 18:33:55 2009
@@ -43,20 +43,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/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=737563&r1=737562&r2=737563&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Sun Jan 25 18:33:55 2009
@@ -24,7 +24,7 @@
<form name="ListReports" type="list" separate-columns="true" title="Invoice List" list-name="listIt" target="" default-entity-name="Invoice"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-condition entity-name="Invoice" list-name="invoices">
+ <entity-condition entity-name="Invoice" list="invoices">
<condition-list>
<condition-expr field-name="statusId" value="INVOICE_SENT"/>
<condition-expr field-name="dueDate" operator="less" value="${nowTimestamp}"/>
@@ -34,14 +34,14 @@
</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="amountToApply" value="${bsh: