Author: jleroux
Date: Sat May 1 14:11:53 2010
New Revision: 940033
URL: http://svn.apache.org/viewvc?rev=940033&view=rev
Log:
"Applied fix from trunk for revision: 940025"
------------------------------------------------------------------------
r940025 | jleroux | 2010-05-01 16:01:50 +0200 (sam. 01 mai 2010) | 1 ligne
Another issue with a layered lookup I forgot to commit, bypassed for now using
a popup
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
(props changed)
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/product/widget/catalog/ProductForms.xml
ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml
(props changed)
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)
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999
+/ofbiz/trunk:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025
Modified:
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml?rev=940033&r1=940032&r2=940033&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/widget/catalog/ProductForms.xml
Sat May 1 14:11:53 2010
@@ -1316,7 +1316,7 @@ under the License.
</entity-options>
</drop-down>
</field>
- <field name="maintTemplateWorkEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
+ <field name="maintTemplateWorkEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
<field name="intervalUomId">
<drop-down allow-empty="true">
<entity-options entity-name="Uom" description="${description}"
key-field-name="uomId">
@@ -1351,7 +1351,7 @@ under the License.
</drop-down>
</field>
<field name="maintName"><text size="20"/></field>
- <field name="maintTemplateWorkEffortId"><lookup
target-form-name="LookupWorkEffort"/></field>
+ <field name="maintTemplateWorkEffortId"><lookup presentation="window"
target-form-name="LookupWorkEffort"/></field>
<field name="intervalUomId">
<drop-down allow-empty="false">
<entity-options entity-name="Uom" description="${description}"
key-field-name="uomId">
@@ -1716,7 +1716,7 @@ under the License.
<auto-fields-service service-name="createWorkEffortGoodStandard"/>
<field name="productId"><hidden
value="${parameters.productId}"/></field>
<field name="workEffortId">
- <lookup target-form-name="LookupWorkEffort"/>
+ <lookup presentation="window" target-form-name="LookupWorkEffort"/>
</field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025
Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 14:11:53 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025
