svn commit: r730107 [3/5] - 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...

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Tue Dec 30 03:59:10 2008
@@ -33,7 +33,7 @@
             </else>            
         </if-empty>
         <field-to-result field-name="newEntity.contactListId" result-name="contactListId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContactList" short-description="Update an ContactList">
@@ -41,7 +41,7 @@
         <check-errors/>
 
         <entity-one entity-name="ContactList" value-name="lookedUpValue" auto-field-map="true"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContactList" short-description="Delete an ContactList">
@@ -105,7 +105,7 @@
         
         
         <make-value entity-name="ContactListParty" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
         
@@ -139,7 +139,7 @@
                 <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
             </if-compare-field>
         </if-not-empty>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="updatePartyEmailContactListParty" short-description="Update ContactList Party Contact Mech">
@@ -174,7 +174,7 @@
         
         <make-value entity-name="ContactListPartyStatus" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <now-timestamp-to-env env-name="newEntity.statusDate"/>
         <set from-field="userLogin.userLoginId" field="newEntity.setByUserLoginId"/>

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Tue Dec 30 03:59:10 2008
@@ -31,7 +31,7 @@
         <make-value value-field="newEntity" entity-name="SegmentGroup"/>
         <sequenced-id-to-env sequence-name="SegmentGroup" env-name="newEntity.segmentGroupId"/>
         <field-to-result field-name="newEntity.segmentGroupId" result-name="segmentGroupId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -42,7 +42,7 @@
         <check-errors/>
 
         <entity-one entity-name="SegmentGroup" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteSegmentGroup" short-description="deleteSegmentGroup">
@@ -62,14 +62,14 @@
         <check-errors/>
         <make-value entity-name="SegmentGroupClassification" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updateSegmentGroupClassification" short-description="update a SegmentGroupClassification">
         <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupClassificationPermissionError"/></check-permission>
         <check-errors/>
         <entity-one entity-name="SegmentGroupClassification" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteSegmentGroupClassification" short-description="delete a SegmentGroupClassification">
@@ -85,14 +85,14 @@
         <check-errors/>
         <make-value entity-name="SegmentGroupGeo" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updateSegmentGroupGeo" short-description="update a SegmentGroupGeo">
         <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupGeoPermissionError"/></check-permission>
         <check-errors/>
         <entity-one entity-name="SegmentGroupGeo" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteSegmentGroupGeo" short-description="delete a SegmentGroupGeo">
@@ -108,7 +108,7 @@
         <check-errors/>
         <make-value entity-name="SegmentGroupRole" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updateSegmentGroupRole" short-description="update a SegmentGroupRole">

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Tue Dec 30 03:59:10 2008
@@ -28,7 +28,7 @@
         <now-timestamp-to-env env-name="nowStamp"/>
         
         <make-value value-field="newEntity" entity-name="TrackingCode"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <!-- set the history/audit info -->
@@ -48,7 +48,7 @@
         <make-value entity-name="TrackingCode" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TrackingCode" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <!-- set the history/audit info -->
         <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -73,7 +73,7 @@
         <now-timestamp-to-env env-name="nowStamp"/>
         
         <make-value value-field="newEntity" entity-name="TrackingCodeType"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <!-- set the history/audit info -->
@@ -90,7 +90,7 @@
         <make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TrackingCodeType" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <store-value value-name="lookedUpValue"/>
     </simple-method>
@@ -107,7 +107,7 @@
     <simple-method method-name="createTrackingCodeOrder" short-description="Create an TrackingCodeOrder">
         <now-timestamp-to-env env-name="nowStamp"/>
         <make-value value-field="newEntity" entity-name="TrackingCodeOrder"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <!-- set the history/audit info -->
@@ -121,7 +121,7 @@
         <make-value entity-name="TrackingCodeOrder" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TrackingCodeOrder" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <!-- set the history/audit info -->
         <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>
@@ -133,7 +133,7 @@
     <simple-method method-name="createTrackingCodeOrderReturn" short-description="Create an TrackingCodeOrderReturn">
         <now-timestamp-to-env env-name="nowStamp"/>
         <make-value value-field="newEntity" entity-name="TrackingCodeOrderReturn"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <!-- set the history/audit info -->
@@ -175,7 +175,7 @@
         <make-value entity-name="TrackingCodeOrderReturn" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="TrackingCodeOrderReturn" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <!-- set the history/audit info -->
         <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/>

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Tue Dec 30 03:59:10 2008
@@ -26,7 +26,7 @@
         <if-empty field="parameters.salesOpportunityId">
             <sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/>
         </if-empty>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/>
         <field-to-result field-name="parameters.salesOpportunityId" result-name="salesOpportunityId"/>
@@ -34,7 +34,7 @@
     </simple-method>
     <simple-method method-name="updateOpportunity" short-description="Update an opportunity">
         <entity-one entity-name="SalesOpportunity" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml Tue Dec 30 03:59:10 2008
