svn commit: r730107 [5/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/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Dec 30 03:59:10 2008
@@ -32,7 +32,7 @@
         <make-value value-field="newEntity" entity-name="ItemIssuance"/>
         <sequenced-id-to-env sequence-name="ItemIssuance" env-name="newEntity.itemIssuanceId"/>
         <field-to-result field-name="itemIssuanceId" map-name="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.issuedDateTime"/>
 
         <create-value value-name="newEntity"/>
@@ -56,7 +56,7 @@
         <check-errors/>
 
         <entity-one entity-name="ItemIssuance" 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="deleteItemIssuance" short-description="Delete ItemIssuance">
@@ -82,7 +82,7 @@
 
         <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/>
         <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/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Tue Dec 30 03:59:10 2008
@@ -579,7 +579,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="Picklist"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="Picklist" env-name="newEntity.picklistId"/>
         <field-to-result field-name="newEntity.picklistId" result-name="picklistId"/>
@@ -634,7 +634,7 @@
         <field-to-result field-name="lookedUpValue.statusId" result-name="oldStatusId"/>
 
         <!-- now that all changes have been checked, set the nonpks -->
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
 
         <store-value value-name="lookedUpValue"/>
@@ -659,7 +659,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="PicklistBin"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="PicklistBin" env-name="newEntity.picklistBinId"/>
         <field-to-result field-name="newEntity.picklistBinId" result-name="picklistBinId"/>
@@ -674,7 +674,7 @@
         <make-value value-field="lookupPKMap" entity-name="PicklistBin"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key 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>
@@ -699,7 +699,7 @@
 
         <make-value value-field="newEntity" entity-name="PicklistItem"/>
         <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.itemStatusId">
             <set value="PICKITEM_PENDING" field="newEntity.itemStatusId"/>
@@ -736,7 +736,7 @@
         <field-to-result field-name="lookedUpValue.itemStatusId" result-name="oldItemStatusId"/>
 
         <!-- now that all changes have been checked, set the nonpks -->
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <!-- store the changes -->
         <store-value value-name="lookedUpValue"/>
@@ -771,7 +771,7 @@
 
         <make-value value-field="newEntity" entity-name="PicklistRole"/>
         <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"/>
@@ -787,7 +787,7 @@
         <make-value value-field="lookupPKMap" entity-name="PicklistRole"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key 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>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Tue Dec 30 03:59:10 2008
@@ -25,7 +25,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ShipmentReceipt"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id-to-env sequence-name="ShipmentReceipt" env-name="receiptId"/>
         <to-string field-name="receiptId"/>
@@ -56,7 +56,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/>
         <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/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Dec 30 03:59:10 2008
@@ -28,7 +28,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="Shipment"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-not-empty field="parameters.shipmentId">
             <set-pk-fields map="parameters" value-field="newEntity"/>
@@ -238,7 +238,7 @@
         <field-to-result field-name="lookedUpValue.destinationFacilityId" result-name="oldDestinationFacilityId"/>
 
         <!-- now that all changes have been checked, set the nonpks -->
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <now-timestamp-to-env env-name="lookedUpValue.lastModifiedDate"/>
         <set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
         <field-to-result field-name="lookedUpValue.shipmentId" result-name="shipmentId"/>
@@ -788,7 +788,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentItem"/>
         <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 no shipmentItemSeqId, generate one based on existing items, ie one greater than the current higher number -->
         <make-next-seq-id value-name="newEntity" seq-field-name="shipmentItemSeqId"/>
         <field-to-result field-name="shipmentItemSeqId" map-name="newEntity" result-name="shipmentItemSeqId"/>
@@ -805,7 +805,7 @@
         <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ShipmentItem" 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="deleteShipmentItem" short-description="Delete ShipmentItem">
@@ -913,7 +913,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentPackage"/>
         <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-compare value="New" operator="equals" field="newEntity.shipmentPackageSeqId">
             <clear-field field-name="shipmentPackageSeqId" map-name="newEntity"/>
@@ -942,7 +942,7 @@
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ShipmentPackage" 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 from-field="lookedUpValue.shipmentId" field="shipmentId"/>
@@ -993,7 +993,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/>
         <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"/>
         <field-to-result field-name="shipmentPackageSeqId" map-name="newEntity" result-name="shipmentPackageSeqId"/>
@@ -1009,7 +1009,7 @@
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ShipmentPackageContent" 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="deleteShipmentPackageContent" short-description="Delete ShipmentPackageContent">
@@ -1063,7 +1063,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/>
         <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>
@@ -1076,7 +1076,7 @@
         <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ShipmentPackageRouteSeg" 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="deleteShipmentPackageRouteSeg" short-description="Delete ShipmentPackageRouteSeg">
@@ -1102,7 +1102,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentContactMech"/>
         <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>
@@ -1115,7 +1115,7 @@
         <make-value value-field="lookupPKMap" entity-name="ShipmentContactMech"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ShipmentContactMech" 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="deleteShipmentContactMech" short-description="Delete ShipmentContactMech">
@@ -1143,7 +1143,7 @@
 
         <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/>
         <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 no shipmentRouteSegmentSeqId, generate one based on existing items, ie one greater than the current higher number -->
         <make-next-seq-id value-name="newEntity" seq-field-name="shipmentRouteSegmentId"/>
@@ -1168,7 +1168,7 @@
         <check-errors/>
 
         <entity-one entity-name="ShipmentRouteSegment" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <if-empty field="newEntity.carrierServiceStatusId">
             <set value="SHRSCS_NOT_STARTED" field="newEntity.carrierServiceStatusId"/>
@@ -1267,12 +1267,12 @@
     <simple-method method-name="createCarrierShipmentMethod" short-description="Creates a CarrierShipmentMethod">
         <make-value value-field="carrierShipmentMethod" entity-name="CarrierShipmentMethod"/>
         <set-pk-fields map="parameters" value-field="carrierShipmentMethod"/>
-        <set-nonpk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
+        <set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
         <create-value value-name="carrierShipmentMethod"/>
     </simple-method>
     <simple-method method-name="updateCarrierShipmentMethod" short-description="Updates a CarrierShipmentMethod">
         <entity-one entity-name="CarrierShipmentMethod" value-name="carrierShipmentMethod"/>
-        <set-nonpk-fields map-name="parameters" value-name="carrierShipmentMethod"/>
+        <set-nonpk-fields map="parameters" value-field="carrierShipmentMethod"/>
         <store-value value-name="carrierShipmentMethod"/>
     </simple-method>
     <simple-method method-name="deleteCarrierShipmentMethod" short-description="Removes a CarrierShipmentMethod">
@@ -1283,12 +1283,12 @@
     <simple-method method-name="createShipmentMethodType" short-description="Creates a ShipmentMethodType">
         <make-value value-field="shipmentMethodType" entity-name="ShipmentMethodType"/>
         <set-pk-fields map="parameters" value-field="shipmentMethodType"/>
-        <set-nonpk-fields map-name="parameters" value-name="shipmentMethodType"/>
+        <set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
         <create-value value-name="shipmentMethodType"/>
     </simple-method>
     <simple-method method-name="updateShipmentMethodType" short-description="Updates a ShipmentMethodType">
         <entity-one entity-name="ShipmentMethodType" value-name="shipmentMethodType"/>
-        <set-nonpk-fields map-name="parameters" value-name="shipmentMethodType"/>
+        <set-nonpk-fields map="parameters" value-field="shipmentMethodType"/>
         <store-value value-name="shipmentMethodType"/>
     </simple-method>
     <simple-method method-name="deleteShipmentMethodType" short-description="Deletes a ShipmentMethodType">
@@ -2014,7 +2014,7 @@
         </check-permission>
         <check-errors/>
         <make-value value-field="quantityBreak" entity-name="QuantityBreak"/>
-        <set-nonpk-fields map-name="parameters" value-name="quantityBreak"/>
+        <set-nonpk-fields map="parameters" value-field="quantityBreak"/>
         <sequenced-id-to-env sequence-name="QuantityBreak" env-name="quantityBreak.quantityBreakId"/>
         <create-value value-name="quantityBreak"/>
         <check-errors/>
@@ -2028,7 +2028,7 @@
         <check-errors/>
         <entity-one entity-name="QuantityBreak" value-name="quantityBreak" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="quantityBreak"/>
+        <set-nonpk-fields map="parameters" value-field="quantityBreak"/>
         <store-value value-name="quantityBreak"/>
         <check-errors/>
     </simple-method>

Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Tue Dec 30 03:59:10 2008
@@ -26,7 +26,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="SecurityGroup"/>
-        <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"/>
@@ -38,7 +38,7 @@
         <make-value entity-name="SecurityGroup" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="SecurityGroup" 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>
 
@@ -48,7 +48,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="SecurityPermission"/>
-        <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"/>
@@ -60,7 +60,7 @@
         <make-value entity-name="SecurityPermission" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="SecurityPermission" 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>
 
@@ -97,7 +97,7 @@
 
         <make-value value-field="newEntity" entity-name="UserLoginSecurityGroup"/>
         <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"/>
@@ -116,7 +116,7 @@
         <make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="UserLoginSecurityGroup" 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"/>
         
         <!-- clear the org.ofbiz.security.Security object's custom cache by userLoginId -->
@@ -142,7 +142,7 @@
 
         <make-value value-field="newEntity" entity-name="ProtectedView"/>
         <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"/>
               
         <!-- clear the org.ofbiz.security.Security object's custom cache by newEntity -->
         <call-bsh><![CDATA[ org.ofbiz.security.Security.userLoginSecurityGroupByUserLoginId.remove(newEntity); ]]></call-bsh>
@@ -155,7 +155,7 @@
         <make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProtectedView" 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"/>
         
         <!-- clear the org.ofbiz.security.Security object's custom cache by lookupPKMap -->

Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 03:59:10 2008
@@ -27,7 +27,7 @@
         <sequenced-id-to-env sequence-name="Timesheet" env-name="newEntity.timesheetId"/>
         <field-to-result field-name="newEntity.timesheetId" result-name="timesheetId"/>
         
-        <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="TIMESHEET_IN_PROCESS"/>
         </if-empty>
@@ -35,7 +35,7 @@
     </simple-method>
     <simple-method method-name="updateTimesheet" short-description="Update Timesheet">
         <call-simple-method method-name="checkTimesheetStatus"/>
-        <set-nonpk-fields map-name="parameters" value-name="timesheet"/>
+        <set-nonpk-fields map="parameters" value-field="timesheet"/>
         <store-value value-name="timesheet"/>
     </simple-method>
     <simple-method method-name="updateTimesheetToInProcess" short-description="Updates the Timesheet status back to in process to be able to correct errors">
@@ -302,7 +302,7 @@
         <sequenced-id-to-env sequence-name="TimeEntry" env-name="newEntity.timeEntryId"/>
         <field-to-result field-name="newEntity.timeEntryId" result-name="timeEntryId"/>
         
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="newEntity.fromDate">
             <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field-name="newEntity.fromDate">
                 <field field-name="nowTimestamp" type="java.sql.Timestamp"/>
@@ -319,7 +319,7 @@
             <set field="lookedUpValue.invoiceItemSeqId" from-field="parameters.invoiceItemSeqId"/>
             <else>
                 <call-simple-method method-name="checkTimesheetStatus"/>
-                <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+                <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
             </else>
             </if-empty>
         </if-not-empty>

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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -41,7 +41,7 @@
             </else>
         </if-empty>
         <field-to-result field-name="newEntity.workEffortId" result-name="workEffortId"/>
-        <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.lastStatusUpdate"/>
@@ -151,7 +151,7 @@
             </then>
         </if>
         <!-- after checking status change, set all parameters -->        
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <!-- only save if something has changed -->
         <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
@@ -202,12 +202,12 @@
         <set-pk-fields map="parameters" value-field="lookupMap"/>
         <find-by-primary-key entity-name="CommunicationEventWorkEff" map="lookupMap" value-field="eventWe"/>
         <if-not-empty field="eventWe.workEffortId">
-            <set-nonpk-fields map-name="parameters" value-name="eventWe"/>
+            <set-nonpk-fields map="parameters" value-field="eventWe"/>
             <set field="eventWe.description" from-field="parameters.relationDescription"/>
             <store-value value-name="eventWe"/>
         </if-not-empty>
         <if-empty field="eventWe.workEffortId">
-            <set-nonpk-fields map-name="parameters" value-name="lookupMap"/>
+            <set-nonpk-fields map="parameters" value-field="lookupMap"/>
             <set field="eventWe.description" from-field="parameters.relationDescription"/>
             <create-value value-name="lookupMap"/>
         </if-empty>
@@ -226,7 +226,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="communicationEventWorkEff" map-name="parameters"/>
+        <set-nonpk-fields value-field="communicationEventWorkEff" map="parameters"/>
         <store-value value-name="communicationEventWorkEff"/>  
     </simple-method>
     
@@ -264,7 +264,7 @@
         <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/>
 
         <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"/>
@@ -292,7 +292,7 @@
         </if-compare-field>
          -->
         <set from-field="workEffortPartyAssignment.statusId" field="oldStatusId"/>
-        <set-nonpk-fields map-name="parameters" value-name="workEffortPartyAssignment"/>
+        <set-nonpk-fields map="parameters" value-field="workEffortPartyAssignment"/>
         
         <if-compare-field field="parameters.statusId" to-field="oldStatusId" operator="not-equals">
             <now-timestamp-to-env env-name="workEffortPartyAssignment.statusDateTime"/>
@@ -340,7 +340,7 @@
         </if-empty>  
         <log level="info" message="Creating a WorkEffortContactMech"/>
         <set from-field="parameters.workEffortId" field="newValue.workEffortId"/>
-        <set-nonpk-fields map-name="parameters" value-name="newValue"/>
+        <set-nonpk-fields map="parameters" value-field="newValue"/>
         <field-to-result field-name="contactMechId" map-name="newValue"/>
         <field-to-request field-name="contactMechId" map-name="newValue"/>        
         <create-value value-name="newValue"/>
@@ -374,7 +374,7 @@
         </if-empty>
         
         <if-compare-field to-field="newWorkEffortContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">                
-            <set-nonpk-fields value-name="newWorkEffortContactMech" map-name="parameters" set-if-null="false"/>
+            <set-nonpk-fields value-field="newWorkEffortContactMech" map="parameters" set-if-null="false"/>
             <create-value value-name="newWorkEffortContactMech"/>
             <remove-value value-name="workEffortContactMech"/>
         </if-compare-field>
@@ -583,8 +583,8 @@
     <simple-method method-name="updateWorkEffortNote" short-description="Update Work Effort Note">
         <entity-one entity-name="WorkEffortNote" 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>    
@@ -627,7 +627,7 @@
         <else>
             <make-value value-field="newEntity" entity-name="WorkEffortAssoc"/>  
             <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.sequenceNum">
                 <set field="newEntity.sequenceNum" value="0" type="Long"/>
             </if-empty>        
@@ -637,7 +637,7 @@
     </simple-method>
     <simple-method method-name="updateWorkEffortAssoc" short-description="Update a WorkEffort association">
         <entity-one entity-name="WorkEffortAssoc" 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="removeWorkEffortAssoc" short-description="Remove a WorkEffort association">
@@ -656,14 +656,14 @@
             <if-empty field="newEntity.fromDate">
                 <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"/>
         </else>
         </if-not-empty>
     </simple-method>
     <simple-method method-name="updateWorkEffortGoodStandard" short-description="Update a link between a WorkEffort and a Product">
         <entity-one entity-name="WorkEffortGoodStandard" 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="removeWorkEffortGoodStandard" short-description="Remove a link between a WorkEffort and a Product">
@@ -683,7 +683,7 @@
         <else>
             <make-value value-field="newEntity" entity-name="WorkEffortInventoryAssign"/>
             <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"/>
         </else>
         </if-not-empty>
@@ -698,7 +698,7 @@
             <add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <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="custRequestId" map-name="lookupMap"/>
     </simple-method>
@@ -720,7 +720,7 @@
             <add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <set-nonpk-fields map-name="parameters" value-name="lookupMap"/>
+        <set-nonpk-fields map="parameters" value-field="lookupMap"/>
         <create-value value-name="lookupMap"/>
     </simple-method>
     <simple-method method-name="deleteWorkEffortRequestItem" short-description="Delete a CustRequestItemWorkEffort">
@@ -754,7 +754,7 @@
             <add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <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"/>
     </simple-method>
@@ -776,7 +776,7 @@
             <add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <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="requirementId" map-name="lookupMap"/>
     </simple-method>
@@ -798,7 +798,7 @@
             <add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <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="shoppingListId" map-name="lookupMap"/>
     </simple-method>
@@ -820,7 +820,7 @@
             <add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] already exists."/></add-error>
             <check-errors/>
         </if-not-empty>
