Author: jleroux
Date: Thu Jan 1 15:45:29 2009
New Revision: 730646
URL: http://svn.apache.org/viewvc?rev=730646&view=rev
Log:
<calcop(.*)field-name= => <calcop$1field=
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml?rev=730646&r1=730645&r2=730646&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
(original)
+++
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml
Thu Jan 1 15:45:29 2009
@@ -115,12 +115,12 @@
<if-compare field="acctgTransEntry.glAccountId"
operator="equals" value="210000"/>
</assert>
<calculate field-name="creditTotal">
- <calcop operator="add"
field-name="acctgTransEntry.origAmount"/>
+ <calcop operator="add" field="acctgTransEntry.origAmount"/>
</calculate>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag"
operator="equals" value="D">
<calculate field-name="debitTotal">
- <calcop operator="add"
field-name="acctgTransEntry.origAmount"/>
+ <calcop operator="add"
field="acctgTransEntry.origAmount"/>
</calculate>
</if-compare>
</else>
@@ -337,7 +337,7 @@
<if-compare field="acctgTransEntry.glAccountId"
operator="equals" value="120000"/>
</assert>-->
<calculate field-name="creditTotal">
- <calcop operator="add"
field-name="acctgTransEntry.origAmount"/>
+ <calcop operator="add" field="acctgTransEntry.origAmount"/>
</calculate>
</if-compare>
<if-compare field="acctgTransEntry.debitCreditFlag"
operator="equals" value="D">
@@ -346,7 +346,7 @@
<if-compare field="acctgTransEntry.glAccountId"
operator="equals" value="112000"/>
</assert>-->
<calculate field-name="debitTotal">
- <calcop operator="add"
field-name="acctgTransEntry.origAmount"/>
+ <calcop operator="add" field="acctgTransEntry.origAmount"/>
</calculate>
</if-compare>
</iterate>
@@ -395,16 +395,16 @@
<if-compare field="workEffortAndInventoryAssign.productId"
operator="equals" value="MAT_A_COST">
<calculate field-name="totalIssuedQty_MAT_A_COST">
<calcop operator="add">
- <calcop operator="get"
field-name="workEffortAndInventoryAssign.quantity"/>
- <calcop operator="get"
field-name="totalIssuedQty_MAT_A_COST"/>
+ <calcop operator="get"
field="workEffortAndInventoryAssign.quantity"/>
+ <calcop operator="get"
field="totalIssuedQty_MAT_A_COST"/>
</calcop>
</calculate>
<else>
<if-compare field="workEffortAndInventoryAssign.productId"
operator="equals" value="MAT_B_COST">
<calculate field-name="totalIssuedQty_MAT_B_COST">
<calcop operator="add">
- <calcop operator="get"
field-name="workEffortAndInventoryAssign.quantity" />
- <calcop operator="get"
field-name="totalIssuedQty_MAT_B_COST"/>
+ <calcop operator="get"
field="workEffortAndInventoryAssign.quantity" />
+ <calcop operator="get"
field="totalIssuedQty_MAT_B_COST"/>
</calcop>
</calculate>
</if-compare>
Modified:
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml?rev=730646&r1=730645&r2=730646&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
Thu Jan 1 15:45:29 2009
@@ -25,7 +25,7 @@
<set field="arguments" from-field="parameters.arguments"/>
<calculate field-name="totQuantity">
<calcop operator="multiply">
- <calcop operator="get" field-name="arguments.neededQuantity"/>
+ <calcop operator="get" field="arguments.neededQuantity"/>
<!-- This is the multiplier (k) -->
<number value="10"/>
</calcop>
@@ -37,33 +37,33 @@
<set field="arguments" from-field="parameters.arguments"/>
<calculate field-name="totQuantity">
<calcop operator="multiply">
- <calcop operator="get" field-name="arguments.neededQuantity"/>
- <calcop operator="get" field-name="arguments.amount"/>
+ <calcop operator="get" field="arguments.neededQuantity"/>
+ <calcop operator="get" field="arguments.amount"/>
</calcop>
</calculate>
<calculate field-name="quantityInt" type="Integer">
<calcop operator="divide">
- <calcop operator="get" field-name="totQuantity"/>
- <calcop operator="get" field-name="arguments.width"/>
+ <calcop operator="get" field="totQuantity"/>
+ <calcop operator="get" field="arguments.width"/>
</calcop>
</calculate>
<calculate field-name="quantityDou">
<calcop operator="divide">
- <calcop operator="get" field-name="totQuantity"/>
- <calcop operator="get" field-name="arguments.width"/>
+ <calcop operator="get" field="totQuantity"/>
+ <calcop operator="get" field="arguments.width"/>
</calcop>
</calculate>
<if-compare-field field="quantityInt" to-field="quantityDou"
operator="less">
<calculate field-name="quantity">
<calcop operator="add">
- <calcop operator="get" field-name="quantityInt"/>
+ <calcop operator="get" field="quantityInt"/>
<number value="1"/>
</calcop>
</calculate>
<else>
<calculate field-name="quantity">
<calcop operator="add">
- <calcop operator="get" field-name="quantityInt"/>
+ <calcop operator="get" field="quantityInt"/>
<number value="0"/>
</calcop>
</calculate>
Modified:
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml?rev=730646&r1=730645&r2=730646&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/TaskFormulae.xml
Thu Jan 1 15:45:29 2009
@@ -26,13 +26,13 @@
<set field="task" from-field="arguments.workEffort"/>
<calculate field-name="taskTime">
<calcop operator="multiply">
- <calcop operator="get"
field-name="task.estimatedMilliSeconds"/>
- <calcop operator="get" field-name="arguments.quantity"/>
+ <calcop operator="get" field="task.estimatedMilliSeconds"/>
+ <calcop operator="get" field="arguments.quantity"/>
</calcop>
</calculate>
<calculate field-name="totalTime">
<calcop operator="multiply">
- <calcop operator="get" field-name="taskTime"/>
+ <calcop operator="get" field="taskTime"/>
<number value="10"/>
</calcop>
</calculate>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml?rev=730646&r1=730645&r2=730646&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
Thu Jan 1 15:45:29 2009
@@ -75,18 +75,18 @@
<if-compare field="fromUom.uomTypeId" operator="equals"
value="AREA_MEASURE">
<calculate field-name="fromVal" type="Double"
decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productDepth"/>
- <calcop operator="get"
field-name="product.productWidth"/>
+ <calcop operator="get" field="product.productDepth"/>
+ <calcop operator="get" field="product.productWidth"/>
</calcop>
</calculate>
</if-compare>
<if-compare field="fromUom.uomTypeId" operator="equals"
value="VOLUME_DRY_MEASURE">
<calculate field-name="fromVal" type="Double"
decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productDepth"/>
+ <calcop operator="get" field="product.productDepth"/>
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productWidth"/>
- <calcop operator="get"
field-name="product.productHeight"/>
+ <calcop operator="get"
field="product.productWidth"/>
+ <calcop operator="get"
field="product.productHeight"/>
</calcop>
</calcop>
</calculate>
@@ -104,18 +104,18 @@
<if-compare field="toUom.uomTypeId" operator="equals"
value="AREA_MEASURE">
<calculate field-name="toVal" type="Double" decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productDepth"/>
- <calcop operator="get"
field-name="product.productWidth"/>
+ <calcop operator="get" field="product.productDepth"/>
+ <calcop operator="get" field="product.productWidth"/>
</calcop>
</calculate>
</if-compare>
<if-compare field="toUom.uomTypeId" operator="equals"
value="VOLUME_DRY_MEASURE">
<calculate field-name="toVal" type="Double" decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productDepth"/>
+ <calcop operator="get" field="product.productDepth"/>
<calcop operator="multiply">
- <calcop operator="get"
field-name="product.productWidth"/>
- <calcop operator="get"
field-name="product.productHeight"/>
+ <calcop operator="get"
field="product.productWidth"/>
+ <calcop operator="get"
field="product.productHeight"/>
</calcop>
</calcop>
</calculate>
@@ -128,16 +128,16 @@
<!-- Calcualte the product-based conversion factor = toVal /
fromVal * uomConversion.conversionFactor -->
<calculate field-name="ratio" type="Double" decimal-scale="15">
<calcop operator="divide">
- <calcop operator="get" field-name="toVal"/>
- <calcop operator="get" field-name="fromVal"/>
+ <calcop operator="get" field="toVal"/>
+ <calcop operator="get" field="fromVal"/>
</calcop>
</calculate>
<log level="verbose" message="To/From ratio is ${ratio}"/>
<calculate field-name="productFactor" type="Double"
decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get"
field-name="args.uomConversion.conversionFactor"/>
- <calcop operator="get" field-name="ratio"/>
+ <calcop operator="get"
field="args.uomConversion.conversionFactor"/>
+ <calcop operator="get" field="ratio"/>
</calcop>
</calculate>
<log level="verbose" message="Resulting product-based conversion
factor: ${productFactor}"/>
@@ -147,8 +147,8 @@
<!-- Convert the value -->
<calculate field-name="totQuantity" type="Double" decimal-scale="15">
<calcop operator="multiply">
- <calcop operator="get" field-name="args.originalValue"/>
- <calcop operator="get" field-name="productFactor"/>
+ <calcop operator="get" field="args.originalValue"/>
+ <calcop operator="get" field="productFactor"/>
</calcop>
</calculate>
<field-to-result field-name="totQuantity"
result-name="convertedValue"/>