@@ -27,7 +27,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="CommunicationEventOrder"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>    
     </simple-method>
     <simple-method method-name="removeCommunicationEventOrder" short-description="Remove a CommunicationEventOrder">

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Tue Dec 30 03:59:10 2008
@@ -31,7 +31,7 @@
         <make-value value-field="salesForecast" entity-name="SalesForecast"/>
         <sequenced-id-to-env sequence-name="SalesForecast" env-name="salesForecastId"/>
         <set field="salesForecast.salesForecastId" from-field="salesForecastId"/>
-        <set-nonpk-fields map-name="parameters" value-name="salesForecast"/>
+        <set-nonpk-fields map="parameters" value-field="salesForecast"/>
         
         <!-- set the creation info -->
         <set field="salesForecast.createdByUserLoginId" from-field="userLogin.userLoginId"/>
@@ -53,7 +53,7 @@
         <entity-one entity-name="SalesForecast" auto-field-map="true" value-name="salesForecast"/>
 
         <!-- set the fields from the parameters -->
-        <set-nonpk-fields map-name="parameters" value-name="salesForecast"/>
+        <set-nonpk-fields map="parameters" value-field="salesForecast"/>
         
         <!-- store the value -->
         <store-value value-name="salesForecast"/>
@@ -68,7 +68,7 @@
         <make-value value-field="salesForecastHistory" entity-name="SalesForecastHistory"/>
         <sequenced-id-to-env sequence-name="SalesForecastHistory" env-name="salesForecastHistoryId"/>
         <set field="salesForecastHistory.salesForecastHistoryId" from-field="salesForecastHistoryId"/>
-        <set-nonpk-fields value-name="salesForecastHistory" map-name="salesForecast"/>
+        <set-nonpk-fields value-field="salesForecastHistory" map="salesForecast"/>
 
         <!-- get the change note from the parameters -->
         <set field="salesForecastHistory.changeNote" from-field="parameters.changeNote"/>
@@ -88,12 +88,12 @@
         <sequenced-id-to-env sequence-name="SalesForecastDetail" env-name="newEntity.salesForecastDetailId"/>
         <field-to-result field-name="newEntity.salesForecastDetailId" result-name="salesForecastDetailId"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateSalesForecastDetail" short-description="Updates a sales forecast detail">
         <entity-one entity-name="SalesForecastDetail" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteSalesForecastDetail" short-description="Delete a Sales Forecast Detail">

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Tue Dec 30 03:59:10 2008
@@ -34,7 +34,7 @@
         </if-empty>
     
         <!-- only set statusId if hasScheduleAdminRelatedPermission -->
-        <set-nonpk-fields value-name="schedule" map-name="parameters"/>
+        <set-nonpk-fields value-field="schedule" map="parameters"/>
         <if-has-permission permission="ORDERMGR" action="_${checkAction}">
         <else>
             <!-- no permission, set to initial -->
@@ -58,7 +58,7 @@
 
         <!-- only set statusId if hasScheduleAdminRelatedPermission -->
         <set from-field="schedule.statusId" field="saveStatusId"/>
-        <set-nonpk-fields value-name="schedule" map-name="parameters"/>
+        <set-nonpk-fields value-field="schedule" map="parameters"/>
         <if-has-permission permission="ORDERMGR" action="_${checkAction}">
         <else>
             <!-- no permission, restore saved status -->

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Tue Dec 30 03:59:10 2008
@@ -75,7 +75,7 @@
         </if-empty>
 
         <make-value value-field="newEntity" entity-name="ReturnHeader"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <!-- If PartyAcctgPreference.useInvoiceIdForReturns is Y, get the ID from the getNextInvoiceId service -->
         <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="parameters.toPartyId"/>
@@ -246,7 +246,7 @@
         </if-compare>
 
         <field-to-result field-name="returnHeader.statusId" result-name="currentStatusId"/>
-        <set-nonpk-fields map-name="parameters" value-name="returnHeader"/>
+        <set-nonpk-fields map="parameters" value-field="returnHeader"/>
         <store-value value-name="returnHeader"/>
     </simple-method>
 
@@ -397,7 +397,7 @@
         </if-empty>
         <to-string field-name="returnItemSeqId" map-name="newEntity" numeric-padding="5"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set field="newEntity.statusId" value="RETURN_REQUESTED"/>  <!-- default status for new return items -->
         <field-to-result field-name="returnItemSeqId" map-name="newEntity" result-name="returnItemSeqId"/>
         <log level="info" message="Return Item Seq ID: ${newEntity.returnItemSeqId}"/>
@@ -438,7 +438,7 @@
         <set field="originalReturnQuantity" from-field="returnItem.returnQuantity"/>
         <field-to-result field-name="returnItem.statusId" result-name="currentStatusId"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="returnItem"/>
+        <set-nonpk-fields map="parameters" value-field="returnItem"/>
         <store-value value-name="returnItem"/>
         <refresh-value value-name="returnItem"/>
 
@@ -512,7 +512,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ReturnAdjustment"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ReturnAdjustment" env-name="newEntity.returnAdjustmentId"/>
         <field-to-result field-name="newEntity.returnAdjustmentId" result-name="returnAdjustmentId"/>
         <create-value value-name="newEntity"/>