-        <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="orderId" map-name="lookupMap"/>
     </simple-method>
@@ -867,7 +867,7 @@
         <else>
             <make-value entity-name="WorkEffortFixedAssetStd" value-field="newWEFixedAssetStd" />
             <set-pk-fields map="parameters" value-field="newWEFixedAssetStd" />
-            <set-nonpk-fields map-name="parameters" value-name="newWEFixedAssetStd" />
+            <set-nonpk-fields map="parameters" value-field="newWEFixedAssetStd" />
             <create-value value-name="newWEFixedAssetStd" />            
         </else>
         </if-not-empty>
@@ -879,7 +879,7 @@
         </check-permission>
         <check-errors />
         <entity-one entity-name="WorkEffortFixedAssetStd" 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="removeWorkEffortFixedAssetStd"
@@ -905,7 +905,7 @@
         <else>
             <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newWEFixedAssetAssign" />
             <set-pk-fields map="parameters" value-field="newWEFixedAssetAssign" />
-            <set-nonpk-fields map-name="parameters" value-name="newWEFixedAssetAssign" />
+            <set-nonpk-fields map="parameters" value-field="newWEFixedAssetAssign" />
             <!-- if the user hasn't specified a fromDate, set it from the actual start date of the task
                 if there is no actual start date, default to now (to the current date and time) -->
             <if-empty field="parameters.fromDate">
