/[Apache-SVN]

Revision 1044033

Jump to revision:
Author:	jleroux
Date:	Thu Dec 9 16:57:16 2010 UTC (13 years, 5 months ago)
Changed paths:	19
Log Message:	Merges the trunk at r1043999 (beginning to look at the merge back to trunk...)

Changed paths

Path	Details
ofbiz/branches/jquery/	modified , props changed
ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml	modified , text changed
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java	modified , text changed
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java	modified , text changed
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java	modified , text changed
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml	modified , text changed
ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml	modified , text changed
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml	modified , props changed
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy	modified , props changed
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml	modified , props changed
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java	modified , text changed
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml	modified , props changed
ofbiz/branches/jquery/framework/documents/DataFiles.xml (Copied from ofbiz/trunk/framework/documents/DataFiles.xml, r1044013)	added
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java	modified , text changed
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/	modified , props changed
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java	modified , text changed
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy	modified , props changed
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy	modified , props changed
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy	modified , props changed

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26