@@ -630,7 +630,7 @@
     <simple-method method-name="createReturnItemResponse" short-description="Create a ReturnItemResponse">
         <make-value value-field="newEntity" entity-name="ReturnItemResponse"/>
         <sequenced-id-to-env sequence-name="ReturnItemResponse" env-name="newEntity.returnItemResponseId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="newEntity.returnItemResponseId" result-name="returnItemResponseId"/>
     </simple-method>
@@ -864,7 +864,7 @@
 
     <simple-method method-name="createReturnItemBilling" short-description="Create a ReturnItemBilling">
         <make-value entity-name="ReturnItemBilling" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -931,7 +931,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="ReturnItemShipment"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml Tue Dec 30 03:59:10 2008
@@ -95,7 +95,7 @@
 
         <make-value value-field="newEntity" entity-name="OrderShipment"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -107,7 +107,7 @@
         <check-errors/>
 
         <entity-one entity-name="OrderShipment" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteOrderShipment" short-description="Delete OrderShipment">
@@ -132,7 +132,7 @@
         -->
         <make-value value-field="newEntity" entity-name="OrderRequirementCommitment"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
 
@@ -532,7 +532,7 @@
         </else>
         </if-not-empty>
         <field-to-result field-name="newEntity.orderId" result-name="orderId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -548,7 +548,7 @@
             <add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
         </if-empty>
         <check-errors/>
-        <set-nonpk-fields value-name="orderHeader" map-name="parameters"/>
+        <set-nonpk-fields value-field="orderHeader" map="parameters"/>
         <store-value value-name="orderHeader"/>  
     </simple-method>
 
@@ -736,7 +736,7 @@
                parameters.put("carrierPartyId", shipmentMethod.substring(shipmentMethod.indexOf("@")+1));
             }
         ]]></call-bsh>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <set from-field="parameters.orderId" field="inputMap.orderId"/>
         <set from-field="parameters.contactMechPurposeTypeId" field="inputMap.contactMechPurposeTypeId"/>
@@ -800,7 +800,7 @@
         </check-permission>
         <check-errors/>
         <entity-one entity-name="OrderHeaderNote" value-name="orderHeaderNote"/>
-        <set-nonpk-fields value-name="orderHeaderNote" map-name="parameters"/>
+        <set-nonpk-fields value-field="orderHeaderNote" map="parameters"/>
         <store-value value-name="orderHeaderNote"/>  
     </simple-method>
         
@@ -813,7 +813,7 @@
         <make-value value-field="newEntity" entity-name="OrderTerm"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         <set value="_NA_" set-if-empty="true" field="newEntity.orderItemSeqId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <create-value value-name="newEntity"/>
     </simple-method>
@@ -824,7 +824,7 @@
         <check-errors/>
 
         <entity-one entity-name="OrderTerm" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeOrderTerm" short-description="Remove OrderTerm">
@@ -885,7 +885,7 @@
     
     <simple-method method-name="createOrderItemChange" short-description="Creates a new Order Item Change record">
         <make-value value-field="newEntity" entity-name="OrderItemChange"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="parameters.changeDatetime">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set field="newEntity.changeDatetime" from-field="nowTimestamp"/>
@@ -916,7 +916,7 @@
                 <make-value entity-name="PostalAddress" value-field="newValue"/>
                 <set-pk-fields value-field="newValue" map="shipToAddressCtx"/>
                 <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue"/>
-                <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/>
+                <set-nonpk-fields map="shipToAddressCtx" value-field="newValue"/>
                 <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
                     <call-service service-name="createPartyPostalAddress" in-map-name="shipToAddressCtx">
                         <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
@@ -962,7 +962,7 @@
                     <make-value entity-name="PostalAddress" value-field="newValue"/>
                     <set-pk-fields value-field="newValue" map="shipToAddressCtx"/>
                     <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue"/>
-                    <set-nonpk-fields map-name="shipToAddressCtx" value-name="newValue"/>
+                    <set-nonpk-fields map="shipToAddressCtx" value-field="newValue"/>
                     <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
                         <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
                             <field-map field-name="contactMechId" from-field="shipToAddressCtx.shipToContactMechId"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Tue Dec 30 03:59:10 2008
@@ -86,7 +86,7 @@
         <check-errors/>
         <!-- create new entity and create all the fields -->
         <make-value value-field="newEntity" entity-name="Quote"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.statusId">
             <set value="QUO_CREATED" field="newEntity.statusId"/>
         </if-empty>
@@ -145,7 +145,7 @@
                 <check-errors/>
             </if-empty>
         </if-compare-field>
-        <set-nonpk-fields map-name="parameters" value-name="quote"/>
+        <set-nonpk-fields map="parameters" value-field="quote"/>
         <store-value value-name="quote"/>
         <check-errors/>
     </simple-method>
@@ -284,7 +284,7 @@
         <check-errors/>
         <!-- create new entity and create all the fields -->
         <make-value value-field="newEntity" entity-name="QuoteItem"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <set from-field="parameters.quoteId" field="newEntity.quoteId"/>
         <set from-field="parameters.quoteItemSeqId" field="newEntity.quoteItemSeqId"/>
@@ -350,7 +350,7 @@
         <check-errors/>
         <entity-one entity-name="QuoteItem" value-name="quoteItem" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="quoteItem"/>