@@ -929,7 +929,7 @@
         </check-permission>
         <check-errors />
         <entity-one entity-name="WorkEffortFixedAssetAssign" 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="removeWorkEffortFixedAssetAssign"
@@ -951,7 +951,7 @@
         <check-errors />
         -->
         <make-value entity-name="WorkEffortContent" 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">
@@ -969,7 +969,7 @@
         <check-errors />
         -->
         <entity-one entity-name="WorkEffortContent" 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="deleteWorkEffortContent"
@@ -996,7 +996,7 @@
             <check-errors/>
         <else>
             <make-value entity-name="WorkEffortReview" 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.reviewDate">
@@ -1013,7 +1013,7 @@
         </check-permission>
         <check-errors />
         <entity-one entity-name="WorkEffortReview" 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="deleteWorkEffortReview"
@@ -1060,7 +1060,7 @@
         </if-empty>
         <check-errors/>
         <set-pk-fields value-field="newEntity" map="parameters"></set-pk-fields>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
          </else>  
        </if-not-empty>
@@ -1192,12 +1192,12 @@
     <simple-method  method-name="createWorkEffortSkillStandard" short-description="Create WorkEffortSkillStandard">
         <make-value entity-name="WorkEffortSkillStandard" 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="updateWorkEffortSkillStandard" short-description="Update WorkEffortSkillStandard">
         <entity-one entity-name="WorkEffortSkillStandard" 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="deleteWorkEffortSkillStandard" short-description="Delete WorkEffortSkillStandard">

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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -30,7 +30,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
         <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"/>
         <call-object-method obj-field-name="newEntity.enteredKeyword" method-name="toLowerCase" ret-field-name="newEntity.enteredKeyword"/>
         <call-object-method obj-field-name="newEntity.alternateKeyword" method-name="toLowerCase" ret-field-name="newEntity.alternateKeyword"/>
         <create-value value-name="newEntity"/>
