svn commit: r730647 - in /ofbiz/trunk/applications: accounting/script/org/ofbiz/accounting/test/ manufacturing/script/org/ofbiz/manufacturing/bom/ manufacturing/script/org/ofbiz/manufacturing/techdata/ order/script/org/ofbiz/order/order/ product/script...

Author: jleroux
Date: Thu Jan  1 15:46:13 2009
New Revision: 730647

URL: http://svn.apache.org/viewvc?rev=730647&view=rev
Log:
<calculate field-name= => <calculate field=

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/order/script/org/ofbiz/order/order/OrderSimpleMethods.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=730647&r1=730646&r2=730647&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:46:13 2009
@@ -114,12 +114,12 @@
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_PAYABLE"/>
                     <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="210000"/>
                 </assert>
-                <calculate field-name="creditTotal">
+                <calculate field="creditTotal">
                     <calcop operator="add" field="acctgTransEntry.origAmount"/>
                 </calculate>
             <else>
                 <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
-                    <calculate field-name="debitTotal">
+                    <calculate field="debitTotal">
                         <calcop operator="add" field="acctgTransEntry.origAmount"/>
                     </calculate>
                 </if-compare>
@@ -336,7 +336,7 @@
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="ACCOUNTS_RECEIVABLE"/>
                     <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="120000"/>
                 </assert>-->
-                <calculate field-name="creditTotal">
+                <calculate field="creditTotal">
                     <calcop operator="add" field="acctgTransEntry.origAmount"/>
                 </calculate>
             </if-compare>
@@ -345,7 +345,7 @@
                     <if-compare field="acctgTransEntry.glAccountTypeId" operator="equals" value="UNDEPOSITED_RECEIPTS"/>
                     <if-compare field="acctgTransEntry.glAccountId" operator="equals" value="112000"/>
                 </assert>-->
-                <calculate field-name="debitTotal">
+                <calculate field="debitTotal">
                     <calcop operator="add" field="acctgTransEntry.origAmount"/>
                 </calculate>
             </if-compare>
@@ -393,7 +393,7 @@
         <set field="totalIssuedQty_MAT_B_COST" value="0.0" type="Double"/>
         <iterate list-name="workEffortAndInventoryAssigns" entry-name="workEffortAndInventoryAssign">
             <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_A_COST">  
-                <calculate field-name="totalIssuedQty_MAT_A_COST">
+                <calculate field="totalIssuedQty_MAT_A_COST">
                     <calcop operator="add">
                         <calcop operator="get" field="workEffortAndInventoryAssign.quantity"/>
                         <calcop operator="get" field="totalIssuedQty_MAT_A_COST"/>
@@ -401,7 +401,7 @@
                 </calculate>
             <else>
                 <if-compare field="workEffortAndInventoryAssign.productId" operator="equals" value="MAT_B_COST">    
-                    <calculate field-name="totalIssuedQty_MAT_B_COST">
+                    <calculate field="totalIssuedQty_MAT_B_COST">
                         <calcop operator="add">
                             <calcop operator="get" field="workEffortAndInventoryAssign.quantity" />
                             <calcop operator="get" field="totalIssuedQty_MAT_B_COST"/>

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=730647&r1=730646&r2=730647&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:46:13 2009
@@ -23,7 +23,7 @@
         
     <simple-method method-name="exampleComponentFormula" short-description="Formula that the number of linear components in bom">
         <set field="arguments" from-field="parameters.arguments"/>
-        <calculate field-name="totQuantity">
+        <calculate field="totQuantity">
             <calcop operator="multiply">
                 <calcop operator="get" field="arguments.neededQuantity"/>
                 <!-- This is the multiplier (k) -->
@@ -35,33 +35,33 @@
     
     <simple-method method-name="linearComponentConsumptionFormula" short-description="Formula that the number of linear components in bom">
         <set field="arguments" from-field="parameters.arguments"/>
-        <calculate field-name="totQuantity">
+        <calculate field="totQuantity">
             <calcop operator="multiply">
                 <calcop operator="get" field="arguments.neededQuantity"/>
                 <calcop operator="get" field="arguments.amount"/>
             </calcop>
         </calculate>
-        <calculate field-name="quantityInt" type="Integer">
+        <calculate field="quantityInt" type="Integer">
             <calcop operator="divide">
                 <calcop operator="get" field="totQuantity"/>
                 <calcop operator="get" field="arguments.width"/>
             </calcop>
         </calculate>
-        <calculate field-name="quantityDou">
+        <calculate field="quantityDou">
             <calcop operator="divide">
                 <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">
+            <calculate field="quantity">
                 <calcop operator="add">
                     <calcop operator="get" field="quantityInt"/>
                     <number value="1"/>
                 </calcop>
             </calculate>
         <else>