+        <set-nonpk-fields map="parameters" value-field="quoteItem"/>
         <store-value value-name="quoteItem"/>
         <check-errors/>
     </simple-method>
@@ -415,7 +415,7 @@
         <!-- create new entity and create all the fields -->
         <make-value value-field="newEntity" entity-name="QuoteAttribute"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <check-errors/>
     </simple-method>
@@ -428,7 +428,7 @@
         <check-errors/>
         <entity-one entity-name="QuoteAttribute" value-name="quoteAttribute" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="quoteAttribute"/>
+        <set-nonpk-fields map="parameters" value-field="quoteAttribute"/>
         <store-value value-name="quoteAttribute"/>
         <check-errors/>
     </simple-method>
@@ -454,7 +454,7 @@
         <!-- create new entity and create all the fields -->
         <make-value value-field="newEntity" entity-name="QuoteCoefficient"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <check-errors/>
     </simple-method>
@@ -467,7 +467,7 @@
         <check-errors/>
         <entity-one entity-name="QuoteCoefficient" value-name="quoteCoefficient" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="quoteCoefficient"/>
+        <set-nonpk-fields map="parameters" value-field="quoteCoefficient"/>
         <store-value value-name="quoteCoefficient"/>
         <check-errors/>
     </simple-method>
@@ -502,8 +502,8 @@
         <!-- create new entity and create all the fields -->
         <make-value value-field="newQuote" entity-name="Quote"/>
         <make-value value-field="newQuoteItem" entity-name="QuoteItem"/>
-        <set-nonpk-fields map-name="parameters" value-name="newQuote"/>
-        <set-nonpk-fields map-name="parameters" value-name="newQuoteItem"/>
+        <set-nonpk-fields map="parameters" value-field="newQuote"/>
+        <set-nonpk-fields map="parameters" value-field="newQuoteItem"/>
         <if-empty field="newQuote.statusId">
             <set value="QUO_CREATED" field="newQuote.statusId"/>
         </if-empty>
@@ -658,7 +658,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="QuoteAdjustment"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="QuoteAdjustment" env-name="quoteAdjustmentId"/>
         <now-timestamp-to-env env-name="newEntity.createdDate"/>
@@ -685,7 +685,7 @@
         <check-errors/>
         <entity-one entity-name="QuoteAdjustment" value-name="quoteAdjustment" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="quoteAdjustment"/>
+        <set-nonpk-fields map="parameters" value-field="quoteAdjustment"/>
         <store-value value-name="quoteAdjustment"/>
         <check-errors/>
     </simple-method>
@@ -873,7 +873,7 @@
             <check-errors/>
         </if-not-empty>
         <if-empty field="quoteWorkEffort.quoteId">
-            <set-nonpk-fields map-name="parameters" value-name="lookupMap"/>
+            <set-nonpk-fields map="parameters" value-field="lookupMap"/>
             <create-value value-name="lookupMap"/>
             <field-to-result field-name="quoteId" map-name="lookupMap"/>
             <field-to-result field-name="workEffortId" map-name="lookupMap"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Tue Dec 30 03:59:10 2008
@@ -50,7 +50,7 @@
 
     <simple-method method-name="createCustRequest" short-description="Create Customer Request">
         <make-value value-field="newEntity" entity-name="CustRequest"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
@@ -179,28 +179,28 @@
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set from-field="nowTimestamp" field="custRequest.lastModifiedDate"/>
         <set from-field="userLogin.userLoginId" field="custRequest.lastModifiedByUserLogin"/>
-        <set-nonpk-fields map-name="parameters" value-name="custRequest"/>
+        <set-nonpk-fields map="parameters" value-field="custRequest"/>
         <store-value value-name="custRequest"/>
     </simple-method>
 
     <simple-method method-name="createCustRequestAttribute" short-description="Create Customer Request Attribute">
         <make-value value-field="newEntity" entity-name="CustRequestAttribute"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateCustRequestAttribute" short-description="Update Customer Request Attribute">
         <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/>
         <set from-field="parameters.attrName" field="lookupPKMap.attrName"/>
         <find-by-primary-key entity-name="CustRequestAttribute" map="lookupPKMap" value-field="custRequestAttr"/>
-        <set-nonpk-fields map-name="parameters" value-name="custRequestAttr"/>
+        <set-nonpk-fields map="parameters" value-field="custRequestAttr"/>
         <store-value value-name="custRequestAttr"/>
     </simple-method>
 
     <simple-method method-name="createCustRequestItem" short-description="Create Customer Request Item">
         <make-value value-field="newEntity" entity-name="CustRequestItem"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="parameters.custRequestItemSeqId">
             <make-next-seq-id value-name="newEntity" seq-field-name="custRequestItemSeqId"/>
         </if-empty>
@@ -215,7 +215,7 @@
         <set from-field="parameters.custRequestId" field="lookupPKMap.custRequestId"/>
         <set from-field="parameters.custRequestItemSeqId" field="lookupPKMap.custRequestItemSeqId"/>
         <find-by-primary-key entity-name="CustRequestItem" map="lookupPKMap" value-field="custRequestItem"/>
