svn commit: r940003 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
Locked
svn commit: r940003 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget
 
|
Author: jleroux
Date: Sat May 1 12:53:40 2010 New Revision: 940003 URL: http://svn.apache.org/viewvc?rev=940003&view=rev Log: "Applied fix from trunk for revision: 939999" ------------------------------------------------------------------------ r939999 | jleroux | 2010-05-01 14:43:34 +0200 (sam. 01 mai 2010) | 1 ligne Some other issues with layered lookups, bypassed for now using popups ------------------------------------------------------------------------ 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/GlobalGlAccountsForms.xml ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/release10.04/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml (props changed) 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/ebaystore/lib/ (props changed) 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) ofbiz/branches/release10.04/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53:40 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990 +/ofbiz/trunk:939988,939990,939999 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=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/AgreementForms.xml Sat May 1 12:53:40 2010 @@ -571,7 +571,7 @@ under the License. </drop-down> </field> <field name="workEffortId"> - <lookup target-form-name="LookupWorkEffort"/> + <lookup presentation="window" 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/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml?rev=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/FixedAssetForms.xml Sat May 1 12:53:40 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 target-form-name="LookupWorkEffort"/> + <lookup presentation="window" 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=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlForms.xml Sat May 1 12:53:40 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" presentation="window" size="20" maxlength="20"/></field> - <field name="workEffortId" position="1"><lookup target-form-name="LookupWorkEffort" 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> <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" presentation="window" size="20" maxlength="20"/></field> - <field name="workEffortId"><lookup target-form-name="LookupWorkEffort" 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> <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" presentation="window" size="20" maxlength="20"/></field> - <field name="workEffortId" position="2"><lookup target-form-name="LookupWorkEffort" 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"> <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 target-form-name="LookupWorkEffort" size="20" maxlength="20"/></field> + <field name="workEffortId"><lookup presentation="window" 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" presentation="window" size="20" maxlength="20"/></field> - <field name="workEffortId" position="2"><lookup target-form-name="LookupWorkEffort" 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"> <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=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsForms.xml Sat May 1 12:53:40 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 target-form-name="LookupWorkEffort"><sub-hyperlink target="ww" description="${workEffortName}"/></lookup></field> + <field name="workEffortId"><lookup presentation="window" 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/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/widget/content/ContentForms.xml?rev=940003&r1=940002&r2=940003&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 1 12:53:40 2010 @@ -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 target-form-name="LookupWorkEffort"/> + <lookup presentation="window" target-form-name="LookupWorkEffort"/> </field> <field name="workEffortContentTypeId"> <drop-down no-current-selected-key=""> Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999 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=940003&r1=940002&r2=940003&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 1 12:53:40 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 target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" 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 Sat May 1 12:53: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 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999 Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999 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=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/TimesheetForms.xml Sat May 1 12:53:40 2010 @@ -59,7 +59,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup presentation="window" 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 target-form-name="LookupWorkEffort"/></field> + <field name="workEffortId"><lookup presentation="window" 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=940003&r1=940002&r2=940003&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/branches/release10.04/applications/workeffort/widget/WorkEffortForms.xml Sat May 1 12:53:40 2010 @@ -124,7 +124,7 @@ under the License. </field> -<!-- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> --> +<!-- <field name="workEffortParentId"><lookup presentation="window" 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 target-form-name="LookupWorkEffort"/></field> + <field name="workEffortIdTo"><lookup presentation="window" 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 target-form-name="LookupWorkEffort"/></field> + <field name="workEffortIdTo"><lookup presentation="window" 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 size="10" target-form-name="LookupTimesheet"> + <lookup presentation="window" 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 size="10" target-form-name="LookupTimesheet"/></field> + <field name="timesheetId"><lookup presentation="window" 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}"> Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999 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=940003&r1=940002&r2=940003&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 1 12:53:40 2010 @@ -117,7 +117,7 @@ </entity-options> </drop-down> </field> - <field name="productId" title="${uiLabelMap.AssetMaintPartId}*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field> + <field name="productId" title="${uiLabelMap.AssetMaintPartId}*" required-field="true"><lookup presentation="window" 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=940003&r1=940002&r2=940003&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 1 12:53:40 2010 @@ -140,7 +140,7 @@ </field> <field name="intervalQuantity"><text/></field> <field name="repeatCount"><text/></field> - <field name="maintTemplateWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field> + <field name="maintTemplateWorkEffortId"><lookup presentation="window" 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"> Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 1 12:53: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 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999 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=940003&r1=940002&r2=940003&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 1 12:53:40 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 target-form-name="LookupWorkEffort"/></field> + <field name="projectId" title="${uiLabelMap.ProjectMgrWorkEffortIdFrom}"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> <field name="fromDate"><date-time/></field> <field name="currentStatusId"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |