Author: jleroux
Date: Sat May 15 12:16:33 2010
New Revision: 944625
URL: http://svn.apache.org/viewvc?rev=944625&view=rev
Log:
"Applied fix from trunk for revision: 944623 "
------------------------------------------------------------------------
r944623 | jleroux | 2010-05-15 14:13:00 +0200 (sam. 15 mai 2010) | 2 lignes
Now that we have fixed the layered lookup inside layered lookup issue and the
recursive call case we can get rid of all the useless remaining
presentation="window".
I keep the example and beware LookupTimeDuration is a special case
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml
ofbiz/branches/release10.04/applications/accounting/widget/FieldLookupForms.xml
ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml
ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml
ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml
ofbiz/branches/release10.04/applications/content/webapp/content/lookup/LookupForms.xml
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml
ofbiz/branches/release10.04/applications/order/widget/ordermgr/FieldLookupForms.xml
ofbiz/branches/release10.04/applications/party/widget/partymgr/LookupForms.xml
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml
ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 15 12:16:33 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml
Sat May 15 12:16:33 2010
@@ -571,7 +571,7 @@ under the License.
</drop-down>
</field>
<field name="workEffortId">
- <lookup presentation="window" target-form-name="LookupWorkEffort"/>
+ <lookup target-form-name="LookupWorkEffort"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/FieldLookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/FieldLookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/FieldLookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/FieldLookupForms.xml
Sat May 15 12:16:33 2010
@@ -123,8 +123,8 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Payment" default-field-type="hidden"/>
<field name="paymentId"
title="${uiLabelMap.AccountingPaymentID}"><text-find/></field>
- <field name="partyIdFrom"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
+ <field name="partyIdFrom"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo"><lookup
target-form-name="LookupPartyName"/></field>
<field name="amountApplied"><text-find default-value=""></text-find>
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
@@ -166,8 +166,8 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field position="1" name="partyIdFrom"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
- <field position="2" name="partyId"
title="${uiLabelMap.AccountingPartyIdTo}"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
+ <field position="1" name="partyIdFrom"><lookup
target-form-name="LookupPartyName"/></field>
+ <field position="2" name="partyId"
title="${uiLabelMap.AccountingPartyIdTo}"><lookup
target-form-name="LookupPartyName"/></field>
<field position="1" name="Datefrom"
title="${uiLabelMap.CommonFromDate}"><date-time/></field>
<field position="2" name="DateThru"
title="${uiLabelMap.CommonThruDate}"><date-time/></field>
@@ -285,7 +285,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<field name="glReconciliationId"
title="${uiLabelMap.FormFieldTitle_glReconciliationId}"><text-find/></field>
<field name="glReconciliationName"
title="${uiLabelMap.FormFieldTitle_glReconciliationName}"><text-find/></field>
- <field name="organizationPartyId"
title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup
presentation="window" target-form-name="LookupPartyName"/></field>
+ <field name="organizationPartyId"
title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup
target-form-name="LookupPartyName"/></field>
<field name="description"
title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml
Sat May 15 12:16:33 2010
@@ -410,7 +410,7 @@ under the License.
</drop-down>
</field>
<field name="maintTemplateWorkEffortId"
use-when="fixedAssetMaint==null"
title="${uiLabelMap.AccountingFixedAssetMaintenanceTemplate}"
tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage3}">
- <lookup presentation="window" target-form-name="LookupWorkEffort"/>
+ <lookup target-form-name="LookupWorkEffort"/>
</field>
<field name="intervalMeterTypeId"
title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}">
<drop-down allow-empty="true">
Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml
(original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml Sat
May 15 12:16:33 2010
@@ -58,7 +58,7 @@ under the License.
<field name="invoiceId" position="2"><lookup
target-form-name="LookupInvoice" size="20" maxlength="20"/></field>
<field name="paymentId" position="1"><lookup
target-form-name="LookupPayment" size="20" maxlength="20"/></field>
<field name="productId" position="2"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
- <field name="workEffortId" position="1"><lookup presentation="window"
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
+ <field name="workEffortId" position="1"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId" position="2"><lookup
target-form-name="LookupShipment" size="20" maxlength="20"/></field>
<field name="fromDate" position="1"><date-time/></field>
<field name="thruDate" position="2"><date-time/></field>
@@ -236,7 +236,7 @@ under the License.
<field name="invoiceId"><lookup target-form-name="LookupInvoice"
size="20" maxlength="20"/></field>
<field name="paymentId"><lookup target-form-name="LookupPayment"
size="20" maxlength="20"/></field>
<field name="produtId"><lookup target-form-name="LookupProduct"
size="20" maxlength="20"/></field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId"><lookup target-form-name="LookupShipment"
size="20" maxlength="20"/></field>
<field name="fromDate"><date-time/></field>
<field name="thruDate"><date-time/></field>
@@ -453,7 +453,7 @@ under the License.
<field name="invoiceId" position="1"><lookup
target-form-name="LookupInvoice" size="20" maxlength="20"/></field>
<field name="paymentId" position="2"><lookup
target-form-name="LookupPayment" size="20" maxlength="20"/></field>
<field name="produtId" position="1"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
- <field name="workEffortId" position="2"><lookup presentation="window"
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
+ <field name="workEffortId" position="2"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId" position="1"><lookup
target-form-name="LookupShipment" size="20" maxlength="20"/></field>
<field name="fixedAssetId" position="2">
<drop-down allow-empty="true">
@@ -529,7 +529,7 @@ under the License.
</drop-down>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup
target-form-name="LookupPartyName" size="20" maxlength="20"/></field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="invoiceId">
<lookup target-form-name="LookupInvoice" size="20" maxlength="20">
<sub-hyperlink
target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}"
description="${acctgTrans.invoiceId}"/>
@@ -744,7 +744,7 @@ under the License.
<field name="invoiceId" position="1"><lookup
target-form-name="LookupInvoice" size="20" maxlength="20"/></field>
<field name="paymentId" position="2"><lookup
target-form-name="LookupPayment" size="20" maxlength="20"/></field>
<field name="productId" position="1"><lookup
target-form-name="LookupProduct" size="20" maxlength="20"/></field>
- <field name="workEffortId" position="2"><lookup presentation="window"
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
+ <field name="workEffortId" position="2"><lookup
target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field>
<field name="shipmentId" position="1"><lookup
target-form-name="LookupShipment" size="20" maxlength="20"/></field>
<field name="fixedAssetId" position="2">
<drop-down allow-empty="true">
Modified:
ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml
Sat May 15 12:16:33 2010
@@ -278,7 +278,7 @@ under the License.
</drop-down>
</field>
<field name="partyId"><lookup
target-form-name="LookupPartyName"></lookup></field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"><sub-hyperlink target="ww"
description="${workEffortName}"/></lookup></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort"><sub-hyperlink target="ww"
description="${workEffortName}"/></lookup></field>
<field name="emplPositionTypeId" position="2">
<drop-down allow-empty="true">
<entity-options entity-name="EmplPositionType"
description="${description}">
Modified:
ofbiz/branches/release10.04/applications/content/webapp/content/lookup/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/webapp/content/lookup/LookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/content/webapp/content/lookup/LookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/content/webapp/content/lookup/LookupForms.xml
Sat May 15 12:16:33 2010
@@ -51,13 +51,13 @@ under the License.
<text-find/>
</field>
<field name="createdByUserLogin">
- <lookup presentation="window" target-form-name="LookupPerson"/>
+ <lookup target-form-name="LookupPerson"/>
</field>
<field name="createdDate">
<date-find/>
</field>
<field name="lastModifiedByUserLogin">
- <lookup presentation="window" target-form-name="LookupParty"/>
+ <lookup target-form-name="LookupParty"/>
</field>
<field name="lastModifiedDate">
<date-find/>
Modified:
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml
Sat May 15 12:16:33 2010
@@ -43,10 +43,10 @@ under the License.
</drop-down>
</field>
<field name="dataResourceId" position="1">
- <lookup presentation="window"
target-form-name="LookupDataResource"/>
+ <lookup target-form-name="LookupDataResource"/>
</field>
<field name="ownerContentId" position="2">
- <lookup presentation="window" target-form-name="LookupContent"/>
+ <lookup target-form-name="LookupContent"/>
</field>
<field name="statusId">
<drop-down allow-empty="true">
@@ -56,7 +56,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="createdByUserLogin" position="2"><lookup
presentation="window" target-form-name="LookupPerson"/></field>
+ <field name="createdByUserLogin" position="2"><lookup
target-form-name="LookupPerson"/></field>
<field name="localeString">
<drop-down allow-empty="true">
<entity-options entity-name="CountryCode"
description="${countryName} [${countryCode}]" key-field-name="countryCode">
@@ -518,7 +518,7 @@ under the License.
<auto-fields-service service-name="createWorkEffortContent"/>
<field name="contentId"><hidden
value="${parameters.contentId}"/></field>
<field name="workEffortId">
- <lookup presentation="window" target-form-name="LookupWorkEffort"/>
+ <lookup target-form-name="LookupWorkEffort"/>
</field>
<field name="workEffortContentTypeId">
<drop-down no-current-selected-key="">
Modified:
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
Sat May 15 12:16:33 2010
@@ -30,7 +30,7 @@ under the License.
</drop-down>
</field>
<!-- This lookup does not exist, is there for a long time? (I did not
find its date of introduction, the older I found is r615322) and I can't see
anything close -->
- <!--field name="customTimePeriodId"><lookup presentation="window"
target-form-name="LookupCustomTimePeriod"/></field-->
+ <!--field name="customTimePeriodId"><lookup
target-form-name="LookupCustomTimePeriod"/></field-->
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -58,7 +58,7 @@ under the License.
<entity-options description="${description}"
key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options>
</drop-down>
</field>
- <field name="budgetId"><lookup presentation="window"
target-form-name="LookupBudget"/></field>
+ <field name="budgetId"><lookup
target-form-name="LookupBudget"/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -91,9 +91,9 @@ under the License.
<entity-options description="${description}"
key-field-name="emplPositionTypeId"
entity-name="EmplPositionType"></entity-options>
</drop-down>
</field>
- <field name="partyId"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
- <field name="budgetId"><lookup presentation="window"
target-form-name="LookupBudget"/></field>
- <field name="budgetItemSeqId"><lookup presentation="window"
target-form-name="LookupBudgetItem"/></field>
+ <field name="partyId"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="budgetId"><lookup
target-form-name="LookupBudget"/></field>
+ <field name="budgetItemSeqId"><lookup
target-form-name="LookupBudgetItem"/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified:
ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml
Sat May 15 12:16:33 2010
@@ -516,7 +516,7 @@ under the License.
<alt-target use-when="workEffort==null" target="createworkeffort"/>
<field name="custRequestId"><hidden/></field>
<field name="custRequestItemSeqId"><hidden/></field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified:
ofbiz/branches/release10.04/applications/order/widget/ordermgr/FieldLookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/widget/ordermgr/FieldLookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/order/widget/ordermgr/FieldLookupForms.xml
Sat May 15 12:16:33 2010
@@ -47,7 +47,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="productStoreId"><lookup presentation="window"
target-form-name="/marketing/control/LookupProductStore"/></field>
+ <field name="productStoreId"><lookup
target-form-name="/marketing/control/LookupProductStore"/></field>
<field name="currencyUom">
<drop-down allow-empty="true"
no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}">
<entity-options key-field-name="uomId"
description="${description} - ${abbreviation}" entity-name="Uom">
@@ -215,7 +215,7 @@ under the License.
</drop-down>
</field>
-->
- <field name="partyId"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
+ <field name="partyId"><lookup
target-form-name="LookupPartyName"/></field>
<field name="custRequestCategoryId"><hidden/></field>
<field name="priority"><hidden/></field>
<field name="description"><hidden/></field>
@@ -302,7 +302,7 @@ under the License.
<entity-options description="${description}"
entity-name="QuoteType" key-field-name="quoteTypeId"/>
</drop-down>
</field>
- <field name="partyId"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
+ <field name="partyId"><lookup
target-form-name="LookupPartyName"/></field>
<field name="issueDate"
title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false">
@@ -365,8 +365,8 @@ under the License.
<field name="quoteId"><hidden/></field>
<field name="isPromo"><hidden/></field>
<field name="quoteItemSeqId"
title="${uiLabelMap.OrderOrderQuoteItemSeqId}"><display/></field>
- <field name="productId"><lookup presentation="window"
target-form-name="LookupProduct"/></field>
- <field name="productFeatureId"><lookup presentation="window"
target-form-name="LookupProductFeature"/></field>
+ <field name="productId"><lookup
target-form-name="LookupProduct"/></field>
+ <field name="productFeatureId"><lookup
target-form-name="LookupProductFeature"/></field>
<field name="deliverableTypeId"
title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}"
entity-name="DeliverableType" key-field-name="deliverableTypeId"/>
@@ -466,7 +466,7 @@ under the License.
</drop-down>
</field>
<field name="productId">
- <lookup presentation="window" target-form-name="LookupProduct"/>
+ <lookup target-form-name="LookupProduct"/>
</field>
<field name="description"
title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="requirementStartDate"
title="${uiLabelMap.OrderRequirementStartDate}"><date-find type="date"/></field>
Modified:
ofbiz/branches/release10.04/applications/party/widget/partymgr/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/LookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/party/widget/partymgr/LookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/party/widget/partymgr/LookupForms.xml
Sat May 15 12:16:33 2010
@@ -317,8 +317,8 @@ under the License.
<form name="LookupCommEvent" type="single" target="LookupCommEvent"
header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId"
title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field>
- <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup
presentation="window" target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup
presentation="window" target-form-name="LookupPartyName"/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup
target-form-name="LookupPartyName"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<entity-options description="${description}"
entity-name="StatusItem">
@@ -347,7 +347,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="custRequestId"
title="${uiLabelMap.PartyServicemgntCustRequestId}"><lookup
presentation="window" size="20" target-form-name="LookupCustRequest"/></field>
+ <field name="custRequestId"
title="${uiLabelMap.PartyServicemgntCustRequestId}"><lookup size="20"
target-form-name="LookupCustRequest"/></field>
<field name="datetimeStarted"
title="${uiLabelMap.CommonStartDate}"><date-find/></field>
<field name="datetimeEnded"
title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
<field map-name="subjectMap" name="subject"
title="${uiLabelMap.PartyCommEventSubject}"><text-find/></field>
Modified:
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
Sat May 15 12:16:33 2010
@@ -1316,7 +1316,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="maintTemplateWorkEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="maintTemplateWorkEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="intervalUomId">
<drop-down allow-empty="true">
<entity-options entity-name="Uom" description="${description}"
key-field-name="uomId">
@@ -1351,7 +1351,7 @@ under the License.
</drop-down>
</field>
<field name="maintName"><text size="20"/></field>
- <field name="maintTemplateWorkEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="maintTemplateWorkEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="intervalUomId">
<drop-down allow-empty="false">
<entity-options entity-name="Uom" description="${description}"
key-field-name="uomId">
@@ -1716,7 +1716,7 @@ under the License.
<auto-fields-service service-name="createWorkEffortGoodStandard"/>
<field name="productId"><hidden
value="${parameters.productId}"/></field>
<field name="workEffortId">
- <lookup presentation="window" target-form-name="LookupWorkEffort"/>
+ <lookup target-form-name="LookupWorkEffort"/>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
Modified:
ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
(original)
+++ ofbiz/branches/release10.04/applications/workeffort/widget/LookupForms.xml
Sat May 15 12:16:33 2010
@@ -58,9 +58,9 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="workEffortParentId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
- <field name="facilityId"><lookup presentation="window"
target-form-name="LookupFacility"/></field>
- <field name="fixedAssetId"><lookup presentation="window"
target-form-name="LookupFixedAsset"/></field>
+ <field name="workEffortParentId"><lookup
target-form-name="LookupWorkEffort"/></field>
+ <field name="facilityId"><lookup
target-form-name="LookupFacility"/></field>
+ <field name="fixedAssetId"><lookup
target-form-name="LookupFixedAsset"/></field>
<field name="scopeEnumId">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration"
key-field-name="enumId" description="${description}">
@@ -126,9 +126,9 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="workEffortParentId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
- <field name="facilityId"><lookup presentation="window"
target-form-name="LookupFacility"/></field>
- <field name="fixedAssetId"><lookup presentation="window"
target-form-name="LookupFixedAsset"/></field>
+ <field name="workEffortParentId"><lookup
target-form-name="LookupWorkEffort"/></field>
+ <field name="facilityId"><lookup
target-form-name="LookupFacility"/></field>
+ <field name="fixedAssetId"><lookup
target-form-name="LookupFixedAsset"/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
@@ -157,8 +157,8 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="Timesheet" default-field-type="find"/>
<field name="timesheetId"
title="${uiLabelMap.WorkEffortTimesheetTimesheetId}"><text-find/></field>
- <field name="partyId"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
- <field name="clientPartyId"><lookup presentation="window"
target-form-name="LookupPartyName"/></field>
+ <field name="partyId"><lookup
target-form-name="LookupPartyName"/></field>
+ <field name="clientPartyId"><lookup
target-form-name="LookupPartyName"/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}"
widget-style="buttontext"><submit button-type="text-link"/></field>
Modified:
ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml
Sat May 15 12:16:33 2010
@@ -59,7 +59,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="hours"><text size="5"/></field>
<field name="comments"><text size="40"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -259,7 +259,7 @@ under the License.
</drop-down>
</field>
- <field name="workEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="invoiceId"><ignored/><!-- don't pass, will be populated
when this is added to an invoice later --></field>
<field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be
populated when this is added to an invoice later --></field>
Modified:
ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml
Sat May 15 12:16:33 2010
@@ -124,7 +124,7 @@ under the License.
</field>
-<!-- <field name="workEffortParentId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field> -->
+<!-- <field name="workEffortParentId"><lookup
target-form-name="LookupWorkEffort"/></field> -->
<field name="facilityId"><lookup
target-form-name="LookupFacility"/></field>
<!-- <field name="fixedAssetId"><lookup
target-form-name="LookupFixedAsset"/></field> -->
<field name="moneyUomId" title="${uiLabelMap.CommonCurrency}">
@@ -291,7 +291,7 @@ under the License.
<field name="workEffortId"><hidden value=""/></field>
-->
<field name="workEffortIdFrom"><display-entity
entity-name="WorkEffort" key-field-name="workEffortId"
description="${workEffortName} [${workEffortId}]"/></field>
- <field name="workEffortIdTo"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortIdTo"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="workEffortAssocTypeId">
<drop-down>
<entity-options entity-name="WorkEffortAssocType"
description="${description}">
@@ -319,7 +319,7 @@ under the License.
<form name="AddWorkEffortAssoc" target="createWorkEffortAssoc" title=""
type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="workEffortIdFrom"><display-entity
entity-name="WorkEffort" key-field-name="workEffortId"
description="${workEffortName} [${workEffortId}]"/></field>
- <field name="workEffortIdTo"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="workEffortIdTo"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="workEffortAssocTypeId">
<drop-down>
<entity-options entity-name="WorkEffortAssocType"
description="${description}">
@@ -833,7 +833,7 @@ under the License.
</actions>
<field name="timeEntryId"><hidden/></field>
<field name="timesheetId">
- <lookup presentation="window" size="10"
target-form-name="LookupTimesheet">
+ <lookup size="10" target-form-name="LookupTimesheet">
<sub-hyperlink target="EditTimesheet" link-style="buttontext"
description="${uiLabelMap.WorkEffortTimesheet}:${timesheetId}">
<parameter param-name="timesheetId"/>
</sub-hyperlink>
@@ -871,7 +871,7 @@ under the License.
<auto-fields-service service-name="createTimeEntry"/>
<field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced
--></field>
- <field name="timesheetId"><lookup presentation="window" size="10"
target-form-name="LookupTimesheet"/></field>
+ <field name="timesheetId"><lookup size="10"
target-form-name="LookupTimesheet"/></field>
<field name="partyId" title="${uiLabelMap.PartyParty}"><lookup
target-form-name="LookupPartyName"
default-value="${timesheet.partyId}"/></field>
<field name="rateTypeId"
title="${uiLabelMap.WorkEffortTimesheetRateType}">
Modified:
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
(original)
+++
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
Sat May 15 12:16:33 2010
@@ -117,7 +117,7 @@
</entity-options>
</drop-down>
</field>
- <field name="productId" title="${uiLabelMap.AssetMaintPartId}*"
required-field="true"><lookup presentation="window"
target-form-name="LookupPartsProduct"/></field>
+ <field name="productId" title="${uiLabelMap.AssetMaintPartId}*"
required-field="true"><lookup target-form-name="LookupPartsProduct"/></field>
<field name="quantity" position="1"
title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field>
<field name="maintHistSeqId"><hidden/></field>
<field name="fixedAssetId"><hidden/></field>
Modified:
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml
(original)
+++
ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/forms/ProductForms.xml
Sat May 15 12:16:33 2010
@@ -140,7 +140,7 @@
</field>
<field name="intervalQuantity"><text/></field>
<field name="repeatCount"><text/></field>
- <field name="maintTemplateWorkEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="maintTemplateWorkEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
<hyperlink target="deleteProductMaint"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
Modified:
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=944625&r1=944624&r2=944625&view=diff
==============================================================================
---
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
(original)
+++
ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
Sat May 15 12:16:33 2010
@@ -356,7 +356,7 @@
<field name="workEffortAssocTypeId"><hidden/></field>
<field name="workEffortIdTo"
entry-name="workEffortId"><hidden/></field>
<field name="workEffortName" position="1"
title="${uiLabelMap.CommonName}*"><display/></field>
- <field name="projectId"
title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
+ <field name="projectId"
title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup
target-form-name="LookupWorkEffort"/></field>
<field name="fromDate"><date-time/></field>
<field name="currentStatusId">
<drop-down allow-empty="false"
current-description="${currentStatus.description}">
