Author: jleroux
Date: Mon May 19 07:19:30 2014
New Revision: 1595768
URL: http://svn.apache.org/r1595768
Log:
A patch from Pierre Smits for "Service to check UomConversionDated is missing"
https://issues.apache.org/jira/browse/OFBIZ-5638
While there is a service to check the existence of a record in UomConversion
the equivalent to check the existence of a record in UomConversionDated (mainly
used for foreign exchange rates) is lacking.
Modified:
ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
ofbiz/trunk/framework/common/servicedef/services.xml
Modified:
ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1595768&r1=1595767&r2=1595768&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
(original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Mon
May 19 07:19:30 2014
@@ -333,7 +333,7 @@ under the License.
<field-to-result field="geoList"/>
</simple-method>
- <simple-method method-name="checkUomConversion" short-description="Returns
true if an UomConversion exists">
+ <simple-method method-name="checkUomConversion" short-description="Returns
true if an UomConversion record 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"/>
@@ -341,25 +341,43 @@ under the License.
<if-not-empty field="uomConversion">
<set field="exist" value="true" type="Boolean"/>
<else>
- <set field="exist" value="false" type="Boolean"/>
+ <set field="exist" value="false" type="Boolean"/>
</else>
</if-not-empty>
<field-to-result field="exist"/>
</simple-method>
+
+ <simple-method method-name="checkUomConversionDated"
short-description="Returns true if an UomConversionDated record exists">
+ <entity-condition entity-name="UomConversionDated"
list="uomConversions" filter-by-date="true">
+ <condition-list>
+ <condition-expr field-name="uomId" operator="equals"
from-field="parameters.uomId"/>
+ <condition-expr field-name="uomIdTo" operator="equals"
from-field="parameters.uomIdTo"/>
+ <condition-expr field-name="purposeEnumId" operator="equals"
from-field="parameters.purposeEnumId" ignore-if-empty="true"/>
+ </condition-list>
+ </entity-condition>
+ <if-not-empty field="uomConversions">
+ <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-method method-name="getServerTimestamp" login-required="false">
+ <simple-method method-name="getServerTimestamp" login-required="false">
<now field="serverTimestamp" type="java.sql.Timestamp"/>
<field-to-result field="serverTimestamp"/>
- </simple-method>
+ </simple-method>
- <simple-method method-name="getServerTimeZone" login-required="false">
+ <simple-method method-name="getServerTimeZone" login-required="false">
<set field="serverTimeZone" value="${util:defaultTimeZone()}"
type="String"/>
<field-to-result field="serverTimeZone"/>
- </simple-method>
+ </simple-method>
- <simple-method method-name="getServerTimestampAsLong"
login-required="false">
+ <simple-method method-name="getServerTimestampAsLong"
login-required="false">
<now field="serverTimestamp" type="java.lang.Long"/>
<field-to-result field="serverTimestamp"/>
- </simple-method>
+ </simple-method>
</simple-methods>
Modified: ofbiz/trunk/framework/common/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services.xml?rev=1595768&r1=1595767&r2=1595768&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services.xml Mon May 19 07:19:30
2014
@@ -336,6 +336,24 @@ under the License.
<attribute name="conversionParameters" mode="IN" type="Map"
optional="true"/>
<attribute name="convertedValue" mode="OUT" type="BigDecimal"
optional="true"/>
</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 record
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="checkUomConversionDated" engine="simple"
default-entity-name="UomConversionDated"
+
location="component://common/script/org/ofbiz/common/CommonServices.xml"
invoke="checkUomConversionDated">
+ <description>Returns true if an UomConversionDated record
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="getFileUploadProgressStatus" engine="simple"
location="component://common/script/org/ofbiz/common/CommonServices.xml"
invoke="getFileUploadProgressStatus" auth="false">
<description>Look up progress made in File Upload process</description>
<attribute name="uploadProgressListener" mode="IN"
type="org.ofbiz.webapp.event.FileUploadProgressListener" optional="true"/>
@@ -769,14 +787,6 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</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="getServerTimestamp" engine="simple" auth="false"
location="component://common/script/org/ofbiz/common/CommonServices.xml"
invoke="getServerTimestamp">
<attribute name="serverTimestamp" mode="OUT" type="TimeStamp"/>
