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 2013/11/02 00:56:50 UTC
svn commit: r1538095 - in /ofbiz/trunk/applications/order:
script/org/ofbiz/order/olap/FactServices.xml servicedef/services_olap.xml
Author: jleroux
Date: Fri Nov 1 23:56:49 2013
New Revision: 1538095
URL: http://svn.apache.org/r1538095
Log:
Fixes (more a workaround for now) a bug I found after initializing the BI DB and trying to create a new order
While at it improves a French label
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/trunk/applications/order/servicedef/services_olap.xml
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=1538095&r1=1538094&r2=1538095&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml Fri Nov 1 23:56:49 2013
@@ -482,6 +482,10 @@ under the License.
</simple-method>
<simple-method method-name="convertUomCurrency" short-description="Convert Uom Currency from UomConversionDated entity">
+ <if-empty field="parameters.nowDate">
+ <now field="now"/>
+ <set field="parameters.nowDate" from-field="now"/>
+ </if-empty>
<entity-condition entity-name="UomConversionDated" list="UomConversionDatedList">
<condition-list combine="and">
<condition-expr field-name="uomId" operator="equals" from-field="parameters.uomId"/>
Modified: ofbiz/trunk/applications/order/servicedef/services_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_olap.xml?rev=1538095&r1=1538094&r2=1538095&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_olap.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_olap.xml Fri Nov 1 23:56:49 2013
@@ -55,9 +55,9 @@ under the License.
<service name="convertUomCurrency" auth="true" engine="simple"
location="component://order/script/org/ofbiz/order/olap/FactServices.xml" invoke="convertUomCurrency">
<description>Import Sales Order Data.</description>
- <attribute name="uomId" type="String" mode="IN" optional="false"/>
- <attribute name="uomIdTo" type="String" mode="IN" optional="false"/>
- <attribute name="nowDate" type="Timestamp" mode="IN" optional="false"/>
+ <attribute name="uomId" type="String" mode="IN"/>
+ <attribute name="uomIdTo" type="String" mode="IN"/>
+ <attribute name="nowDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="conversionFactor" type="Double" mode="OUT" optional="true"/>
</service>