svn commit: r940413 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
Locked
svn commit: r940413 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Mon May 3 10:45:40 2010 New Revision: 940413 URL: http://svn.apache.org/viewvc?rev=940413&view=rev Log: "Applied fix from trunk for revision: 940410" ------------------------------------------------------------------------ r940410 | jleroux | 2010-05-03 12:37:33 +0200 (lun. 03 mai 2010) | 4 lignes A completed patch from Sascha Rodekamp "Lookup Layer Search of a Varient Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746 Fix the variant issue in product lookups Remove the temporary window presentation workaround (done at r939232) ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.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/GlSetupForms.xml ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml ofbiz/branches/release10.04/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/InvoiceForms.xml ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/BomForms.xml ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ForecastForms.xml ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/appendorderitem.ftl ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/branches/release10.04/applications/order/widget/ordermgr/RequirementForms.xml ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductAssoc.ftl ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PickMoveStock.ftl ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/EditShipmentItems.ftl ofbiz/branches/release10.04/applications/product/widget/catalog/ConfigForms.xml ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/branches/release10.04/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/branches/release10.04/specialpurpose/ebay/widget/EbayForms.xml ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/release10.04/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401,940410 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=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml Mon May 3 10:45:40 2010 @@ -24,7 +24,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Agreement" default-field-type="find"/> <field name="productId" title="${uiLabelMap.AccountingProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}"> <drop-down allow-empty="true"> @@ -104,7 +104,7 @@ under the License. <field name="agreementId" use-when="agreementId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field name="agreementId" use-when="agreement==null&&agreementId==null"><ignored/></field> <field name="productId" title="${uiLabelMap.AccountingProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="agreementTypeId" title="${uiLabelMap.AccountingAgreementTypeId}"> <drop-down allow-empty="true"> @@ -380,7 +380,7 @@ under the License. <field name="agreementId"><hidden/></field> <field name="agreementItemSeqId"><hidden/></field> <field name="productId" use-when="agreementProductAppl==null"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productId" use-when="agreementProductAppl!=null"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> @@ -409,7 +409,7 @@ under the License. <display/> </field> <field name="productId" use-when="agreementProductAppl==null"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productId" use-when="agreementProductAppl!=null"><display/></field> <field name="supplierPrefOrderId"> 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=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml Mon May 3 10:45:40 2010 @@ -83,7 +83,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="instanceOfProductId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> @@ -146,7 +146,7 @@ under the License. <auto-fields-service service-name="addFixedAssetProduct" map-name="fixedAssetProduct"/> <field name="fixedAssetId"><hidden/></field> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductTypeId}"> <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetProductType" description="${description}"> 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=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml Mon May 3 10:45:40 2010 @@ -57,7 +57,7 @@ under the License. </field> <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" presentation="window" 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="shipmentId" position="2"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fromDate" position="1"><date-time/></field> @@ -235,7 +235,7 @@ under the License. </field> <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" presentation="window" 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="shipmentId"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fromDate"><date-time/></field> @@ -452,7 +452,7 @@ under the License. </field> <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" presentation="window" 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="shipmentId" position="1"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fixedAssetId" position="2"> @@ -540,7 +540,7 @@ under the License. <sub-hyperlink target="paymentOverview?paymentId=${acctgTrans.paymentId}" description="${acctgTrans.paymentId}"/> </lookup> </field> - <field name="produtId"><lookup target-form-name="LookupProduct" presentation="window" size="20" maxlength="20"/></field> + <field name="produtId"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field> <field name="shipmentId"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="inventoryItemId"><text/></field> <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}"> @@ -653,7 +653,7 @@ under the License. <lookup target-form-name="LookupPartyName" size="20" maxlength="20"/> </field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window" size="20" maxlength="20"/> + <lookup target-form-name="LookupProduct" size="20" maxlength="20"/> </field> <field name="reconcileStatusId" title="${uiLabelMap.FormFieldTitle_reconcileStatus}"> <drop-down allow-empty="true"> @@ -743,7 +743,7 @@ under the License. <field name="physicalInventoryId" position="2"></field> <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" presentation="window" 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="shipmentId" position="1"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field> <field name="fixedAssetId" position="2"> Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlSetupForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlSetupForms.xml Mon May 3 10:45:40 2010 @@ -731,7 +731,7 @@ under the License. </drop-down> </field> <field name="productId" title="${uiLabelMap.AccountingProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/InvoiceForms.xml Mon May 3 10:45:40 2010 @@ -366,7 +366,7 @@ under the License. <list-options list-name="invoiceItemTypes" key-name="invoiceItemTypeId" description="${description}"/> </drop-down> </field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window" size="20"/></field> + <field name="productId"><lookup target-form-name="LookupProduct" size="20"/></field> <field name="description"><text size="30"/></field> <field name="overrideGlAccountId"> <drop-down allow-empty="true"> @@ -402,7 +402,7 @@ under the License. </field> <field position="2" name="inventoryItemId"><text/></field> <field position="1" name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field position="2" name="productFeatureId"> <lookup target-form-name="LookupProductFeature"/> Modified: ofbiz/branches/release10.04/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/ReportFinancialSummaryForms.xml Mon May 3 10:45:40 2010 @@ -497,7 +497,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="thruDate"><date-time default-value="${nowTimestamp}"/></field> <field name="organizationPartyId"><hidden/></field> <field name="showSearchResults"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> Modified: ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/ap/forms/InvoiceForms.xml Mon May 3 10:45:40 2010 @@ -120,7 +120,7 @@ under the License. <form name="CommissionReport" type="single" target="FindCommissions"> <field name="isSearch"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="productId" position="1"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" position="1"><lookup target-form-name="LookupProduct"/></field> <field name="partyId" position="2" title="${uiLabelMap.PartyPartyId}"> <drop-down allow-empty="true"> <entity-options entity-name="PartyRoleAndPartyDetail" description="${firstName} ${middleName} ${lastName} ${groupName}(${partyId})"> Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original) +++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Mon May 3 10:45:40 2010 @@ -63,7 +63,7 @@ function lookupBom() { <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productId?if_exists}" formName="searchform" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${productId?if_exists}" formName="searchform" name="productId" id="productId" fieldFormName="LookupProduct"/> <span><a href="javascript:document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingShowBOMAssocs}</a></span> </td> </tr> @@ -74,7 +74,7 @@ function lookupBom() { <td align="right">${uiLabelMap.ManufacturingCopyToProductId}</td> <td> </td> <td> - <@htmlTemplate.lookupField formName="searchform" name="copyToProductId" id="copyToProductId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="searchform" name="copyToProductId" id="copyToProductId" fieldFormName="LookupProduct"/> <span><a href="javascript:document.searchform.UPDATE_MODE.value='COPY';document.searchform.submit();" class="buttontext">${uiLabelMap.ManufacturingCopyBOMAssocs}</a></span> </td> </tr> @@ -107,14 +107,14 @@ function lookupBom() { <td align="right">${uiLabelMap.ProductProductId}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productId?if_exists}" formName="editProductAssocForm" name="productId" id="productId2" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${productId?if_exists}" formName="editProductAssocForm" name="productId" id="productId2" fieldFormName="LookupProduct"/> </td> </tr> <tr> <td align="right">${uiLabelMap.ManufacturingProductIdTo}</td> <td> </td> <td> - <@htmlTemplate.lookupField value="${productIdTo?if_exists}" formName="editProductAssocForm" name="productIdTo" id="productIdTo" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${productIdTo?if_exists}" formName="editProductAssocForm" name="productIdTo" id="productIdTo" fieldFormName="LookupProduct"/> </td> </tr> <tr> Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Mon May 3 10:45:40 2010 @@ -22,7 +22,7 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="CreateProductionRun" target="createProductionRun" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window" size="16"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field> <field name="quantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field> <field name="startDate" title="${uiLabelMap.ManufacturingStartDate}"><date-time/></field> <field name="facilityId"> @@ -50,7 +50,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text-find/></field> <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingStartDate}"><date-find/></field> <field name="facilityId" title="${uiLabelMap.ProductFacilityId}"> @@ -519,7 +519,7 @@ under the License. <list-options list-name="delivProducts" key-name="productId" description="${productId}"/> </drop-down> </field> - <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="${groovy:delivProducts.size()==0}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="${groovy:delivProducts.size()==0}"><lookup target-form-name="LookupProduct"/></field> <field name="quantity" title="${uiLabelMap.ManufacturingAddQuantityProduced}"> <text/> </field> @@ -882,7 +882,7 @@ under the License. </drop-down> </field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -945,7 +945,7 @@ under the License. </drop-down> </field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="reasonEnumId"> <drop-down allow-empty="true"> Modified: ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Mon May 3 10:45:40 2010 @@ -64,7 +64,7 @@ function lookupInventory() { <td width='5%'> </td> <td> <span> - <@htmlTemplate.lookupField value='${requestParameters.productId?if_exists}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value='${requestParameters.productId?if_exists}' formName="lookupinventory" name="productId" id="productId" fieldFormName="LookupProduct"/> </span> <input type='text' size='25' readonly="readonly" name='productId_description' value=''/>${uiLabelMap.CommonDescription} </td> Modified: ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/BomForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/BomForms.xml (original) +++ ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/BomForms.xml Mon May 3 10:45:40 2010 @@ -24,7 +24,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="lookupFlag"><hidden value="Y"/></field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="bomType" title="${uiLabelMap.ManufacturingBomType}"> <drop-down allow-empty="false" no-current-selected-key="MANUF_COMPONENT"> @@ -103,16 +103,16 @@ under the License. <auto-fields-service service-name="updateProductManufacturingRule" map-name="manufacturingRule"/> <field name="ruleId"><display/></field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productIdFor"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productIdIn"> <lookup target-form-name="LookupVirtualProduct"/> </field> <field name="productIdInSubst"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productFeature"> <lookup target-form-name="LookupProductFeature"/> @@ -128,8 +128,8 @@ under the License. </field> </form> <form name="findBom" type="single" target="FindBom" title=""> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> - <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> + <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct"/></field> <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}"> <drop-down allow-empty="true"> <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/> @@ -154,8 +154,8 @@ under the License. </form> <form name="CreateProductBom" target="createProductBom" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window" size="16"/></field> - <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct" presentation="window" size="16"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field> + <field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct" size="16"/></field> <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}"> <drop-down> <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/> Modified: ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml (original) +++ ofbiz/branches/release10.04/applications/manufacturing/widget/manufacturing/RoutingTaskForms.xml Mon May 3 10:45:40 2010 @@ -275,7 +275,7 @@ under the License. <field name="workEffortGoodStdTypeId"><hidden value="ROU_PROD_TEMPLATE"/></field> <field name="productId" use-when="routingProductLink!=null" ><display/></field> <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="routingProductLink==null" > - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" use-when="routingProductLink!=null"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field> @@ -350,7 +350,7 @@ under the License. <field name="workEffortGoodStdTypeId"><hidden value="PRUNT_PROD_DELIV"/></field> <field name="productId" use-when="routingProductLink!=null" ><display/></field> <field name="productId" title="${uiLabelMap.ProductProductId}" use-when="routingProductLink==null" > - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" use-when="routingProductLink!=null"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"></field> Modified: ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/ForecastForms.xml Mon May 3 10:45:40 2010 @@ -98,7 +98,7 @@ under the License. </drop-down> </field> <field name="productId" title="${uiLabelMap.AccountingProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productCategoryId" title="${uiLabelMap.ProductProductCategoryId}"> <lookup target-form-name="LookupProductCategory"/> @@ -124,7 +124,7 @@ under the License. </drop-down> </field> <field name="productId" title="${uiLabelMap.AccountingProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="productCategoryId" title="${uiLabelMap.ProductProductCategoryId}"> <lookup target-form-name="LookupProductCategory"/> Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410 Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Mon May 3 10:45:40 2010 @@ -92,7 +92,7 @@ under the License. <#assign fieldFormName="LookupSupplierProduct"> </#if> <#else> - <#assign fieldFormName="LookupProduct" presentation="window"> + <#assign fieldFormName="LookupProduct"> </#if> <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/--> <a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a> Modified: ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ ofbiz/branches/release10.04/applications/order/webapp/ordermgr/order/appendorderitem.ftl Mon May 3 10:45:40 2010 @@ -60,7 +60,7 @@ under the License. <td class="label">${uiLabelMap.ProductProductId}</td> <td> <#-- FIXME Problem here: the input field is shared --> - <@htmlTemplate.lookupField formName="appendItemForm" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="appendItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/> <#if "PURCHASE_ORDER" == orderHeader.orderTypeId> <a href="javascript:quicklookup(document.appendItemForm.orderId)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a> </#if> 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=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml Mon May 3 10:45:40 2010 @@ -363,7 +363,7 @@ under the License. <option key="1"/> </drop-down> </field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"> <submit button-type="button"/> </field> Modified: ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryForms.xml Mon May 3 10:45:40 2010 @@ -23,7 +23,7 @@ under the License. <field name="showList"><hidden value="Y"/></field> <field name="requirementId"><text-find/></field> <field name="partyId" title="${uiLabelMap.PartySupplier}"><lookup target-form-name="LookupPartyName"/></field> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="requirementByDate"><date-find type="date"/></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/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/RequirementForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/widget/ordermgr/RequirementForms.xml (original) +++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/RequirementForms.xml Mon May 3 10:45:40 2010 @@ -44,7 +44,7 @@ under the License. </drop-down> </field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="description"><text-find/></field> <field name="requirementStartDate" title="${uiLabelMap.OrderRequirementStartDate}"><date-find type="date"/></field> @@ -129,7 +129,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="facilityId"> <drop-down allow-empty="false"> <entity-options entity-name="Facility" description="${description} [${facilityId}]"/> @@ -226,7 +226,7 @@ under the License. </drop-down> </field> <field name="productId" title="${uiLabelMap.ProductProductId}"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> <field name="requirementStartDate"><date-find type="date"/></field> @@ -282,7 +282,7 @@ under the License. <entity-options entity-name="Facility" description="${facilityId}"/> </drop-down> </field> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="requirementByDate"><date-find type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410 Modified: ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/branches/release10.04/applications/party/widget/partymgr/CommunicationEventForms.xml Mon May 3 10:45:40 2010 @@ -1056,7 +1056,7 @@ under the License. </form> <form name="AddCommProduct" type="single" target="createCommunicationEventProduct" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><hidden/></field> - <field name="productId" title="${uiLabelMap.PartyProductId}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" title="${uiLabelMap.PartyProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="submitButton" title="${uiLabelMap.PartyProductAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410 Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Mon May 3 10:45:40 2010 @@ -148,7 +148,7 @@ under the License. <input type="hidden" name="activeOnly" value="${activeOnly.toString()}" /> <div> <span class="label">${uiLabelMap.ProductProductId}</span> - <@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="addProductCategoryMemberForm" name="productId" id="productId" fieldFormName="LookupProduct"/> <br/> <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate" /> <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a> Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/catalog/product/EditProductAssoc.ftl Mon May 3 10:45:40 2010 @@ -80,7 +80,7 @@ under the License. <td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td> <td> </td> <td> - <@htmlTemplate.lookupField formName="editProductAssocForm" name="PRODUCT_ID_TO" id="PRODUCT_ID_TO" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="editProductAssocForm" name="PRODUCT_ID_TO" id="PRODUCT_ID_TO" fieldFormName="LookupProduct"/> </td> </tr> <tr> Modified: ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Mon May 3 10:45:40 2010 @@ -503,7 +503,7 @@ under the License. <input type="hidden" name="productPromoRuleId" value="_NA_" /> <input type="hidden" name="productPromoActionSeqId" value="_NA_" /> <input type="hidden" name="productPromoCondSeqId" value="_NA_" /> - <span class="label">${uiLabelMap.ProductProductId}</span>*<@htmlTemplate.lookupField formName="createpromoproductform" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <span class="label">${uiLabelMap.ProductProductId}</span>*<@htmlTemplate.lookupField formName="createpromoproductform" name="productId" id="productId" fieldFormName="LookupProduct"/> <select name="productPromoApplEnumId"> <#list productPromoApplEnums as productPromoApplEnum> <option value="${productPromoApplEnum.enumId}">${productPromoApplEnum.get("description",locale)}</option> Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PickMoveStock.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PickMoveStock.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PickMoveStock.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/facility/facility/PickMoveStock.ftl Mon May 3 10:45:40 2010 @@ -163,7 +163,7 @@ under the License. </tr> <tr> <td> - <@htmlTemplate.lookupField formName="quickStockMove" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="quickStockMove" name="productId" id="productId" fieldFormName="LookupProduct"/> </td> <td> <input type="text" size="20" name="locationSeqId" maxlength="20" /> Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl Mon May 3 10:45:40 2010 @@ -507,7 +507,7 @@ under the License. <tr> <td class="label">${uiLabelMap.ProductProductId}</td> <td> - <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="selectAllForm" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="selectAllForm" name="productId" id="productId" fieldFormName="LookupProduct"/> <span class="tooltip">${uiLabelMap.ProductLeaveEntirePoReceiving}</span> </td> </tr> Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/EditShipmentItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/EditShipmentItems.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/EditShipmentItems.ftl (original) +++ ofbiz/branches/release10.04/applications/product/webapp/facility/shipment/EditShipmentItems.ftl Mon May 3 10:45:40 2010 @@ -132,7 +132,7 @@ under the License. <input type="hidden" name="shipmentId" value="${shipmentId}"/> <td><span class="label">${uiLabelMap.ProductNewItem}</span></td> <td colspan="2"><span class="label">${uiLabelMap.ProductProductId}</span> - <@htmlTemplate.lookupField formName="createShipmentItemForm" name="productId" id="productId" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField formName="createShipmentItemForm" name="productId" id="productId" fieldFormName="LookupProduct"/> </td> <td><input type="text" name="quantity" size="5" value="0"/></td> <td colspan="2"><span class="label">${uiLabelMap.ProductProductDescription}</span> <input name="shipmentContentDescription" size="30" maxlength="255"/></td> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ConfigForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/ConfigForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/ConfigForms.xml Mon May 3 10:45:40 2010 @@ -105,7 +105,7 @@ under the License. <field name="configOptionId"><hidden value="${configOptionId}"/></field> <field use-when="productConfigProduct!=null" name="productId"><display/></field> <field use-when="productConfigProduct==null" name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field use-when="productConfigProduct!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml (original) +++ ofbiz/branches/release10.04/applications/product/widget/catalog/SubscriptionForms.xml Mon May 3 10:45:40 2010 @@ -60,7 +60,7 @@ under the License. </field> <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="productCategoryId"><lookup target-form-name="LookupProductCategory"/></field> <field name="roleTypeId"><ignored/></field> @@ -254,7 +254,7 @@ under the License. </lookup> </field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"> + <lookup target-form-name="LookupProduct"> <sub-hyperlink target="/catalog/control/EditProduct" target-type="inter-app" description="${subscription.productId}" link-style="buttontext"> <parameter param-name="productId" from-field="subscription.productId"/> </sub-hyperlink> @@ -391,7 +391,7 @@ under the License. <auto-fields-service service-name="createProductSubscriptionResource"/> <field name="subscriptionResourceId"><hidden/></field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId"><lookup target-form-name="LookupProduct"/></field> <field name="useTimeUomId"> <drop-down allow-empty="false"> <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId"> Modified: ofbiz/branches/release10.04/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl (original) +++ ofbiz/branches/release10.04/applications/workeffort/webapp/workeffort/find/WorkEffortSearchOptions.ftl Mon May 3 10:45:40 2010 @@ -91,7 +91,7 @@ under the License. <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId1}</td> <td valign="middle"> <div> - <@htmlTemplate.lookupField value="${requestParameters.productId_1?if_exists}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${requestParameters.productId_1?if_exists}" formName="advToKeyWordSearchForm" name="productId_1" id="productId_1" fieldFormName="LookupProduct"/> </div> </td> </tr> @@ -99,7 +99,7 @@ under the License. <td align="right" valign="middle" class="label">${uiLabelMap.WorkEffortProductId2}</td> <td valign="middle"> <div> - <@htmlTemplate.lookupField value="${requestParameters.productId_2?if_exists}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct" presentation="window"/> + <@htmlTemplate.lookupField value="${requestParameters.productId_2?if_exists}" formName="advToKeyWordSearchForm" name="productId_2" id="productId_2" fieldFormName="LookupProduct"/> </div> </td> </tr> 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=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml Mon May 3 10:45:40 2010 @@ -1012,7 +1012,7 @@ under the License. <auto-fields-service service-name="createWorkEffortGoodStandard"/> <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field> <field name="productId"> - <lookup target-form-name="LookupProduct" presentation="window"/> + <lookup target-form-name="LookupProduct"/> </field> <field name="workEffortGoodStdTypeId"> <drop-down no-current-selected-key=""> Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410 Modified: ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js Mon May 3 10:45:40 2010 @@ -565,6 +565,10 @@ function modifySubmitButton (lookupDiv) lookupForm = $(forms[i].getAttribute('id')); } } + + if (lookupForm == null) { + return; + } //diable the form action var formAction = lookupForm.getAttribute('action'); @@ -596,8 +600,9 @@ function modifySubmitButton (lookupDiv) } }); ele.parentNode.removeChild(ele); - //modifay nav-pager - var navPager = lookupDiv.getElementsByClassName("nav-pager"); + // modifay nav-pager + var navPager = null; + navPager = lookupDiv.getElementsByClassName("nav-pager"); if (navPager.length > 0) { for (var j = 0; j < navPager.length; j++) { @@ -643,11 +648,79 @@ function modifySubmitButton (lookupDiv) } } } + // modify links in result table + var resultTable = null; + if (navPager.length > 0) { + resultTable = navPager[0].next('table'); + } else { + resultTable= $('search-results').firstDescendant(); + } + + if (resultTable == null) { + return; + } + resultTable = resultTable.childElements()[0]; + var resultElements = resultTable.childElements(); + for (i in resultElements) { + var childElements = resultElements[i].childElements(); + if (childElements.size() == 1) { + continue; + } + + for (k = 1; k < childElements.size(); k++) { + var cell = childElements[k]; + var cellChild = null; + cellChild = cell.childElements(); + if (cellChild.size() > 0) { + + for (l in cellChild) { + var cellElement = cellChild[l]; + if (cellElement.tagName == 'A') { + var link = cellElement.href; + var liSub = link.substring(link.lastIndexOf('/')+1,(link.length)); + cellElement.href = "javascript:lookupAjaxRequest('" + liSub + "')"; + } + } + + } + } + } + } } } } +/** + * Createan ajax Request + */ +function lookupAjaxRequest(request) { + lookupDiv = (GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).divRef); + lookupContent = (GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).contentRef); + + // get request arguments + var arg = request.substring(request.indexOf('?')+1,(request.length)); + new Ajax.Request(request, { + method: 'post', + parameters: arg, requestHeaders: { + Accept: 'application/json' + }, + onSuccess: function (transport) { + var formRequest = transport.responseText; + lookupContent.remove(); + var lookupCont = new Element('DIV', { + id: "fieldLookupContent" + }); + lookupDiv.appendChild(lookupCont); + + lookupCont.insert({ + bottom: "" + formRequest + "" + }); + GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).contentRef = lookupCont; + modifySubmitButton(lookupDiv); + } + }); +} /** * Create an ajax request to get the search results Modified: ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml Mon May 3 10:45:40 2010 @@ -30,7 +30,7 @@ under the License. <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field> <field name="fixedAssetTypeId"><hidden value="COMPUTER_HARDWARE"/></field> - <field name="instanceOfProductId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> @@ -71,7 +71,7 @@ under the License. <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field> <field name="fixedAssetTypeId"><hidden value="COMPUTER_SOFTWARE"/></field> - <field name="instanceOfProductId"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="instanceOfProductId"><lookup target-form-name="LookupProduct"/></field> <field name="classEnumId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> Modified: ofbiz/branches/release10.04/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebay/widget/EbayForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/ebay/widget/EbayForms.xml Mon May 3 10:45:40 2010 @@ -50,7 +50,7 @@ under the License. <field name="createdDate"><display/></field> <!-- <field name="productId" use-when="!${allowProductIdChange}"><display/></field> - <field name="productId" use-when="${allowProductIdChange}"><lookup target-form-name="LookupProduct" presentation="window"/></field> + <field name="productId" use-when="${allowProductIdChange}"><lookup target-form-name="LookupProduct"/></field> --> <field name="productId"><display/></field> <field name="productName" entry-name="productId"><display-entity entity-name="Product" key-field-name="productId" description="${internalName}"/></field> Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248,940309,940401,940410 Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=940413&r1=940412&r2=940413&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original) +++ ofbiz/branches/release10.04/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Mon May 3 10:45:40 2010 @@ -162,7 +162,7 @@ value="${bsh:billingAccount != null ? or odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productStoreId"><display description="${parameters.productStoreId}"></display></field> <field name="facilityId"><display description="${parameters.facilityId}"></display></field> - <field name="productId"><lookup target-form-name="LookupProduct" presentation="window"></lookup></field> + <field name="productId"><lookup target-form-name="LookupProduct"></lookup></field> <field name="quantity"><text></text></field> <field name="submitButton" ><submit button-type="button"/></field> </form> Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 10:45:40 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234,940248,940309,940401 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |