svn commit: r730116 [4/4] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accountin...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r730116 [4/4] - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/agreement/ applications/accounting/script/org/ofbiz/accounting/cost/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accountin...

jleroux@apache.org
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 04:14:23 2008
@@ -29,7 +29,7 @@
         <set-service-fields service-name="assignPartyToWorkEffort" map-name="parameters" to-map-name="assign"/>
         <set field="assign.workEffortId" from-field="workEffortId"/>
         <call-service service-name="assignPartyToWorkEffort" in-map-name="assign"/>
-        <field-to-result field-name="workEffortId"/>
+        <field-to-result field="workEffortId"/>
     </simple-method>
                                         
     <simple-method method-name="createWorkEffort" short-description="Create Work Effort">
@@ -40,7 +40,7 @@
                 <set field="newEntity.workEffortId" from-field="parameters.workEffortId"/>
             </else>
         </if-empty>
-        <field-to-result field-name="newEntity.workEffortId" result-name="workEffortId"/>
+        <field-to-result field="newEntity.workEffortId" result-name="workEffortId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -211,8 +211,8 @@
             <set field="eventWe.description" from-field="parameters.relationDescription"/>
             <create-value value-field="lookupMap"/>
         </if-empty>
-        <field-to-result field-name="workEffortId" map-name="lookupMap"/>
-        <field-to-result field-name="communicationEventId" map-name="lookupMap"/>
+        <field-to-result field="workEffortId" map-name="lookupMap"/>
+        <field-to-result field="communicationEventId" map-name="lookupMap"/>
     </simple-method>
 
     <simple-method method-name="updateCommunicationEventWorkEff" short-description="Delete a CommunicationEventWorkEff">
@@ -269,7 +269,7 @@
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
         </if-empty>
-        <field-to-result field-name="newEntity.fromDate" result-name="fromDate"/>
+        <field-to-result field="newEntity.fromDate" result-name="fromDate"/>
 
         <if-not-empty field="parameters.statusId">
             <now-timestamp-to-env env-name="newEntity.statusDateTime"/>
@@ -341,7 +341,7 @@
         <log level="info" message="Creating a WorkEffortContactMech"/>
         <set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
         <set-nonpk-fields map="parameters" value-field="newValue"/>
-        <field-to-result field-name="contactMechId" map-name="newValue"/>
+        <field-to-result field="contactMechId" map-name="newValue"/>
         <field-to-request field-name="contactMechId" map-name="newValue"/>        
         <create-value value-field="newValue"/>
     </simple-method>
@@ -379,7 +379,7 @@
             <remove-value value-name="workEffortContactMech"/>
         </if-compare-field>
         
-        <field-to-result field-name="contactMechId" map-name="newWorkEffortContactMech"/>
+        <field-to-result field="contactMechId" map-name="newWorkEffortContactMech"/>
         <field-to-request field-name="contactMechId" map-name="newWorkEffortContactMech"/>      
     </simple-method>    
     
@@ -422,7 +422,7 @@
             <default-message>WorkEffort Contact Mechanism successfully created</default-message>      
         </call-service>
         <field-to-request field-name="contactMechId" map-name="newValue"/>
-        <field-to-result field-name="contactMechId" map-name="newValue"/>
+        <field-to-result field="contactMechId" map-name="newValue"/>
     </simple-method>
     
     <simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
@@ -442,7 +442,7 @@
             <default-message>WorkEffort Contact Mechanism successfully updated</default-message>      
         </call-service>
         <field-to-request field-name="contactMechId" map-name="newValue"/>
-        <field-to-result field-name="contactMechId" map-name="newValue"/>                  
+        <field-to-result field="contactMechId" map-name="newValue"/>                  
     </simple-method>
     
     <simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
@@ -473,7 +473,7 @@
             <default-message>WorkEffort Contact Mechanism successfully created</default-message>      
         </call-service>
         <field-to-request field-name="contactMechId" map-name="newValue"/>