-        <set-nonpk-fields map-name="parameters" value-name="custRequestItem"/>
+        <set-nonpk-fields map="parameters" value-field="custRequestItem"/>
         <store-value value-name="custRequestItem"/>
     </simple-method>
 
@@ -230,7 +230,7 @@
         </if-empty>
         <make-value value-field="newEntity" entity-name="CustRequestParty"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
         </if-empty>
@@ -238,7 +238,7 @@
     </simple-method>
     <simple-method method-name="updateCustRequestParty" short-description="Update an existing CustRequestParty">
         <entity-one entity-name="CustRequestParty" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteCustRequestParty" short-description="Delete Customer CustRequestParty">
@@ -260,8 +260,8 @@
     <simple-method method-name="updateCustRequestNote" short-description="Update CustRequest Note">
         <entity-one entity-name="CustRequestNote" value-name="lookedUpValue"/>
         <entity-one entity-name="NoteData" value-name="lookedUpValueForNoteData"/>
-        <set-nonpk-fields value-name="lookedUpValueForNoteData" map-name="parameters"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValueForNoteData" map="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValueForNoteData"/>
     </simple-method>
@@ -390,7 +390,7 @@
     <simple-method method-name="createCustRequestStatus" short-description="Create Customer Request Status">
         <make-value value-field="newEntity" entity-name="CustRequestStatus"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="custRequestStatusId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.statusDatetime">
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set from-field="nowTimestamp" field="newEntity.statusDatetime"/>
@@ -473,7 +473,7 @@
     <!-- Create/Delete  CustRequest Content -->    
     <simple-method method-name="createCustRequestContent" short-description="Create Work Effort Content">
         <make-value entity-name="CustRequestContent" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="newEntity.fromDate">
@@ -485,7 +485,7 @@
     </simple-method>
     <simple-method method-name="deleteCustRequestContent" short-description="Remove a Customer Request Content">
         <entity-one entity-name="CustRequestContent" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <if-empty field="lookedUpValue.thruDate">
             <now-timestamp-to-env env-name="lookedUpValue.thruDate"/>
         </if-empty>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Tue Dec 30 03:59:10 2008
@@ -25,7 +25,7 @@
         <sequenced-id-to-env sequence-name="Requirement" env-name="requirementId"/>
         <to-string field-name="requirementId"/>
         <set from-field="requirementId" field="newEntity.requirementId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="parameters.statusId">
             <set value="REQ_CREATED" field="newEntity.statusId"/>
         </if-empty>
@@ -41,7 +41,7 @@
         <find-by-primary-key entity-name="Requirement" map="lookupPKMap" value-field="lookedUpValue"/>
         <clone-value value-name="lookedUpValue" new-value-name="savedValue"/>
         <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
@@ -55,7 +55,7 @@
     <simple-method method-name="associateRequirementWithRequestItem" short-description="Associate a requirement and CustRequestItem">
         <make-value value-field="newEntity" entity-name="RequirementCustRequest"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
 
@@ -109,7 +109,7 @@
         <!-- create new entity and create all the fields -->
         <make-value value-field="newEntity" entity-name="RequirementRole"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
         </if-empty>
@@ -125,7 +125,7 @@
         <check-errors/>
         <entity-one entity-name="RequirementRole" value-name="requirementRole" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="requirementRole"/>
+        <set-nonpk-fields map="parameters" value-field="requirementRole"/>
         <store-value value-name="requirementRole"/>
         <check-errors/>
     </simple-method>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Tue Dec 30 03:59:10 2008
@@ -36,7 +36,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ShoppingList"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="newEntity.partyId">
             <set from-field="userLogin.partyId" field="newEntity.partyId"/>
@@ -77,7 +77,7 @@
         <call-simple-method method-name="checkShoppingListSecurity"/>
         <check-errors/>
 
-        <set-nonpk-fields map-name="parameters" value-name="shoppingList"/>
+        <set-nonpk-fields map="parameters" value-field="shoppingList"/>
         
         <!-- don't let auto-reorders be active unless there is some recurrence info -->
         <if>
@@ -127,7 +127,7 @@
         <set from-field="parameters.shoppingListId" field="newEntity.shoppingListId"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="shoppingListItemSeqId" numeric-padding="5"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <field-to-result field-name="newEntity.shoppingListItemSeqId" result-name="shoppingListItemSeqId"/>
         <field-to-result field-name="newEntity.shoppingListId" result-name="shoppingListId"/>
         <create-value value-name="newEntity"/>
@@ -153,7 +153,7 @@
             <call-service service-name="removeShoppingListItem" in-map-name="removeParams"/>
         <else>
           <!-- otherwise, just update shopping list item in place -->
-            <set-nonpk-fields map-name="parameters" value-name="shoppingListItem"/>
+            <set-nonpk-fields map="parameters" value-field="shoppingListItem"/>
             <store-value value-name="shoppingListItem"/>
         </else>
         </if-compare>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:59:10 2008
@@ -53,7 +53,7 @@
         </if-empty>
 
         <make-value value-field="newEntity" entity-name="CommunicationEvent"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="parameters.communicationEventId">
             <sequenced-id-to-env sequence-name="CommunicationEvent" env-name="newEntity.communicationEventId"/>