@@ -40,7 +40,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
         <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"/>
         <store-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="deleteKeywordThesaurus" short-description="Delete a KeywordThesaurus">
@@ -55,7 +55,7 @@
     <simple-method method-name="createUomConversionDated" short-description="Create a new dated UOM conversion entity">
         <make-value value-field="newEntity" entity-name="UomConversionDated"/>
         <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/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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -25,12 +25,12 @@
         <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"/>
-        <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="updateEnumeration" short-description="update a Enumeration">
         <entity-one entity-name="Enumeration" 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-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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -43,7 +43,7 @@
         <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"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
     </simple-method>
 
@@ -70,7 +70,7 @@
         <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"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>  
         <make-value entity-name="PortalPageColumn" value-field="newEntity1"/>
         <set-pk-fields map="parameters" value-field="newEntity1"/>
@@ -109,7 +109,7 @@
         <set-pk-fields map="parameters" value-field="newPortalPage"/>
         <make-next-seq-id value-name="newPortalPage" seq-field-name="portalPageId"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="newPortalPage"/>
+        <set-nonpk-fields map="parameters" value-field="newPortalPage"/>
         <create-value value-name="newPortalPage"/>  
 
         <make-value entity-name="PortalPageColumn" value-field="newPortalPageColumn"/>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceServices.xml Tue Dec 30 03:59:10 2008