-        <field-to-result field-name="contactMechId" map-name="newValue"/>
+        <field-to-result field="contactMechId" map-name="newValue"/>
     </simple-method>
     
     <simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
@@ -495,7 +495,7 @@
         </call-service>
         <log level="info" message="Setting result id: ${newValue.contactMechId}"/>
         <field-to-request field-name="contactMechId" map-name="newValue"/>
-        <field-to-result field-name="contactMechId" map-name="newValue"/>                  
+        <field-to-result field="contactMechId" map-name="newValue"/>                  
     </simple-method>  
     
     <simple-method method-name="createWorkEffortEmailAddress" short-description="Create an email address for WorkEffort">
@@ -561,7 +561,7 @@
     <simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note">
         <make-value value-field="newEntity" entity-name="NoteData"/>
         <sequenced-id-to-env sequence-name="NoteData" env-name="newEntity.noteId"/>
-        <field-to-result field-name="newEntity.noteId" result-name="noteId"/>
+        <field-to-result field="newEntity.noteId" result-name="noteId"/>
         <set from-field="parameters.noteInfo" field="newEntity.noteInfo"/>
         <if-not-empty field="parameters.noteParty">
            <set from-field="parameters.noteParty" field="newEntity.noteParty"/>
@@ -700,7 +700,7 @@
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-field="lookupMap"/>
-        <field-to-result field-name="custRequestId" map-name="lookupMap"/>
+        <field-to-result field="custRequestId" map-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
         <entity-one entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/>
@@ -737,7 +737,7 @@
         <find-by-primary-key entity-name="CustRequestItem" map="lookupMap" value-field="custRequestItem"/>
         <if-not-empty field="custRequestItem">
             <set field="custRequestItemExists" value="true"/>
-            <field-to-result field-name="custRequestItemExists"/>
+            <field-to-result field="custRequestItemExists"/>
             <log level="always" message="custRequestItemExists: ${custRequestItemExists}" />
             <else>
                 <log level="always" message="custRequestItemExists: empty" />
@@ -756,7 +756,7 @@
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-field="lookupMap"/>
-        <field-to-result field-name="quoteId" map-name="lookupMap"/>
+        <field-to-result field="quoteId" map-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
         <entity-one entity-name="QuoteWorkEffort" value-field="quoteWorkEffort"/>
@@ -778,7 +778,7 @@
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-field="lookupMap"/>
-        <field-to-result field-name="requirementId" map-name="lookupMap"/>
+        <field-to-result field="requirementId" map-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
         <entity-one entity-name="WorkRequirementFulfillment" value-field="workRequirementFulfillment"/>
@@ -800,7 +800,7 @@
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-field="lookupMap"/>
-        <field-to-result field-name="shoppingListId" map-name="lookupMap"/>
+        <field-to-result field="shoppingListId" map-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
         <entity-one entity-name="ShoppingListWorkEffort" value-field="shoppingListWorkEffort"/>
@@ -822,7 +822,7 @@
         </if-not-empty>
         <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-field="lookupMap"/>
-        <field-to-result field-name="orderId" map-name="lookupMap"/>
+        <field-to-result field="orderId" map-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
         <entity-one entity-name="OrderHeaderWorkEffort" value-field="orderWorkEffort"/>

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=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 04:14:23 2008
@@ -62,7 +62,7 @@
     <simple-method method-name="convertUom" short-description="Convert UOM values" login-required="false">
         <!-- base case: if both uomIds are the same, return the original value -->
         <if-compare-field field="parameters.uomId" to-field="parameters.uomIdTo" operator="equals">
-            <field-to-result field-name="parameters.originalValue" result-name="convertedValue"/>
+            <field-to-result field="parameters.originalValue" result-name="convertedValue"/>
             <return/>
         </if-compare-field>
 
@@ -153,7 +153,7 @@
         </if-empty>  <!-- no UomConversion or UomConversionDated found -->
         
         <!-- all done -->