@@ -132,7 +132,7 @@
         short-description="Update a CommunicationEvent">
         <entity-one entity-name="CommunicationEvent" value-name="event" />
         <set field="oldStatusId" from-field="event.statusId" />
-        <set-nonpk-fields map-name="parameters" value-name="event" />
+        <set-nonpk-fields map="parameters" value-field="event" />
         <if-compare-field operator="not-equals" field="event.statusId"
             to-field="oldStatusId">
             <call-simple-method method-name="setCommunicationEventStatus" />
@@ -259,7 +259,7 @@
         
         <make-value value-field="newEntity" entity-name="CommunicationEventPurpose"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>        
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>        
         <create-value value-name="newEntity"/>    
     </simple-method>
     <simple-method method-name="removeCommunicationEventPurpose" short-description="Remove a CommunicationEventPurpose">
@@ -280,7 +280,7 @@
             
             <make-value value-field="newEntity" entity-name="CommunicationEventRole" />
             <set-pk-fields map="parameters" value-field="newEntity" />
-            <set-nonpk-fields map-name="parameters" value-name="newEntity" />
+            <set-nonpk-fields map="parameters" value-field="newEntity" />
             <if-empty field="newEntity.statusId">
                 <set field="newEntity.statusId" value="COM_ROLE_CREATED" />
             </if-empty>
@@ -290,7 +290,7 @@
     <simple-method method-name="updateCommunicationEventRole" short-description="Create a CommunicationEventRole">
         <entity-one value-name="eventRole" entity-name="CommunicationEventRole" />
         <if-not-empty field="eventRole">
-            <set-nonpk-fields map-name="parameters" value-name="eventRole" />
+            <set-nonpk-fields map="parameters" value-field="eventRole" />
             <store-value value-name="eventRole" />
         </if-not-empty>
     </simple-method>

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:59:10 2008
@@ -28,7 +28,7 @@
                 <set field="newValue.contactMechId" from-field="parameters.contactMechId"/>
             </else>
         </if-empty>
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-name="newValue"/>
         <field-to-result map-name="newValue" field-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>
@@ -67,7 +67,7 @@
         <if-compare-field to-field="oldValue.infoString" field="parameters.infoString" operator="not-equals">
              <log level="info" message="Contact mech need updating"/>
             <clone-value value-name="oldValue" new-value-name="newValue"/>
-            <set-nonpk-fields map-name="parameters" value-name="newValue" set-if-null="false"/>
+            <set-nonpk-fields map="parameters" value-field="newValue" set-if-null="false"/>
             <set field="context.contactMechTypeId" from-field="parameters.contactMechTypeId"/>
             <set field="context.infoString" from-field="parameters.infoString"/>
             <call-service service-name="createContactMech" in-map-name="context">
@@ -106,7 +106,7 @@
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" map-name="newValue"/>
         </call-service>
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-name="newValue"/>  
         <field-to-result map-name="newValue" field-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>            
@@ -131,7 +131,7 @@
         <make-value entity-name="PostalAddress" value-field="newValue"/>
         <set-pk-fields value-field="newValue" map="parameters"/>
         <find-by-primary-key entity-name="PostalAddress" map="newValue" value-field="oldValue" />
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
           
         <set field="context.contactMechTypeId" value="POSTAL_ADDRESS"/>
         
@@ -169,7 +169,7 @@
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
             <result-to-field result-name="contactMechId" map-name="newValue"/>
         </call-service>
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <create-value value-name="newValue"/>  
         <field-to-result map-name="newValue" field-name="contactMechId"/>
         <field-to-request map-name="newValue" field-name="contactMechId"/>            
@@ -179,7 +179,7 @@
         <make-value entity-name="TelecomNumber" value-field="newValue"/>
         <set-pk-fields value-field="newValue" map="parameters"/>
         <find-by-primary-key entity-name="TelecomNumber" map="newValue" value-field="oldValue" />
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <set field="context.contactMechTypeId" value="TELECOM_NUMBER"/>
         
         <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object">
@@ -251,12 +251,12 @@
     <simple-method method-name="createContactMechAttribute" short-description="createContactMechAttribute">
         <make-value value-field="newEntity" entity-name="ContactMechAttribute"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContactMechAttribute" short-description="updateContactMechAttribute">
         <entity-one entity-name="ContactMechAttribute" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContactMechAttribute" short-description="removeContactMechAttribute">

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:59:10 2008
@@ -63,7 +63,7 @@
         <set field="newValue.partyId" from-field="parameters.partyId"/>
         <field-to-result field-name="contactMechId" map-name="newValue"/>
         <field-to-request field-name="contactMechId" map-name="newValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <now-timestamp-to-env env-name="newValue.fromDate"/>
         <create-value value-name="newValue"/>
     </simple-method>
@@ -101,7 +101,7 @@
             </else>    
         </if-empty>
                   
