Author: jleroux
Date: Sat May 1 12:23:49 2010
New Revision: 939994
URL: http://svn.apache.org/viewvc?rev=939994&view=rev
Log:
"Applied fix from trunk for revision: 939988"
------------------------------------------------------------------------
r939988 | jleroux | 2010-05-01 14:07:08 +0200 (sam. 01 mai 2010) | 1 ligne
This lookup does not exist, is there for a long time? (I did not find its date of introduction, the older I found is r615322) and
I can't see anything close
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
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/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 12:23:49 2010
@@ -1,2 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
+/ofbiz/trunk:939988
Modified:
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml?rev=939994&r1=939993&r2=939994&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
(original)
+++
ofbiz/branches/release10.04/applications/humanres/widget/forms/LookupForms.xml
Sat May 1 12:23:49 2010
@@ -29,7 +29,8 @@ under the License.
<entity-options description="${description}" key-field-name="budgetTypeId"
entity-name="BudgetType"></entity-options>
</drop-down>
</field>
- <field name="customTimePeriodId"><lookup presentation="window"
target-form-name="LookupCustomTimePeriod"/></field>
+ <!-- This lookup does not exist, is there for a long time? (I did not find its date of introduction, the older I found is
r615322) and I can't see anything close -->
+ <!--field name="customTimePeriodId"><lookup presentation="window"
target-form-name="LookupCustomTimePeriod"/></field-->
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be
done --></field>
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
Propchange:
ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange:
ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange:
ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
Propchange:
ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 1 12:23:49 2010
@@ -1,2 +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