-        <field-to-result field-name="convertedValue"/>
+        <field-to-result field="convertedValue"/>
         
         <log level="verbose" message="Uom conversion of [${parameters.originalValue}] from [${parameters.uomId}] to [${parameters.uomIdTo}] using conversion factor [${uomConversion.conversionFactor}], result is [${convertedValue}]"/>
     </simple-method>
@@ -179,19 +179,19 @@
         <set field="uploadProgressListener" from-field="parameters.uploadProgressListener"/>
         <if-not-empty field="uploadProgressListener">
             <call-object-method obj-field-name="uploadProgressListener" method-name="getContentLength" ret-field-name="parameters.contentLength"/>
-            <field-to-result field-name="parameters.contentLength" result-name="contentLength"/>
+            <field-to-result field="parameters.contentLength" result-name="contentLength"/>
             <call-object-method obj-field-name="uploadProgressListener" method-name="getBytesRead" ret-field-name="parameters.bytesRead"/>
-            <field-to-result field-name="parameters.bytesRead" result-name="bytesRead"/>
+            <field-to-result field="parameters.bytesRead" result-name="bytesRead"/>
             <call-object-method obj-field-name="uploadProgressListener" method-name="hasStarted" ret-field-name="parameters.hasStarted"/>
-            <field-to-result field-name="parameters.hasStarted" result-name="hasStarted"/>
+            <field-to-result field="parameters.hasStarted" result-name="hasStarted"/>
             <call-bsh><![CDATA[
                 contentLength = parameters.get("contentLength");
                 bytesRead = parameters.get("bytesRead");
                 int readPercent = (bytesRead* 100)/contentLength;
                 parameters.put("readPercent", readPercent);
             ]]></call-bsh>
-            <field-to-result field-name="parameters.readPercent" result-name="readPercent"/>
-            <field-to-result field-name="parameters.hasStarted" result-name="hasStarted"/>
+            <field-to-result field="parameters.readPercent" result-name="readPercent"/>
+            <field-to-result field="parameters.hasStarted" result-name="hasStarted"/>
         </if-not-empty>
     </simple-method>
 
@@ -222,6 +222,6 @@
                 </else>
             </if-empty>
         </iterate>
-        <field-to-result field-name="themeResources"/>
+        <field-to-result field="themeResources"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/EnumerationServices.xml Tue Dec 30 04:14:23 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createEnumeration" short-description="create a Enumeration">
         <make-value entity-name="Enumeration" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="Enumeration" env-name="newEntity.enumId"/> <!-- get the next sequenced ID -->
-        <field-to-result field-name="newEntity.enumId" result-name="enumId"/>
+        <field-to-result field="newEntity.enumId" result-name="enumId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>
     </simple-method>  

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Tue Dec 30 04:14:23 2008
@@ -38,6 +38,6 @@
          <set value="" field="resultEntry.value"/>
          <field-to-list field-name="resultEntry" list-name="lookupResult"/>
         </if-empty>
-        <field-to-result field-name="lookupResult"/>    
+        <field-to-result field="lookupResult"/>    
     </simple-method>      
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:14:23 2008
@@ -42,7 +42,7 @@
         <make-value entity-name="PortalPageColumn" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="columnSeqId"/>
-        <field-to-result field-name="newEntity.columnSeqId" result-name="columnSeqId"/>
+        <field-to-result field="newEntity.columnSeqId" result-name="columnSeqId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>  
     </simple-method>
@@ -69,7 +69,7 @@
         <make-value entity-name="PortalPagePortlet" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="portletSeqId"/>
-        <field-to-result field-name="newEntity.portletSeqId" result-name="portletSeqId"/>
+        <field-to-result field="newEntity.portletSeqId" result-name="portletSeqId"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>  
         <make-value entity-name="PortalPageColumn" value-field="newEntity1"/>
@@ -101,7 +101,7 @@
         <iterate list="attributeList" entry="attributeRecord">
             <set field="attributeMap.${attributeRecord.attrName}" from-field="attributeRecord.attrValue"/>
         </iterate>
-        <field-to-result field-name="attributeMap" result-name="attributeMap"/>
+        <field-to-result field="attributeMap" result-name="attributeMap"/>
     </simple-method>
     
     <simple-method method-name="createPortalPage" short-description="Create a new Portal Page">