-        <set-nonpk-fields value-name="newPartyContactMech" map-name="parameters"/>
+        <set-nonpk-fields value-field="newPartyContactMech" map="parameters"/>
         <now-timestamp-to-env env-name="newPartyContactMech.fromDate"/>
         <now-timestamp-to-env env-name="partyContactMech.thruDate"/>
 

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/content/PartyContentServices.xml Tue Dec 30 03:59:10 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createPartyContent" short-description="Create Party Content Entity">
         <make-value value-field="partyContent" entity-name="PartyContent"/>
         <set-pk-fields value-field="partyContent" map="parameters"/>
-        <set-nonpk-fields value-name="partyContent" map-name="parameters"/>
+        <set-nonpk-fields value-field="partyContent" map="parameters"/>
 
         <if-empty field="partyContent.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -39,7 +39,7 @@
         <set-pk-fields value-field="lookupPkMap" map="parameters"/>
 
         <find-by-primary-key map="lookupPkMap" value-field="partyContent"/>
-        <set-nonpk-fields value-name="partyContent" map-name="parameters"/>
+        <set-nonpk-fields value-field="partyContent" map="parameters"/>
         <store-value value-name="partyContent"/>      
     </simple-method>
 

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyInvitationServices.xml Tue Dec 30 03:59:10 2008
@@ -34,7 +34,7 @@
         </if-not-empty>
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set from-field="nowTimestamp" field="newEntity.lastInviteDate"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updatePartyInvitation" short-description="Update a PartyInvitation">
@@ -45,7 +45,7 @@
             </entity-one>
             <set field="parameters.toName" value="${person.firstName} ${person.middleName} ${person.lastName}"/>
         </if-not-empty>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deletePartyInvitation" short-description="Remove a PartyInvitation">

Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:59:10 2008
@@ -52,7 +52,7 @@
                 <if>
                     <condition><if-compare-field field="partyGroup.groupName" to-field="parameters.groupName" operator="not-equals"/></condition>
                     <then>
-                        <set-nonpk-fields value-name="partyNameHistory" map-name="partyGroup"/>
+                        <set-nonpk-fields value-field="partyNameHistory" map="partyGroup"/>
                         <create-value value-name="partyNameHistory"/>
                     </then>
                 </if>
@@ -80,7 +80,7 @@
                             </or>
                         </condition>
                         <then>
-                            <set-nonpk-fields value-name="partyNameHistory" map-name="person"/>
+                            <set-nonpk-fields value-field="partyNameHistory" map="person"/>
                             <create-value value-name="partyNameHistory"/>
                         </then>
                     </if>
@@ -197,13 +197,13 @@
     <simple-method method-name="createPartyClassification" short-description="create a PartyClassification">
         <make-value entity-name="PartyClassification" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>        
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updatePartyClassification" short-description="update a PartyClassification">
         <entity-one entity-name="PartyClassification" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deletePartyClassification" short-description="delete a PartyClassification">
@@ -216,13 +216,13 @@
         <make-value entity-name="PartyClassificationGroup" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="PartyClassificationGroup" env-name="newEntity.partyClassificationGroupId"/>
         <field-to-result field-name="newEntity.partyClassificationGroupId" result-name="partyClassificationGroupId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <log level="verbose" message="newEntity:${newEntity}" />
         <create-value value-name="newEntity"/>  
     </simple-method>  
     <simple-method method-name="updatePartyClassificationGroup" short-description="update a PartyClassificationGroup">
         <entity-one entity-name="PartyClassificationGroup" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deletePartyClassificationGroup" short-description="delete a PartyClassificationGroup">
@@ -234,12 +234,12 @@
     <simple-method method-name="createVendor" short-description="createVendor">
         <make-value value-field="newEntity" entity-name="Vendor"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateVendor" short-description="updateVendor">
         <entity-one entity-name="Vendor" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteVendor" short-description="deleteVendor">
@@ -251,12 +251,12 @@
     <simple-method method-name="createPartyAttribute" short-description="createPartyAttribute">
         <make-value value-field="newEntity" entity-name="PartyAttribute"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updatePartyAttribute" short-description="updatePartyAttribute">
         <entity-one entity-name="PartyAttribute" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removePartyAttribute" short-description="removePartyAttribute">
@@ -279,7 +279,7 @@
         </if-empty>
 
         <!-- update the fields -->
-        <set-nonpk-fields value-name="partyProfileDefault" map-name="parameters" set-if-null="false"/>
+        <set-nonpk-fields value-field="partyProfileDefault" map="parameters" set-if-null="false"/>
         <store-value value-name="partyProfileDefault"/>
     </simple-method>
     
@@ -740,7 +740,7 @@
         <call-object-method obj-field-name="mapKey" obj-map-name="parameters" method-name="toUpperCase" ret-field-name="mapKey" ret-map-name="parameters"/>
         <make-value entity-name="AddressMatchMap" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="deleteAddressMatchMap" short-description="remove a AddressMatchMap">
@@ -776,7 +776,7 @@
         <if-empty field="partyRels">
             <make-value value-field="newEntity" entity-name="PartyRelationship"/>
             <set-pk-fields map="parameters" value-field="newEntity"/>
-            <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newEntity"/>
             <create-value value-name="newEntity"/>
         </if-empty>
     </simple-method>
