Author: jleroux
Date: Wed Sep 29 09:29:08 2010
New Revision: 1002536
URL: http://svn.apache.org/viewvc?rev=1002536&view=rev
Log:
Merge the trunk at r1002353
Modified:
ofbiz/branches/jquery/ (props changed)
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/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/branches/jquery/framework/common/servicedef/services.xml
ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props
changed)
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
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 Wed Sep 29 09:29:08 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1002043
+/ofbiz/trunk:951708-1002466
Propchange:
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1002466
Propchange:
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1002466
Propchange:
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1002466
Modified:
ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1002536&r1=1002535&r2=1002536&view=diff
==============================================================================
---
ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml
(original)
+++
ofbiz/branches/jquery/framework/common/script/org/ofbiz/common/CommonServices.xml
Wed Sep 29 09:29:08 2010
@@ -326,4 +326,17 @@ under the License.
<field-to-result field="geoList"/>
</simple-method>
+ <simple-method method-name="checkUomConversion" short-description="Returns
true if an UomConversion exists">
+ <entity-one entity-name="UomConversion" value-field="uomConversion">
+ <field-map field-name="uomId" from-field="parameters.uomId"/>
+ <field-map field-name="uomIdTo" from-field="parameters.uomIdTo"/>
+ </entity-one>
+ <if-not-empty field="uomConversion">
+ <set field="exist" value="true" type="Boolean"/>
+ <else>
+ <set field="exist" value="false" type="Boolean"/>
+ </else>
+ </if-not-empty>
+ <field-to-result field="exist"/>
+ </simple-method>
</simple-methods>
Modified: ofbiz/branches/jquery/framework/common/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services.xml?rev=1002536&r1=1002535&r2=1002536&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/servicedef/services.xml (original)
+++ ofbiz/branches/jquery/framework/common/servicedef/services.xml Wed Sep 29
09:29:08 2010
@@ -754,6 +754,14 @@ under the License.
<attribute name="stateList" mode="OUT" type="java.util.List"/>
</service>
+ <service name="checkUomConversion" engine="simple"
default-entity-name="UomConversion"
+
location="component://common/script/org/ofbiz/common/CommonServices.xml"
invoke="checkUomConversion">
+ <description>Returns true if an UomConversion exists</description>
+ <permission-service service-name="commonGenericPermission"
main-action="VIEW"/>
+ <auto-attributes include="pk" mode="IN"/>
+ <attribute name="exist" mode="OUT" type="Boolean"/>
+ </service>
+
<service name="getRelatedGeos" engine="simple" auth="false"
location="component://common/script/org/ofbiz/common/CommonServices.xml"
invoke="getRelatedGeos">
<attribute name="geoId" mode="IN" type="String"/>
Modified:
ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1002536&r1=1002535&r2=1002536&view=diff
==============================================================================
---
ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
(original)
+++
ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/common-controller.xml
Wed Sep 29 09:29:08 2010
@@ -196,7 +196,7 @@ under the License.
<request-map uri="LookupGeoName"><security https="true"
auth="true"/><response name="success" type="view"
value="LookupGeoName"/></request-map>
<!--========================== AJAX events =====================-->
- <!-- to dynamically get products related to a product category -->
+ <!-- Get products related to a product category -->
<request-map uri="getAssociatedProductsList">
<security https="true" auth="false"/>
<event type="service" invoke="getAssociatedProductsList"/>
@@ -204,7 +204,7 @@ under the License.
<response name="error" type="request" value="json"/>
</request-map>
- <!-- to dynamically get states related to a country -->
+ <!-- Get states related to a country -->
<request-map uri="getAssociatedStateList">
<security https="true" auth="false"/>
<event type="service" invoke="getAssociatedStateList"/>
@@ -219,6 +219,14 @@ under the License.
<response name="error" type="request" value="json"/>
</request-map>
+ <!-- Check if an UomConversion exists -->
+ <request-map uri="checkUomConversion">
+ <security https="true" auth="false"/>
+ <event type="service" invoke="checkUomConversion"/>
+ <response name="success" type="request" value="json"/>
+ <response name="error" type="request" value="json"/>
+ </request-map>
+
<request-map uri="getRelatedGeos">
<security https="true" auth="true"/>
<event type="service" invoke="getRelatedGeos"/>
Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1002466
Modified:
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=1002536&r1=1002535&r2=1002536&view=diff
==============================================================================
---
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
(original)
+++
ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
Wed Sep 29 09:29:08 2010
@@ -752,7 +752,7 @@ public class GenericDAO {
long queryEndTime = System.currentTimeMillis();
long queryTotalTime = queryEndTime - queryStartTime;
if (queryTotalTime > 150) {
- Debug.logTiming("Ran query in " + queryTotalTime + "
milli-seconds: " + sql, module);
+ Debug.logTiming("Ran query in " + queryTotalTime + "
milli-seconds: " + " EntityName: " + modelEntity.getEntityName() + " Sql: " +
sql + " where clause:" + whereEntityConditionParams, module);
}
}
return new EntityListIterator(sqlP, modelEntity, selectFields,
modelFieldTypeReader, this, whereEntityCondition, havingEntityCondition,
findOptions.getDistinct());
Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1002466
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1002466
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1002466
Propchange:
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 29 09:29:08 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-1002043
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1002466