@@ -117,7 +117,7 @@
         <set field="newPortalPageColumn.columnSeqId"  value="1"/>
         <create-value value-field="newPortalPageColumn"/>
 
-        <field-to-result field-name="newPortalPage.portalPageId" result-name="portalPageId"/>
+        <field-to-result field="newPortalPage.portalPageId" result-name="portalPageId"/>
     </simple-method>
     
     <simple-method method-name="deletePortalPage" short-description="Delete a Portal Page">
@@ -179,6 +179,6 @@
             </entity-condition>
         </if-not-empty>
         <list-to-list list-name="PortalPageList" to-list-name="result"/>
-        <field-to-result field-name="result" result-name="listIt"/>
+        <field-to-result field="result" result-name="listIt"/>
     </simple-method>  
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 04:14:23 2008
@@ -30,7 +30,7 @@
         
         <sequenced-id-to-env sequence-name="CustomTimePeriod" env-name="customTimePeriodId"/>
         <set from-field="customTimePeriodId" field="newEntity.customTimePeriodId"/>
-        <field-to-result field-name="customTimePeriodId" result-name="customTimePeriodId"/>
+        <field-to-result field="customTimePeriodId" result-name="customTimePeriodId"/>
         
         <create-value value-field="newEntity"/>
     </simple-method>
@@ -105,6 +105,6 @@
         <if-compare field="parameters.excludeParentPeriods" operator="equals" value="Y"></if-compare>
         -->
 
-        <field-to-result field-name="listSoFar" result-name="customTimePeriodList"/>
+        <field-to-result field="listSoFar" result-name="customTimePeriodList"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml Tue Dec 30 04:14:23 2008
@@ -67,13 +67,13 @@
             </condition>
             <then>
                 <set field="hasPermission" type="Boolean" value="true"/>
-                <field-to-result field-name="hasPermission"/>
+                <field-to-result field="hasPermission"/>
             </then>
             <else>
                 <property-to-field resource="CommonUiLabels" property="CommonGenericPermissionError" field-name="failMessage"/>
                 <set field="hasPermission" type="Boolean" value="false"/>
-                <field-to-result field-name="hasPermission"/>
-                <field-to-result field-name="failMessage"/>
+                <field-to-result field="hasPermission"/>
+                <field-to-result field="failMessage"/>
             </else>
         </if>
     </simple-method>

Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Tue Dec 30 04:14:23 2008
@@ -29,7 +29,7 @@
 
         <sequenced-id-to-env sequence-name="EntitySync" env-name="entitySyncId"/>
         <set field="newEntity.entitySyncId" from-field="entitySyncId"/>
-        <field-to-result field-name="entitySyncId" result-name="entitySyncId"/>
+        <field-to-result field="entitySyncId" result-name="entitySyncId"/>
 
         <create-value value-field="newEntity"/>
     </simple-method>
@@ -63,7 +63,7 @@
         <make-value value-field="newEntity" entity-name="EntitySyncHistory"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <now-timestamp-to-env env-name="newEntity.startDate"/>
-        <field-to-result field-name="newEntity.startDate" result-name="startDate"/>
+        <field-to-result field="newEntity.startDate" result-name="startDate"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-field="newEntity"/>
         

Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml Tue Dec 30 04:14:23 2008
@@ -29,12 +29,12 @@
         </if-empty>
         <if-has-permission permission="EXAMPLE" action="_${parameters.mainAction}">
             <set field="hasPermission" type="Boolean" value="true"/>
-            <field-to-result field-name="hasPermission"/>
+            <field-to-result field="hasPermission"/>
             <else>
                 <property-to-field resource="ExampleUiLabels" property="ExamplePermissionError" field-name="failMessage"/>
                 <set field="hasPermission" type="Boolean" value="false"/>