@@ -785,7 +785,7 @@
         <if-empty field="parameters.roleTypeIdTo"><set field="parameters.roleTypeIdTo" value="_NA_"/></if-empty>
         
         <entity-one entity-name="PartyRelationship" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deletePartyRelationship" short-description="deletePartyRelationship">
@@ -799,7 +799,7 @@
     <simple-method method-name="createPartyCarrierAccount" short-description="Create PartyCarrierAccount">
         <make-value entity-name="PartyCarrierAccount" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimeStamp"/>
             <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
@@ -809,7 +809,7 @@
     
      <simple-method method-name="updatePartyCarrierAccount" short-description="Update a PartyCarrierAccount">        
         <entity-one entity-name="PartyCarrierAccount" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>        
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>        
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 03:59:10 2008
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <simple-method method-name="createProdCatalog" short-description="Create an ProdCatalog">
         <make-value value-field="newEntity" entity-name="ProdCatalog"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="parameters.prodCatalogId">
             <sequenced-id-to-env sequence-name="ProdCatalog" env-name="newEntity.prodCatalogId"/>
@@ -38,7 +38,7 @@
     </simple-method>
     <simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog">
         <entity-one entity-name="ProdCatalog"  value-name="prodCatalog"/>
-        <set-nonpk-fields map-name="parameters" value-name="prodCatalog"/>
+        <set-nonpk-fields map="parameters" value-field="prodCatalog"/>
         <store-value value-name="prodCatalog"/>
     </simple-method>
     <simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog">
@@ -56,7 +56,7 @@
 
         <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -70,7 +70,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/>
-        <set-nonpk-fields map-name="parameters" value-name="prodCatalogCategory"/>
+        <set-nonpk-fields map="parameters" value-field="prodCatalogCategory"/>
         <store-value value-name="prodCatalogCategory"/>
     </simple-method>
     <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog">
@@ -85,7 +85,7 @@
     <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party">
         <make-value value-field="newEntity" entity-name="ProdCatalogRole"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -97,7 +97,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue Dec 30 03:59:10 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createCategoryContent" short-description="Create Content For Product Category">
         <make-value value-field="newEntity" entity-name="ProductCategoryContent"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -44,7 +44,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
 
         <set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 30 03:59:10 2008
@@ -34,7 +34,7 @@
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <make-value value-field="newEntity" entity-name="ProductCategory"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="parameters.productCategoryId">
             <sequenced-id-to-env sequence-name="ProductCategory" env-name="newEntity.productCategoryId"/>
@@ -84,7 +84,7 @@
         <entity-one entity-name="ProductCategory" value-name="lookedUpValue"/>
         <!-- save this value before overwriting it so we can compare it later -->
         <!-- <field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-map-name="saveIdMap"/> -->
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
 
         <!-- if setting the primaryParentCategoryId, create a rollup entity too -->
@@ -117,7 +117,7 @@
         -->
         <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -142,7 +142,7 @@
                 <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
                 <set field="newEntity.productCategoryId" from-field="category"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+                <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
                 <if-empty field="newEntity.fromDate">
                     <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -162,7 +162,7 @@
                 <make-value value-field="newEntity" entity-name="ProductCategoryMember"/>
                 <set field="newEntity.productCategoryId" from-field="parameters.categories"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+                <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
                 <if-empty field="newEntity.fromDate">
                     <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -186,7 +186,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeProductFromCategory" short-description="Remove Product From Category">
@@ -224,7 +224,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductCategoryRole"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -241,7 +241,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removePartyFromCategory" short-description="Remove Party From Category">
@@ -270,7 +270,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -291,7 +291,7 @@
                 <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
                 <set field="newEntity.parentProductCategoryId" from-field="category"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+                <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
                 <if-empty field="newEntity.fromDate">
                     <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -310,7 +310,7 @@
                 <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/>
                 <set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/>
                 <set-pk-fields map="parameters" value-field="newEntity"/>
-                <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+                <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
                 <if-empty field="newEntity.fromDate">
                     <now-timestamp-to-env env-name="newEntity.fromDate"/>
@@ -331,7 +331,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeProductCategoryFromCategory" short-description="Remove ProductCategory From Category">
@@ -632,7 +632,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
         
         <create-value value-name="newEntity"/>
@@ -647,7 +647,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/>
-        <set-nonpk-fields map-name="parameters" value-name="ProductCategoryAttributeInstance"/>
+        <set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/>
         <store-value value-name="ProductCategoryAttributeInstance"/>
     </simple-method>
     <simple-method method-name="deleteProductCategoryAttribute"
@@ -681,13 +681,13 @@
             <now-timestamp-to-env env-name="newEntity.fromDate"/>
         </if-empty>
 
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
     </simple-method>  
     
     <simple-method method-name="updateProductCategoryLink" short-description="update a ProductCategoryLink">
         <entity-one entity-name="ProductCategoryLink" value-name="lookedUpValue"/>
-        <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+        <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml Tue Dec 30 03:59:10 2008
@@ -27,7 +27,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="CommunicationEventProduct"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>    
     </simple-method>
     <simple-method method-name="removeCommunicationEventProduct" short-description="Remove a CommunicationEventProduct">