-            <calculate field-name="quantity">
+            <calculate field="quantity">
                 <calcop operator="add">
                     <calcop operator="get" field="quantityInt"/>
                     <number value="0"/>

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=730647&r1=730646&r2=730647&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:46:13 2009
@@ -24,13 +24,13 @@
     <simple-method method-name="exampleTaskFormula" short-description="Example task formula" login-required="false">
         <set field="arguments" from-field="parameters.arguments"/>
         <set field="task" from-field="arguments.workEffort"/>
-        <calculate field-name="taskTime">
+        <calculate field="taskTime">
             <calcop operator="multiply">
                 <calcop operator="get" field="task.estimatedMilliSeconds"/>
                 <calcop operator="get" field="arguments.quantity"/>
             </calcop>
         </calculate>
-        <calculate field-name="totalTime">
+        <calculate field="totalTime">
             <calcop operator="multiply">
                 <calcop operator="get" field="taskTime"/>
                 <number value="10"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml?rev=730647&r1=730646&r2=730647&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml Thu Jan  1 15:46:13 2009
@@ -88,7 +88,7 @@
             <if-empty field="totalsMap.${receipt.orderItemSeqId}">
                 <set field="totalsMap.${receipt.orderItemSeqId}" value="0" type="Double"/>
             </if-empty>
-            <calculate field-name="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double">
+            <calculate field="${receipt.orderItemSeqId}" map-name="totalsMap" type="Double">
                 <calcop field="${receipt.orderItemSeqId}" map-name="totalsMap" operator="add">
                     <calcop field="quantityAccepted" map-name="receipt" operator="get"/>
                     <calcop field="quantityRejected" map-name="receipt" operator="get"/>

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=730647&r1=730646&r2=730647&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:46:13 2009
@@ -73,7 +73,7 @@
                 <set field="fromVal" type="Double" from-field="product.productDepth"/>
             </if-compare>
             <if-compare field="fromUom.uomTypeId" operator="equals" value="AREA_MEASURE">
-                <calculate field-name="fromVal" type="Double" decimal-scale="15">
+                <calculate field="fromVal" type="Double" decimal-scale="15">
                     <calcop operator="multiply">
                         <calcop operator="get" field="product.productDepth"/>
                         <calcop operator="get" field="product.productWidth"/>
@@ -81,7 +81,7 @@
                 </calculate>
             </if-compare>
             <if-compare field="fromUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE">
-                <calculate field-name="fromVal" type="Double" decimal-scale="15">
+                <calculate field="fromVal" type="Double" decimal-scale="15">
                     <calcop operator="multiply">
                         <calcop operator="get" field="product.productDepth"/>
                         <calcop operator="multiply">
@@ -102,7 +102,7 @@
                 <set field="toVal" from-field="product.productDepth"/>
             </if-compare>
             <if-compare field="toUom.uomTypeId" operator="equals" value="AREA_MEASURE">
-                <calculate field-name="toVal" type="Double" decimal-scale="15">
+                <calculate field="toVal" type="Double" decimal-scale="15">
                     <calcop operator="multiply">
                         <calcop operator="get" field="product.productDepth"/>
                         <calcop operator="get" field="product.productWidth"/>
@@ -110,7 +110,7 @@
                 </calculate>
             </if-compare>
             <if-compare field="toUom.uomTypeId" operator="equals" value="VOLUME_DRY_MEASURE">
-                <calculate field-name="toVal" type="Double" decimal-scale="15">
+                <calculate field="toVal" type="Double" decimal-scale="15">
                     <calcop operator="multiply">
                         <calcop operator="get" field="product.productDepth"/>
                         <calcop operator="multiply">
@@ -126,7 +126,7 @@
             <log level="verbose" message="To product-based conversion factor: ${toVal}"/>
             
             <!-- Calcualte the product-based conversion factor = toVal / fromVal * uomConversion.conversionFactor -->
-            <calculate field-name="ratio" type="Double" decimal-scale="15">
+            <calculate field="ratio" type="Double" decimal-scale="15">
                 <calcop operator="divide">
                     <calcop operator="get" field="toVal"/>
                     <calcop operator="get" field="fromVal"/>
@@ -134,7 +134,7 @@
             </calculate>
             <log level="verbose" message="To/From ratio is ${ratio}"/>
             
-            <calculate field-name="productFactor" type="Double" decimal-scale="15">
+            <calculate field="productFactor" type="Double" decimal-scale="15">
                 <calcop operator="multiply">
                     <calcop operator="get" field="args.uomConversion.conversionFactor"/>
                     <calcop operator="get" field="ratio"/>
@@ -145,7 +145,7 @@
         </if-compare-field>
         
         <!-- Convert the value -->
-        <calculate field-name="totQuantity" type="Double" decimal-scale="15">
+        <calculate field="totQuantity" type="Double" decimal-scale="15">
             <calcop operator="multiply">
                 <calcop operator="get" field="args.originalValue"/>
                 <calcop operator="get" field="productFactor"/>