-                <field-to-result field-name="hasPermission"/>
-                <field-to-result field-name="failMessage"/>
+                <field-to-result field="hasPermission"/>
+                <field-to-result field="failMessage"/>
             </else>
         </if-has-permission>
     </simple-method>

Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Tue Dec 30 04:14:23 2008
@@ -24,13 +24,13 @@
     <simple-method method-name="ConvertOfbizCartToGoogle" short-description="">
         <set field="cart" from-field="parameters.shoppingCart"/>
         <call-simple-method method-name="createShoppingCart"/>
-        <field-to-result field-name="googleCart"/>
+        <field-to-result field="googleCart"/>
 
         <call-simple-method method-name="createCheckoutFlowSupport"/>
-        <field-to-result field-name="flowSupport"/>
+        <field-to-result field="flowSupport"/>
 
         <call-simple-method method-name="createorderProcessingSupport"/>
-        <field-to-result field-name="sendInitialAuthDetails"/>
+        <field-to-result field="sendInitialAuthDetails"/>
 
     </simple-method>
     <simple-method method-name="createShoppingCart" short-description="">

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Tue Dec 30 04:14:23 2008
@@ -87,13 +87,13 @@
                     </or>
                 </condition>
                 <then>
-                    <field-to-result field-name="hasPermission"/>
+                    <field-to-result field="hasPermission"/>
                     <return/>
                 </then>
                 <else>
                     <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field-name="failMessage"/>
-                    <field-to-result field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="failMessage"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
                     <return/>
                 </else>
             </if>
@@ -129,13 +129,13 @@
                     </or>
                 </condition>
                 <then>
-                    <field-to-result field-name="hasPermission"/>
+                    <field-to-result field="hasPermission"/>
                     <return/>
                 </then>
                 <else>
                     <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToProject" field-name="failMessage"/>
-                    <field-to-result field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="failMessage"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
                     <return/>
                 </else>
             </if>
@@ -214,14 +214,14 @@
                     </or>
                 </condition>
                 <then>
-                    <field-to-result field-name="hasPermission"/>
+                    <field-to-result field="hasPermission"/>
                     <return/>
                 </then>
                 <else>
                     <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTask" field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
-                    <field-to-result field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="failMessage"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
                     <return/>
                 </else>
             </if>
@@ -261,13 +261,13 @@
                     </or>
                 </condition>
                 <then>
-                    <field-to-result field-name="hasPermission"/>
+                    <field-to-result field="hasPermission"/>
                     <return/>
                 </then>
                 <else>
                     <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
-                    <field-to-result field-name="failMessage"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="failMessage"/>
                     <return/>
                 </else>
             </if>
@@ -318,13 +318,13 @@
                     </or>
                 </condition>
                 <then>
-                    <field-to-result field-name="hasPermission"/>
+                    <field-to-result field="hasPermission"/>
                     <return/>
                 </then>
                 <else>
                     <property-to-field resource="ProjectMgrUiLabels" property="ProjectMgrNoAccessToTimesheet" field-name="failMessage"/>
-                    <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
-                    <field-to-result field-name="failMessage"/>
+                    <field-to-result field="hasNoPermission" result-name="hasPermission"/>
+                    <field-to-result field="failMessage"/>
                     <return/>
                 </else>
             </if>
@@ -333,8 +333,8 @@
         <!-- should never arrive here..... -->
         <log level="error" message="======ProjectMGR Security UNCHECKED ACTION=====  action: ${parameters.mainAction} object: ${sec_object} value: ${parameters.projectId}${parameters.workEffortId}${parameters.taskId}${parameters.timesheetId}${parameters.timeEntryId} resourceDescription: ${parameters.resourceDescription}"/>
         <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
-        <field-to-result field-name="failMessage"/>
-        <field-to-result field-name="hasNoPermission" result-name="hasPermission"/>
+        <field-to-result field="failMessage"/>
+        <field-to-result field="hasNoPermission" result-name="hasPermission"/>
     </simple-method>
     
     <simple-method method-name="checkProjectMembership" short-description="check if a party is member of a project, input either 'taskId', 'phaseId' or 'projectId', returns 'isMember' ">

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 04:14:23 2008
@@ -118,7 +118,7 @@
     
     <simple-method method-name="updateTaskAssigment"
         short-description="Update task to resource assignment, if required create a new one by re-assigment">
