Author: jleroux
Date: Thu Dec 9 16:57:16 2010
New Revision: 1044033
URL: http://svn.apache.org/viewvc?rev=1044033&view=rev
Log:
Merges the trunk at r1043999 (beginning to look at the merge back to trunk...)
Added:
ofbiz/branches/jquery/framework/documents/DataFiles.xml
- copied unchanged from r1044013,
ofbiz/trunk/framework/documents/DataFiles.xml
Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
(props changed)
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(props changed)
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
(props changed)
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props
changed)
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
(props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
(props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
(props changed)
Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1042956
+/ofbiz/trunk:951708-1044013
Modified:
ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml
(original)
+++
ofbiz/branches/jquery/applications/commonext/documents/ApacheOfbizTechnical.xml
Thu Dec 9 16:57:16 2010
@@ -202,6 +202,7 @@ image=/boot/vmlinuzNew
<xi:include href="../../../framework/documents/UnitTest.xml" />
<xi:include href="../../../framework/documents/SingleSignOn.xml" />
<xi:include href="../../../framework/birt/documents/Birt.xml"/>
+ <xi:include href="../../../framework/documents/DataFiles.xml"/>
<appendix>
<title>The Apache OFBiz documentation system</title>
Modified:
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java
(original)
+++
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/ConvertTree.java
Thu Dec 9 16:57:16 2010
@@ -280,7 +280,7 @@ In order ta make this service active add
if (contentName.length()>100) {
contentName = contentName.substring(0,100);
}
- List<GenericValue> contents =
delegator.findByAnd("Content",
UtilMisc.toMap("contentName",contentName),null,"-contentId");
+ List<GenericValue> contents =
delegator.findByAnd("Content",
UtilMisc.toMap("contentName",contentName),UtilMisc.toList("-contentId"));
if (contents!=null) {
Iterator<GenericValue> contentCheck =
contents.iterator();
while (contentCheck.hasNext() &&
contentNameMatch==false) {
Modified:
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
(original)
+++
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
Thu Dec 9 16:57:16 2010
@@ -125,7 +125,7 @@ public class CompDocEvents {
iter = keySet.iterator();
while (iter.hasNext()) {
Object obj = iter.next();
- Object val = persistResult.get(obj);
+ Object val = result.get(obj);
request.setAttribute(obj.toString(), val);
}
String errorMsg = ServiceUtil.getErrorMessage(result);
Modified:
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
(original)
+++
ofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
Thu Dec 9 16:57:16 2010
@@ -1823,6 +1823,9 @@ public class ProductionRunServices {
serviceContext.put("componentsLocationMap",
componentsLocationMap);
serviceContext.put("userLogin", userLogin);
Map resultService =
dispatcher.runSync("updateProductionRunTask", serviceContext);
+ if (ServiceUtil.isError(resultService)) {
+ return
ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultService));
+ }
} catch (GenericServiceException e) {
Debug.logError(e, "Problem calling the
changeProductionRunTaskStatus service", module);
return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ManufacturingProductionRunStatusNotChanged", locale));
@@ -2125,7 +2128,10 @@ public class ProductionRunServices {
}
serviceContext.put("userLogin", userLogin);
Map resultService =
dispatcher.runSync("issueProductionRunTaskComponent", serviceContext);
- }
+ if (ServiceUtil.isError(resultService)) {
+ return
ServiceUtil.returnError(ServiceUtil.getErrorMessage(resultService));
+ }
+ }
}
} catch (GenericEntityException gee) {
Modified:
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
(original)
+++
ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
Thu Dec 9 16:57:16 2010
@@ -262,6 +262,9 @@ under the License.
<!-- Production Run Declaration -->
<form name="ShowProductionRun" type="single" target="productionRunProduce"
title="" default-map-name="productionRunData"
header-row-style="header-row" default-table-style="basic-table">
+ <actions>
+ <set field="useRequestParameters" value="false" type="Boolean"/>
+ </actions>
<field name="workEffortId"><hidden/></field>
<field name="productId" title="${uiLabelMap.ProductProductName}">
<display-entity entity-name="Product" description="${internalName}
[${productId}]"/>
Modified:
ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
(original)
+++
ofbiz/branches/jquery/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
Thu Dec 9 16:57:16 2010
@@ -163,7 +163,7 @@ under the License.
<script
location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy"/>
<script
location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy"/>
- <set field="productionRunId"
from-field="parameters.productionRunId"/>
+ <set field="productionRunId"
from-field="parameters.productionRunId"
default-value="${parameters.workEffortId}"/>
<entity-one entity-name="WorkEffort"
value-field="productionRun">
<field-map field-name="workEffortId"
from-field="productionRunId"/>
</entity-one>
Propchange:
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1044013
Propchange:
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1044013
Propchange:
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1044013
Modified:
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java
(original)
+++
ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductSearch.java
Thu Dec 9 16:57:16 2010
@@ -315,8 +315,6 @@ public class ProductSearch {
}
entityConditionList.add(EntityCondition.makeCondition(keywordOrList,
EntityOperator.OR));
- productIdGroupBy = true;
-
if (doingBothAndOr) {
relevancyComplexAlias.addComplexAliasMember(new
ComplexAliasField(entityAlias, "relevancyWeight", null, "sum"));
} else {
@@ -1950,6 +1948,8 @@ public class ProductSearch {
// we have to check this in order to be sure that there is a
totalRelevancy to sort by...
productSearchContext.orderByList.add("-totalRelevancy");
productSearchContext.fieldsToSelect.add("totalRelevancy");
+ if (productSearchContext.keywordFixedOrSetAndList.size() > 0)
+ productSearchContext.productIdGroupBy = true;
}
}
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1044013
Modified:
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
(original)
+++
ofbiz/branches/jquery/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
Thu Dec 9 16:57:16 2010
@@ -84,7 +84,8 @@ public class FixedAssetMaintServices {
EntityCondition.makeCondition("facilityId",
EntityOperator.EQUALS, facilityId),
EntityCondition.makeCondition("availableToPromiseTotal",
EntityOperator.GREATER_THAN, "0")),
EntityOperator.AND);
- List<GenericValue> inventoryItems =
delegator.findByAnd("InventoryItem", ecl, null, null, null, false); //&&
inventoryItems.size() > 0
+ // FIXME: broken findByAnd
+ List<GenericValue> inventoryItems =
delegator.findList("InventoryItem", ecl, null, null, null, false); //&&
inventoryItems.size() > 0
Iterator<GenericValue> itr = inventoryItems.iterator();
while (requestedQty > 0 && itr.hasNext()) {
GenericValue inventoryItem = (GenericValue)itr.next();
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1044013
Modified:
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1044033&r1=1044032&r2=1044033&view=diff
==============================================================================
---
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
(original)
+++
ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
Thu Dec 9 16:57:16 2010
@@ -1269,7 +1269,8 @@ public class EbayStoreAutoPreferences {
} else if (priceType.equals("RETAIL_PRICE")) {
//ignore
} else if (priceType.equals("SELLER_COST")) {
- List<GenericValue> supplierProduct =
delegator.findByAnd("SupplierProduct", "productId", SKUItem,
UtilMisc.toList("availableFromDate DESC"));
+ // FIXME
+ List<GenericValue> supplierProduct =
delegator.findByAnd("SupplierProduct", UtilMisc.toMap("productId", SKUItem),
UtilMisc.toList("availableFromDate DESC"));
String lastPrice =
supplierProduct.get(0).getString("lastPrice");
doBasePrice = Double.parseDouble(lastPrice);
} else if (priceType.equals("SECOND_CHANCE_PRICE")) {
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1044013
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1044013
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 16:57:16 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:951708-1042956
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1044013