@@ -23,7 +23,7 @@
     <!-- DataSource methods -->
     <simple-method method-name="createDataSource" short-description="Create an DataSource">
         <make-value value-field="newEntity" entity-name="DataSource"/>
-        <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"/>
@@ -32,7 +32,7 @@
         <make-value entity-name="DataSource" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="DataSource" 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="deleteDataSource" short-description="Delete an DataSource">

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/datasource/DataSourceTypeServices.xml Tue Dec 30 03:59:10 2008
@@ -23,7 +23,7 @@
     <!-- DataSourceType methods -->
     <simple-method method-name="createDataSourceType" short-description="Create an DataSourceType">
         <make-value value-field="newEntity" entity-name="DataSourceType"/>
-        <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>
@@ -31,7 +31,7 @@
         <make-value entity-name="DataSourceType" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="DataSourceType" 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="deleteDataSourceType" short-description="Delete an DataSourceType">

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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -26,7 +26,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="CustomTimePeriod"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id-to-env sequence-name="CustomTimePeriod" env-name="customTimePeriodId"/>
         <set from-field="customTimePeriodId" field="newEntity.customTimePeriodId"/>
@@ -41,7 +41,7 @@
         <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key 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="deleteCustomTimePeriod" short-description="Delete a CustomTimePeriod">

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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -25,7 +25,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="EntitySync"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="EntitySync" env-name="entitySyncId"/>
         <set field="newEntity.entitySyncId" from-field="entitySyncId"/>