-        <field-to-result map-name="parameters" field-name="workEffortId"/>
+        <field-to-result map-name="parameters" field="workEffortId"/>
         <if>
             <!-- check if a change in partyId Or roletypeId: need to delete and create new -->
             <condition>
@@ -239,7 +239,7 @@
                 2. call a recursive java function to set all the dependant tasks.                
         -->
         
-        <field-to-result map-name="parameters" field-name="projectId"/>
+        <field-to-result map-name="parameters" field="projectId"/>
         
         <!-- find a starting point being either the estimated start date of a project or the earliest actual start date. -->
         <entity-condition entity-name="ProjectAndPhaseAndTask" list-name="tasks">
@@ -371,7 +371,7 @@
     </simple-method>        
     
     <simple-method method-name="updateTimeEntryByWorkeffort" short-description="Update workeffort by workeffortId and timesheetId ">
-        <field-to-result field-name="parameters.timesheetId" result-name="timesheetId"/>
+        <field-to-result field="parameters.timesheetId" result-name="timesheetId"/>
         <if-empty field="parameters.workEffortId">
             <return/>
         </if-empty>
@@ -496,12 +496,12 @@
             </else>
         </if-not-empty>
         <get-related-one value-name="phase" relation-name="ParentWorkEffort" to-value-name="project"/>
-        <field-to-result field-name="project.workEffortId" result-name="projectId"/>
-        <field-to-result field-name="project.workEffortName" result-name="projectName"/>
-        <field-to-result field-name="phase.workEffortId" result-name="phaseId"/>
-        <field-to-result field-name="phase.workEffortName" result-name="phaseName"/>
-        <field-to-result field-name="task.workEffortId" result-name="taskId"/>
-        <field-to-result field-name="task.workEffortName" result-name="taskName"/>
+        <field-to-result field="project.workEffortId" result-name="projectId"/>
+        <field-to-result field="project.workEffortName" result-name="projectName"/>
+        <field-to-result field="phase.workEffortId" result-name="phaseId"/>
+        <field-to-result field="phase.workEffortName" result-name="phaseName"/>
+        <field-to-result field="task.workEffortId" result-name="taskId"/>
+        <field-to-result field="task.workEffortName" result-name="taskName"/>
     </simple-method>
     
     <simple-method method-name="copyProjectToTemplate" short-description="copy a project to a workeffortType starting with 'template'">
@@ -515,7 +515,7 @@
         </entity-one>
         
         <if-empty field="project">
-            <field-to-result map-name="parameters" field-name="projectId"/>
+            <field-to-result map-name="parameters" field="projectId"/>
             <add-error error-list-name="error_list"><fail-message message="Project: ${parameters.projectId} not found"/></add-error>
         </if-empty>
         <if-not-empty field="parameters.workEffortName">
@@ -586,7 +586,7 @@
                 </if-not-empty>
             </iterate>
         </if-not-empty>
-        <field-to-result field-name="newProjectId" result-name="projectId"/>
+        <field-to-result field="newProjectId" result-name="projectId"/>
     </simple-method>
     
     <simple-method method-name="getProject" short-description="get Project information" login-required="true">
@@ -662,8 +662,8 @@
         <call-simple-method method-name="createDates"/>
         
         <!-- results -->
-        <field-to-result field-name="highInfo" result-name="projectInfo"/>
-        <field-to-result field-name="parameters.projectId" result-name="projectId"/>        
+        <field-to-result field="highInfo" result-name="projectInfo"/>
+        <field-to-result field="parameters.projectId" result-name="projectId"/>        
     </simple-method>
     
     <simple-method method-name="getProjectPhaseList" short-description="get Project Phase information" login-required="true">
@@ -737,8 +737,8 @@
         </if-not-empty>
         
         <!-- results -->
