You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/05/03 11:16:44 UTC
svn commit: r940402 - in /ofbiz/branches/release10.04: ./
applications/order/script/org/ofbiz/order/customer/
applications/party/webapp/partymgr/WEB-INF/actions/party/
applications/product/script/org/ofbiz/product/test/
framework/common/widget/ framewo...
Author: jleroux
Date: Mon May 3 09:16:42 2010
New Revision: 940402
URL: http://svn.apache.org/viewvc?rev=940402&view=rev
Log:
"Applied fix from trunk for revision: 940401"
------------------------------------------------------------------------
r940401 | jleroux | 2010-05-03 11:10:49 +0200 (lun. 03 mai 2010) | 5 lignes
A patch from Ankit Jain "Allow to open a layer lookup from a layer lookup" https://issues.apache.org/jira/browse/OFBIZ-3446 - OFBIZ-3446
Uncomment the line to return the name in the calling screen
I have also added groupName in the name returned (when looking for partyGroup)
------------------------------------------------------------------------
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/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml
ofbiz/branches/release10.04/framework/images/webapp/images/fieldlookup.js
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 Mon May 3 09:16:42 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
+/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234,940248,940309,940401
Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml?rev=940402&r1=940401&r2=940402&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml (original)
+++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml Mon May 3 09:16:42 2010
@@ -85,7 +85,7 @@ under the License.
</actions>
<!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_values('${firstName} ${lastName}','${partyId}')"/>
+ <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_values('${firstName} ${lastName} ${groupName}','${partyId}')"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType" description="${description}"/>
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=940402&r1=940401&r2=940402&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 09:16:42 2010
@@ -739,7 +739,7 @@ function set_value (value) {
}
// function passing selected value to calling window
function set_values (value, value2) {
- /*obj_caller.target = $(GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).parentTarget.id);*/
+ obj_caller.target = $(GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).parentTarget.id);
var target = obj_caller.target;
var target2 = obj_caller.target2;
write_value(value, target);
Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234,940248,940309,940401
Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 3 09:16:42 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
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234,940248,940309,940401