[OFBiz] SVN: r5903 - in trunk/applications/manufacturing/script/org/ofbiz/manufacturing: bom techdata

[jacopo at svn.ofbiz.org]

Author: jacopo
Date: 2005-10-03 10:10:35 -0500 (Mon, 03 Oct 2005)
New Revision: 5903

Modified:
   trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
   trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
Log:
Simple-method cleanups to use the new set operation.
Also changed some tabs to 4 spaces.

Modified: trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml
===================================================================
--- trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml	2005-10-03 14:36:03 UTC (rev 5902)
+++ trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml	2005-10-03 15:10:35 UTC (rev 5903)
@@ -29,7 +29,7 @@
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
         
     <simple-method method-name="linearComponentFormula" short-description="Formula that the number of linear components in bom">
-        <field-to-field field-name="parameters.arguments" to-field-name="arguments"/>
+        <set field="arguments" from-field="parameters.arguments"/>
         <calculate field-name="totQuantity">
             <calcop operator="multiply">
                 <calcop operator="get" field-name="arguments.neededQuantity"/>

Modified: trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml
===================================================================
--- trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml	2005-10-03 14:36:03 UTC (rev 5902)
+++ trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml	2005-10-03 15:10:35 UTC (rev 5903)
@@ -28,9 +28,9 @@
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
     <simple-method method-name="addRoutingTaskAssoc" 
             short-description="If copyTask field = Y create a copy of the routingTask,  in all the case add a RoutingTaskAssociation">
-        <if-compare map-name="parameters" field-name="copyTask" operator="equals" value="Y">
+        <if-compare field-name="parameters.copyTask" operator="equals" value="Y">
             <make-value value-name="lookupPKMap" entity-name="WorkEffort"/>
-            <field-to-field map-name="parameters" field-name="workEffortIdTo" to-map-name="lookupPKMap" to-field-name="workEffortId" />        
+            <set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/>
             <find-by-primary-key entity-name="WorkEffort" map-name="lookupPKMap" value-name="lookedUpValue"/>
             <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
                 processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/>
@@ -40,9 +40,7 @@
             </call-service>
         </if-compare>
         <if-empty field-name="fromDate" map-name="parameters">
-            <now-timestamp-to-env env-name="nowTimestamp"/>
-            <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="parameters"/>
-            <log level="info" message="Update fromDate with: ${nowTimestamp}"/>             
+            <now-timestamp-to-env env-name="parameters.fromName"/>
         </if-empty>        
         <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
@@ -65,19 +63,18 @@
         </call-service>
     </simple-method>
     
-    <simple-method method-name="updateRoutingTaskAssoc" 
-    		short-description="check if there is no pb with date and SeqId and call service updateWorkEffortAssoc">
+    <simple-method method-name="updateRoutingTaskAssoc" short-description="check if there is no pb with date and SeqId and call service updateWorkEffortAssoc">
         <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
          <check-errors/>
         <call-service service-name="checkRoutingTaskAssoc" in-map-name="context1">
-	            <result-to-field result-name="sequenceNumNotOk"  field-name="sequenceNumNotOk"/>
+            <result-to-field result-name="sequenceNumNotOk"  field-name="sequenceNumNotOk"/>
         </call-service>
         <if-compare field-name="sequenceNumNotOk" operator="equals" value="Y">
-			<add-error>
-				<fail-property resource="ManufacturingUiLabels" property="ManufacturingTwoRoutingTaskWithSameSeqId"/>
-			</add-error>
-    		<check-errors/>
+            <add-error>
+                <fail-property resource="ManufacturingUiLabels" property="ManufacturingTwoRoutingTaskWithSameSeqId"/>
+            </add-error>
+            <check-errors/>
         </if-compare> 
         <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml"
                 processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context2"/>