-        <field-to-result field-name="phaseList"/>
-        <field-to-result field-name="parameters.projectId" result-name="projectId"/>        
+        <field-to-result field="phaseList"/>
+        <field-to-result field="parameters.projectId" result-name="projectId"/>        
     </simple-method>
     
     <simple-method method-name="getProjectTaskList" short-description="get Project Phase/task information" login-required="true">
@@ -765,8 +765,8 @@
             </iterate>
         </if-not-empty>
         <!-- results -->
-        <field-to-result field-name="taskList"/>
-        <field-to-result field-name="parameters.projectId" result-name="projectId"/>        
+        <field-to-result field="taskList"/>
+        <field-to-result field="parameters.projectId" result-name="projectId"/>        
     </simple-method>
     
     <simple-method method-name="getProjectTask" short-description="get Project task information" login-required="true">
@@ -781,7 +781,7 @@
         <call-simple-method method-name="combineInfo"/>
         <call-simple-method method-name="getHours"/>
         <set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>
-        <field-to-result field-name="highInfo" result-name="taskInfo"/>
+        <field-to-result field="highInfo" result-name="taskInfo"/>
     </simple-method>
 
     <simple-method method-name="getProjectsByParties" short-description="get Project information by party member" login-required="true">
@@ -835,7 +835,7 @@
                 <field-to-list field-name="projectParty" list-name="projectParties"/>
             </if-not-empty>
             <if-not-empty field="projectParties">
-                <field-to-result field-name="projectParties"/>                                                                                      
+                <field-to-result field="projectParties"/>                                                                                      
             </if-not-empty>
         </if-not-empty>
     </simple-method>
@@ -900,7 +900,7 @@
                 <field-to-list field-name="taskParty" list-name="taskParties"/>
             </if-not-empty>
             <if-not-empty field="taskParties">
-                <field-to-result field-name="taskParties"/>                                                                                      
+                <field-to-result field="taskParties"/>                                                                                      
             </if-not-empty>
         </if-not-empty>
     </simple-method>
@@ -1277,7 +1277,7 @@
                     <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/>
                 </call-service>
                 <set field="addTaskToInvoice.combineInvoiceItem" value="Y"/>
-                <field-to-result field-name="parameters.invoiceId" result-name="invoiceId"/>
+                <field-to-result field="parameters.invoiceId" result-name="invoiceId"/>
                 <set field="notFirst" value="Y"/>
                 <else>
                     <if>

Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml?rev=730116&r1=730115&r2=730116&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml Tue Dec 30 04:14:23 2008
@@ -32,8 +32,8 @@
                 <set field="productId" type="String" value="${product.productId}"/>
                 <field-to-list field-name="productId" list-name="productsId"/>
             </iterate>
-            <field-to-result field-name="productsList" result-name="productsList"/>
-            <field-to-result field-name="productsId" result-name="productsId"/>
+            <field-to-result field="productsList" result-name="productsList"/>
+            <field-to-result field="productsId" result-name="productsId"/>
         <else>
             <!--  Search by product description -->
             <if-compare field="parameters.searchBy" operator="equals" value="productDescription">
@@ -48,8 +48,8 @@
                     <set field="productId" type="String" value="${product.productId}"/>
                     <field-to-list field-name="productId" list-name="productsId"/>
                 </iterate>
-                <field-to-result field-name="productsList" result-name="productsList"/>
-                <field-to-result field-name="productsId" result-name="productsId"/>
+                <field-to-result field="productsList" result-name="productsList"/>
+                <field-to-result field="productsId" result-name="productsId"/>
             </if-compare>
         </else>
         </if-compare>
@@ -68,7 +68,7 @@
             <set field="productId" type="String" value="${product.productId}"/>
             <field-to-list field-name="productId" list-name="productsId"/>
         </iterate>
-        <field-to-result field-name="productsList" result-name="productsList"/>
-        <field-to-result field-name="productsId" result-name="productsId"/>
+        <field-to-result field="productsList" result-name="productsList"/>
+        <field-to-result field="productsId" result-name="productsId"/>
     </simple-method>
 </simple-methods>
\ No newline at end of file