@@ -39,7 +39,7 @@
 
         <set field="lookupPKMap.entitySyncId" from-field="parameters.entitySyncId"/>
         <find-by-primary-key entity-name="EntitySync" map="lookupPKMap" value-field="valueToStore"/>
-        <set-nonpk-fields map-name="parameters" value-name="valueToStore"/>
+        <set-nonpk-fields map="parameters" value-field="valueToStore"/>
         <store-value value-name="valueToStore"/>
     </simple-method>
     <simple-method method-name="resetEntitySyncStatusToNotStarted" short-description="Update a EntitySync, set the Status to ESR_NOT_STARTED, but ONLY if running (ie in ESR_RUNNING)">
@@ -64,7 +64,7 @@
         <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"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         
         <!-- also set the lastHistoryStartDate on the EntitySync -->
@@ -79,7 +79,7 @@
         <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key 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="deleteEntitySyncHistory" short-description="Delete EntitySyncHistory">
@@ -99,7 +99,7 @@
 
         <make-value value-field="newEntity" entity-name="EntitySyncInclude"/>
         <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="updateEntitySyncInclude" short-description="Update EntitySyncInclude">
@@ -109,7 +109,7 @@
         <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key 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="deleteEntitySyncInclude" short-description="Delete EntitySyncInclude">

Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml Tue Dec 30 03:59:10 2008
@@ -37,7 +37,7 @@
 
         <make-value entity-name="ExampleStatus" 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"/>
         <set field="newEntity.statusDate" from-field="nowTimestamp"/>
         <create-value value-name="newEntity"/>  
     </simple-method>  

Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Dec 30 03:59:10 2008
@@ -32,7 +32,7 @@
             <check-errors/>
         </if-not-empty>
         
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <create-value value-name="newEntity"/>
         <!--if-compare value="1" field-name="newEntity.confirmation" operator="equals" type="Integer">
             <set-service-fields to-map-name="oagisMessageErrorInfoMap" service-name="createOagisMessageErrorInfo" map-name="parameters"/>
@@ -42,7 +42,7 @@
         
     <simple-method method-name="updateOagisMessageInfo" short-description="Update Oagis MessageInfo">
         <entity-one entity-name="OagisMessageInfo" 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>
     
@@ -50,13 +50,13 @@
         <make-value entity-name="OagisMessageErrorInfo" value-field="newEntity"/>
         <set-pk-fields  map="parameters" value-field="newEntity" />
         <make-next-seq-id value-name="newEntity" seq-field-name="errorSeqId"/>
-        <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="updateOagisMessageErrorInfo" short-description="Update Oagis MessageErrorInfo">
         <entity-one entity-name="OagisMessageErrorInfo" 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/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=730107&r1=730106&r2=730107&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 03:59:10 2008
@@ -169,7 +169,7 @@
                         <now-date-to-env env-name="assignment.thruDate"/>
                         <clear-field field-name="parameters.statusId"/>
                     </if-compare>
-                    <set-nonpk-fields value-name="assignment" map-name="parameters"/>
+                    <set-nonpk-fields value-field="assignment" map="parameters"/>
                     <store-value value-name="assignment"/>
                     <if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="equals">
                         <call-simple-method method-name="updateTaskStatusToComplete"/>