svn commit: r730107 [4/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/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Dec 30 03:59:10 2008
@@ -29,7 +29,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductConfig"/>
-        <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"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -52,7 +52,7 @@
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductConfig" 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>
@@ -78,7 +78,7 @@
         <check-errors/>
         <make-value entity-name="ProductConfigItem" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductConfigItem" env-name="newEntity.configItemId"/>
-        <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="configItemId" map-name="newEntity"/>
     </simple-method>
@@ -90,7 +90,7 @@
         <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="deleteProductConfigItem" short-description="Delete a Config Item">
@@ -110,7 +110,7 @@
         </check-permission>
         <check-errors/>
         <make-value entity-name="ProductConfigOption" 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"/>
         <sequenced-id-to-env sequence-name="ProductConfigOption" env-name="newEntity.configOptionId"/>
         <create-value value-name="newEntity"/>
@@ -125,7 +125,7 @@
         <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="deleteProductConfigOption" short-description="Delete a Config Option">
@@ -146,7 +146,7 @@
         <check-errors/>
         <make-value entity-name="ProductConfigProduct" 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="updateProductConfigProduct" short-description="Update a ProductConfigProduct">
@@ -157,7 +157,7 @@
         <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="deleteProductConfigProduct" short-description="Delete a ProductConfigProduct">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Tue Dec 30 03:59:10 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem">
         <make-value value-field="newEntity" entity-name="ProdConfItemContent"/>
         <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="ProdConfItemContent"/>
         <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"/>
 
         <set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Dec 30 03:59:10 2008
@@ -23,7 +23,7 @@
     <!-- CostComponent services -->
     <simple-method method-name="createCostComponent" short-description="Create a CostComponent">
         <make-value value-field="newEntity" entity-name="CostComponent"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/>
         <field-to-result field-name="costComponentId" map-name="newEntity"/>
         <if-empty field="newEntity.fromDate">
@@ -33,7 +33,7 @@
     </simple-method>
     <simple-method method-name="updateCostComponent" short-description="Update a CostComponent">
         <entity-one entity-name="CostComponent" value-name="costComponent"/>
-        <set-nonpk-fields map-name="parameters" value-name="costComponent"/>
+        <set-nonpk-fields map="parameters" value-field="costComponent"/>
         <store-value value-name="costComponent"/>
     </simple-method>
     <simple-method method-name="deleteCostComponent" short-description="Delete a CostComponent">
@@ -65,7 +65,7 @@
         </iterate>
         <!-- The new cost is created -->
         <make-value value-field="newEntity" entity-name="CostComponent"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="CostComponent" env-name="newEntity.costComponentId"/>
         <if-empty field="newEntity.fromDate">
             <now-timestamp-to-env env-name="newEntity.fromDate"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 30 03:59:10 2008
@@ -25,7 +25,7 @@
         <check-errors/>
         
         <make-value entity-name="ProductFeatureCategory" value-field="newEntity"/>
-        <set-nonpk-fields value-name="newEntity" map-name="parameters"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
 
         <sequenced-id-to-env sequence-name="ProductFeatureCategory" env-name="newEntity.productFeatureCategoryId"/>
         <field-to-result field-name="newEntity.productFeatureCategoryId" result-name="productFeatureCategoryId"/>
@@ -37,7 +37,7 @@
         <check-errors/>
 
         <entity-one entity-name="ProductFeatureCategory" value-name="productFeatureCategory"/>
-        <set-nonpk-fields value-name="productFeatureCategory" map-name="parameters"/>
+        <set-nonpk-fields value-field="productFeatureCategory" map="parameters"/>
         <store-value value-name="productFeatureCategory"/>
     </simple-method>
 
@@ -46,7 +46,7 @@
         <check-errors/>
         
         <make-value value-field="newEntity" entity-name="ProductFeature"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <if-empty field="parameters.productFeatureId">
             <sequenced-id-to-env sequence-name="ProductFeature" env-name="newEntity.productFeatureId"/>
         <else>
@@ -62,7 +62,7 @@
         <check-errors/>
         
         <entity-one entity-name="ProductFeature" value-name="productFeature"/>
-        <set-nonpk-fields map-name="parameters" value-name="productFeature"/>
+        <set-nonpk-fields map="parameters" value-field="productFeature"/>
         <store-value value-name="productFeature"/>
     </simple-method>
 
@@ -77,7 +77,7 @@
         </if-empty>
         <make-value value-field="newEntity" entity-name="ProductFeatureAppl"/>
         <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="updateFeatureToProductApplication" short-description="Update Feature to Product Application">
@@ -87,7 +87,7 @@
         <check-errors/>
         
         <entity-one entity-name="ProductFeatureAppl" value-name="productFeatureAppl"/>
-        <set-nonpk-fields map-name="parameters" value-name="productFeatureAppl"/>
+        <set-nonpk-fields map="parameters" value-field="productFeatureAppl"/>
         <store-value value-name="productFeatureAppl"/>
     </simple-method>
     <simple-method method-name="removeFeatureFromProduct" short-description="Remove Feature from Product">
@@ -138,7 +138,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductFeatureCategoryAppl"/>
-        <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">
@@ -154,7 +154,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="removeProductFeatureCategoryAppl" short-description="Remove a Product Feature Category Application">
@@ -173,7 +173,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductFeatureCatGrpAppl"/>
-        <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">
@@ -189,7 +189,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="removeProductFeatureCatGrpAppl" short-description="Remove a ProductFeatureGroup to ProductCategory Application">
@@ -208,7 +208,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductFeatureGroup"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductFeatureGroup" env-name="newEntity.productFeatureGroupId"/>
         <field-to-result field-name="newEntity.productFeatureGroupId" result-name="productFeatureGroupId"/>
@@ -220,7 +220,7 @@
         <check-errors/>
 
         <entity-one entity-name="ProductFeatureGroup" value-name="productFeatureGroup"/>
-        <set-nonpk-fields map-name="parameters" value-name="productFeatureGroup"/>
+        <set-nonpk-fields map="parameters" value-field="productFeatureGroup"/>
         <store-value value-name="productFeatureGroup"/>
     </simple-method>
     <simple-method method-name="createProductFeatureGroupAppl" short-description="Create an Product Feature Group Application">
@@ -228,7 +228,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductFeatureGroupAppl"/>
-        <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">
@@ -244,7 +244,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ProductFeatureGroupAppl" map="lookupKeyValue" 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="removeProductFeatureGroupAppl" short-description="Remove a Product Feature Group Application">
@@ -263,7 +263,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="ProductFeatureIactn"/>
         <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="removeProductFeatureIactn" short-description="Remove a Product Feature Interaction">
@@ -295,7 +295,7 @@
         <check-errors/>
                 
         <make-value value-field="newEntity" entity-name="ProductFeatureType"/>
-        <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"/>
@@ -307,7 +307,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key map="lookupKeyValue" 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="removeProductFeatureType" short-description="Remove a Product Feature Type">
@@ -328,7 +328,7 @@
         <check-errors/>
         <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/>
         <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">
             <entity-condition entity-name="ProductFeatureAppl" list-name="productFeatureAppls" filter-by-date="true">
                 <condition-list combine="and">
@@ -352,7 +352,7 @@
         <check-errors/>
         <entity-one entity-name="ProductFeatureApplAttr" value-name="productFeatureApplAttr" auto-field-map="true"/>
         <check-errors/>
-        <set-nonpk-fields map-name="parameters" value-name="productFeatureApplAttr"/>
+        <set-nonpk-fields map="parameters" value-field="productFeatureApplAttr"/>
         <store-value value-name="productFeatureApplAttr"/>
         <check-errors/>
     </simple-method>
@@ -375,7 +375,7 @@
         <if-empty field="parameters.productFeatureId">
             <sequenced-id-to-env sequence-name="ProductFeaturePrice" env-name="parameters.productFeatureId"/>
         </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"/>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -395,7 +395,7 @@
     <simple-method method-name="updateFeaturePrice" short-description="Update a feature price">
         <entity-one entity-name="ProductFeaturePrice" value-name="lookedUpValue"/>
         
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml Tue Dec 30 03:59:10 2008
@@ -495,7 +495,7 @@
             <!-- create OrderItemShipGrpInvRes record -->
             <make-value entity-name="OrderItemShipGrpInvRes" value-field="newOisgirEntity"/>
             <set-pk-fields map="parameters" value-field="newOisgirEntity"/>
-            <set-nonpk-fields map-name="parameters" value-name="newOisgirEntity"/>
+            <set-nonpk-fields map="parameters" value-field="newOisgirEntity"/>
             <now-timestamp-to-env env-name="nowTimestamp"/>
             <set from-field="nowTimestamp" field="newOisgirEntity.createdDatetime"/>
             <if-empty field="newOisgirEntity.reservedDatetime">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 30 03:59:10 2008
@@ -108,7 +108,7 @@
 
         <make-value value-field="inventoryItem" entity-name="InventoryItem"/>
         <!-- TODO: make sure availableToPromiseTotal and quantityOnHandTotal are not changed -->
-        <set-nonpk-fields map-name="parameters" value-name="inventoryItem"/>
+        <set-nonpk-fields map="parameters" value-field="inventoryItem"/>
 
         <call-simple-method method-name="inventoryItemCheckSetDefaultValues"/>
         <check-errors/>
@@ -241,7 +241,7 @@
             </if-compare>
         </if-not-empty>
         <set field="oldUnitCost" from-field="lookedUpValue.unitCost"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
         <!-- if the unit cost is changed create an InventoryItemDetail to keep track of unit cost history -->
         <if-not-empty field="parameters.unitCost">
@@ -268,7 +268,7 @@
         </if-not-empty>
         
         <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/>
-        <set-nonpk-fields map-name="parameters" value-name="inventoryItemStatus"/>
+        <set-nonpk-fields map="parameters" value-field="inventoryItemStatus"/>
         <set-pk-fields map="parameters" value-field="inventoryItemStatus"/>
         <set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/>
         
@@ -289,7 +289,7 @@
         <sequenced-id-to-env sequence-name="InventoryItemDetail" env-name="newEntity.inventoryItemDetailSeqId"/>
         <field-to-result field-name="newEntity.inventoryItemDetailSeqId" result-name="inventoryItemDetailSeqId"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <!-- set the effectiveDate; if from an ItemIssuance lookup the issuedDateTime -->
         <if-not-empty field="parameters.itemIssuanceId">
@@ -489,7 +489,7 @@
 
         <make-value value-field="newEntity" entity-name="InventoryItemVariance"/>
         <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"/>
 
         <!-- TODO: (possibly a big deal?) check to see if any reserved inventory needs to be changed because of a change in availableToPromise -->
@@ -498,7 +498,7 @@
     <simple-method method-name="createPhysicalInventory" short-description="Create a PhysicalInventory">
 
         <make-value value-field="newEntity" entity-name="PhysicalInventory"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <if-empty field="newEntity.physicalInventoryDate">
             <now-timestamp-to-env env-name="newEntity.physicalInventoryDate"/>
@@ -527,7 +527,7 @@
     <simple-method method-name="createProductFacility" short-description="Create a ProductFacility">
 
         <make-value value-field="newEntity" entity-name="ProductFacility"/>
-        <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>
@@ -536,7 +536,7 @@
         <make-value entity-name="ProductFacility" value-field="lookupPKMap"/>
         <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="deleteProductFacility" short-description="Delete a ProductFacility">
@@ -551,7 +551,7 @@
     <simple-method method-name="createProductFacilityLocation" short-description="Create a ProductFacilityLocation">
 
         <make-value value-field="newEntity" entity-name="ProductFacilityLocation"/>
-        <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>
@@ -560,7 +560,7 @@
         <make-value entity-name="ProductFacilityLocation" value-field="lookupPKMap"/>
         <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="deleteProductFacilityLocation" short-description="Delete a ProductFacilityLocation">
@@ -986,7 +986,7 @@
     <simple-method method-name="createInventoryTransfer" short-description="Create an Inventory Transfer">
 
         <make-value value-field="newEntity" entity-name="InventoryTransfer"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="InventoryTransfer" env-name="newEntity.inventoryTransferId"/>
         <field-to-result field-name="newEntity.inventoryTransferId" result-name="inventoryTransferId"/>
 
@@ -1011,7 +1011,7 @@
             </if-compare-field>
         </if-not-empty>
 
-        <set-nonpk-fields map-name="parameters" value-name="inventoryTransfer"/>
+        <set-nonpk-fields map="parameters" value-field="inventoryTransfer"/>
         <store-value value-name="inventoryTransfer"/>
     </simple-method>
 
@@ -1189,12 +1189,12 @@
     <simple-method method-name="createInventoryItemLabelType" short-description="Create an InventoryItemLabelType">
         <make-value entity-name="InventoryItemLabelType" 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="updateInventoryItemLabelType" short-description="Update an InventoryItemLabelType">
         <entity-one entity-name="InventoryItemLabelType" 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="deleteInventoryItemLabelType" short-description="Delete an InventoryItemLabelType">
@@ -1204,12 +1204,12 @@
     <simple-method method-name="createInventoryItemLabel" short-description="Create an InventoryItemLabel">
         <make-value entity-name="InventoryItemLabel" 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="updateInventoryItemLabel" short-description="Update an InventoryItemLabel">
         <entity-one entity-name="InventoryItemLabel" 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="deleteInventoryItemLabel" short-description="Delete an InventoryItemLabel">
@@ -1219,14 +1219,14 @@
     <simple-method method-name="createInventoryItemLabelAppl" short-description="Create an InventoryItemLabelAppl">
         <make-value entity-name="InventoryItemLabelAppl" 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"/>
         <entity-one entity-name="InventoryItemLabel" value-name="inventoryItemLabel"/>
         <set field="newEntity.inventoryItemLabelTypeId" from-field="inventoryItemLabel.inventoryItemLabelTypeId"/>
         <create-value value-name="newEntity"/>
     </simple-method>  
     <simple-method method-name="updateInventoryItemLabelAppl" short-description="Update an InventoryItemLabel">
         <entity-one entity-name="InventoryItemLabelAppl" 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="deleteInventoryItemLabelAppl" short-description="Delete an InventoryItemLabel">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml Tue Dec 30 03:59:10 2008
@@ -28,7 +28,7 @@
         </if-empty>
         <check-errors/>
         <make-value value-field="productDimension" entity-name="ProductDimension"/>
-        <set-nonpk-fields map-name="product" value-name="productDimension"/>
+        <set-nonpk-fields map="product" value-field="productDimension"/>
 
         <get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/>
         <set field="productDimension.productType" from-field="productType.description"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Dec 30 03:59:10 2008
@@ -29,7 +29,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPrice"/>
-        <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"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -58,7 +58,7 @@
         <!-- grab the old price value before setting nonpk parameter fields -->
         <field-to-result map-name="lookedUpValue" field-name="price" result-name="oldPrice"/>
 
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />
@@ -96,7 +96,7 @@
 
         <!-- Note that this is kept pretty simple: if a price is specific but no oldPrice, then it is generally a create, if both are specified it is generally an update, if only the oldPrice is specified it is generally a delete -->
         <make-value value-field="newEntity" entity-name="ProductPriceChange"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductPriceChange" env-name="productPriceChangeId"/>
         <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" />    
@@ -116,7 +116,7 @@
         <make-value entity-name="ProductPaymentMethodType" 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>
-        <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="updateProductPaymentMethodType" short-description="update a ProductPaymentMethodType">
@@ -125,7 +125,7 @@
         <call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
         <check-errors/>
         <entity-one entity-name="ProductPaymentMethodType" 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="deleteProductPaymentMethodType" short-description="delete a ProductPaymentMethodType">
@@ -144,7 +144,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPriceRule"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductPriceRule" env-name="newEntity.productPriceRuleId"/>
         <field-to-result field-name="productPriceRuleId" map-name="newEntity"/>
 
@@ -158,7 +158,7 @@
         <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceRule" 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="deleteProductPriceRule" short-description="Delete an ProductPriceRule">
@@ -179,7 +179,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPriceCond"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/>
         <field-to-result field-name="productPriceCondSeqId" map-name="newEntity"/>
@@ -194,7 +194,7 @@
         <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceCond" 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="deleteProductPriceCond" short-description="Delete an ProductPriceCond">
@@ -215,7 +215,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPriceAction"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPriceActionSeqId" numeric-padding="2"/>
         <field-to-result field-name="productPriceActionSeqId" map-name="newEntity"/>
@@ -230,7 +230,7 @@
         <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPriceAction" 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="deleteProductPriceAction" short-description="Delete an ProductPriceAction">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Dec 30 03:59:10 2008
@@ -24,7 +24,7 @@
     <simple-method method-name="createProductContent" short-description="Create Content For Product">
         <make-value value-field="newEntity" entity-name="ProductContent"/>
         <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="ProductContent"/>
         <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"/>
 
         <set-service-fields service-name="updateContent" map-name="parameters" to-map-name="updateContent"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 30 03:59:10 2008
@@ -28,7 +28,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="Product"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <set from-field="parameters.productId" field="newEntity.productId"/>
         <if-empty field="newEntity.productId">
@@ -95,7 +95,7 @@
         <entity-one entity-name="Product" value-name="lookedUpValue"/>
         <!-- save this value before overwriting it so we can compare it later -->
         <set from-field="lookedUpValue.primaryProductCategoryId" field="saveIdMap.primaryProductCategoryId"/>
-        <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"/>
@@ -319,12 +319,12 @@
     <simple-method method-name="createProductKeyword" short-description="create a ProductKeyword">
         <make-value entity-name="ProductKeyword" 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="updateProductKeyword" short-description="update a ProductKeyword">
         <entity-one entity-name="ProductKeyword" 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="deleteProductKeyword" short-description="delete a ProductKeyword">
@@ -461,7 +461,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="GoodIdentification"/>
-        <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>
@@ -474,7 +474,7 @@
         <make-value entity-name="GoodIdentification" value-field="lookupPKMap"/>
         <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="deleteGoodIdentification" short-description="Delete an GoodIdentification">
@@ -497,7 +497,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductGlAccount"/>
-        <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>
@@ -510,7 +510,7 @@
         <make-value entity-name="ProductGlAccount" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductGlAccount" 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="deleteProductGlAccount" short-description="Delete an ProductGlAccount">
@@ -527,7 +527,7 @@
 
     <simple-method method-name="createProductReview" short-description="Create a ProductReview">
         <make-value value-field="newEntity" entity-name="ProductReview"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set from-field="userLogin.userLoginId" field="newEntity.userLoginId"/>
         <set value="PRR_PENDING" field="newEntity.statusId"/>
 
@@ -568,7 +568,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductReview"/>
         <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"/>
 
         <set from-field="lookedUpValue.productId" field="productId"/>
@@ -725,7 +725,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductAssoc"/>
-        <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"/>
@@ -739,7 +739,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductAssoc"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductAssoc" map="lookupPKMap" value-field="productAssocInstance"/>
-        <set-nonpk-fields map-name="parameters" value-name="productAssocInstance"/>
+        <set-nonpk-fields map="parameters" value-field="productAssocInstance"/>
         <store-value value-name="productAssocInstance"/>
     </simple-method>
     <simple-method method-name="deleteProductAssoc" short-description="Delete an association between two products">
@@ -762,7 +762,7 @@
         <check-errors/>
         
         <make-value value-field="newEntity" entity-name="ProductMaint"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productMaintSeqId"/> <!-- this finds the next sub-sequence ID -->
         <field-to-result field-name="newEntity.productMaintSeqId" result-name="productMaintSeqId"/>
@@ -775,7 +775,7 @@
         <check-errors/>
 
         <entity-one entity-name="ProductMaint" 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="deleteProductMaint" short-description="Delete Product Maint from PRODUCT_MAINT">
@@ -795,7 +795,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductMeter"/>
-        <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>
@@ -806,7 +806,7 @@
         <check-errors/>
 
         <entity-one entity-name="ProductMeter" 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="deleteProductMeter" short-description="Delete an existing Product Meter">
@@ -822,13 +822,13 @@
     <!-- ProductGeo Services -->
     <simple-method method-name="createProductGeo" short-description="Create an Product Geo">
         <make-value value-field="newEntity" entity-name="ProductGeo"/>
-        <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>
     <simple-method method-name="updateProductGeo" short-description="Update an existing Product Geo">
         <entity-one entity-name="ProductGeo" 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="deleteProductGeo" short-description="Delete an existing Product Geo">
@@ -908,12 +908,12 @@
     <simple-method method-name="createProductAttribute" short-description="create a ProductAttribute">
         <make-value entity-name="ProductAttribute" 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="updateProductAttribute" short-description="update a ProductAttribute">
         <entity-one entity-name="ProductAttribute" 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="deleteProductAttribute" short-description="delete a ProductAttribute">
@@ -933,7 +933,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductRole"/>
         <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"/>
@@ -950,7 +950,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductRole"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductRole" 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="removePartyFromProduct" short-description="Remove Party From Product">
@@ -985,7 +985,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/>
-        <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>
@@ -997,7 +997,7 @@
         <check-errors/>
 
         <entity-one entity-name="ProductCategoryGlAccount" 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/promo/PromoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Tue Dec 30 03:59:10 2008
@@ -27,7 +27,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromo"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductPromo" env-name="newEntity.productPromoId"/>
         <field-to-result field-name="productPromoId" map-name="newEntity"/>
 
@@ -50,7 +50,7 @@
 
         <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/>
         <find-by-primary-key entity-name="ProductPromo" map="lookupPKMap" value-field="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
 
         <if-empty field="lookedUpValue.userEntered">
             <set value="Y" set-if-empty="true" field="lookedUpValue.userEntered"/>
@@ -81,7 +81,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoAction"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPromoActionSeqId" numeric-padding="2"/>
         <field-to-result field-name="productPromoActionSeqId" map-name="newEntity"/>
@@ -96,7 +96,7 @@
         <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/>
         <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="deleteProductPromoAction" short-description="Delete an ProductPromoAction">
@@ -117,7 +117,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoCategory"/>
-        <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"/>
@@ -130,7 +130,7 @@
         <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/>
         <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="deleteProductPromoCategory" short-description="Delete an ProductPromoCategory">
@@ -151,7 +151,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoCode"/>
-        <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.productPromoCodeId">
             <sequenced-id-to-env sequence-name="ProductPromoCode" env-name="newEntity.productPromoCodeId" stagger-max="100"/>
@@ -178,7 +178,7 @@
         <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/>
         <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"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set from-field="nowTimestamp" field="newEntity.lastModifiedDate"/>
@@ -204,7 +204,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoCodeEmail"/>
-        <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"/>
@@ -227,7 +227,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoCodeParty"/>
-        <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"/>
@@ -250,7 +250,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoCond"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPromoCondSeqId" numeric-padding="2"/>
         <field-to-result field-name="productPromoCondSeqId" map-name="newEntity"/>
@@ -265,7 +265,7 @@
         <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPromoCond" 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="deleteProductPromoCond" short-description="Delete an ProductPromoCond">
@@ -286,7 +286,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoProduct"/>
-        <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"/>
@@ -299,7 +299,7 @@
         <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/>
         <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="deleteProductPromoProduct" short-description="Delete an ProductPromoProduct">
@@ -320,7 +320,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductPromoRule"/>
-        <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"/>
         <make-next-seq-id value-name="newEntity" seq-field-name="productPromoRuleId" numeric-padding="2"/>
         <field-to-result field-name="productPromoRuleId" map-name="newEntity"/>
@@ -335,7 +335,7 @@
         <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductPromoRule" 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="deleteProductPromoRule" short-description="Delete a ProductPromoRule">
@@ -357,7 +357,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductStorePromoAppl"/>
         <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"/>
@@ -374,7 +374,7 @@
         <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/>
         <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="deleteProductStorePromoAppl" short-description="Delete ProductStorePromoAppl">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Tue Dec 30 03:59:10 2008
@@ -43,7 +43,7 @@
         <set field="newValue.facilityId" from-field="parameters.facilityId" />
         <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"/>
@@ -85,7 +85,7 @@
             </else>
         </if-empty>
 
-        <set-nonpk-fields value-name="newFacilityContactMech" map-name="parameters" set-if-null="false"/>
+        <set-nonpk-fields value-field="newFacilityContactMech" map="parameters" set-if-null="false"/>
 
         <now-timestamp-to-env env-name="newFacilityContactMech.fromDate"/>
         <now-timestamp-to-env env-name="facilityContactMech.thruDate"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Tue Dec 30 03:59:10 2008
@@ -23,7 +23,7 @@
     <!-- Facility Services -->
     <simple-method method-name="createFacility" short-description="Create a Facility">
         <make-value value-field="newEntity" entity-name="Facility"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id-to-env sequence-name="Facility" env-name="facilityId"/>
         <to-string field-name="facilityId"/>
@@ -35,7 +35,7 @@
     <simple-method method-name="updateFacility" short-description="Update a Facility">
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
-        <set-nonpk-fields map-name="parameters" value-name="facility"/>
+        <set-nonpk-fields map="parameters" value-field="facility"/>
         <store-value value-name="facility"/>
     </simple-method>
     <simple-method method-name="deleteFacility" short-description="Delete a Facility">
@@ -60,7 +60,7 @@
     <!-- Facility Location Services -->
     <simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
         <make-value value-field="newEntity" entity-name="FacilityLocation"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <set field="newEntity.facilityId" from-field="parameters.facilityId" />
         
         <set field="locationSeqId" value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/>
@@ -93,7 +93,7 @@
         <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
         <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
         <find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
-        <set-nonpk-fields map-name="parameters" value-name="facilityLocation"/>
+        <set-nonpk-fields map="parameters" value-field="facilityLocation"/>
         <store-value value-name="facilityLocation"/>
     </simple-method>
     <simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location">
@@ -106,7 +106,7 @@
     <!-- Facility Group Services -->
     <simple-method method-name="createFacilityGroup" short-description="Create an Facility Group">
         <make-value value-field="newEntity" entity-name="FacilityGroup"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         
         <sequenced-id-to-env sequence-name="FacilityGroup" env-name="facilityGroupId"/>
         <to-string field-name="facilityGroupId"/>
@@ -118,7 +118,7 @@
     <simple-method method-name="updateFacilityGroup" short-description="Update an Facility Group">
         <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
         <find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
-        <set-nonpk-fields map-name="parameters" value-name="facilityGroup"/>
+        <set-nonpk-fields map="parameters" value-field="facilityGroup"/>
         <store-value value-name="facilityGroup"/>
     </simple-method>
     <simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group">
@@ -131,7 +131,7 @@
     <simple-method method-name="addFacilityToGroup" short-description="Add Facility to FacilityGroup">
         <make-value value-field="newEntity" entity-name="FacilityGroupMember"/>
         <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"/>
@@ -144,7 +144,7 @@
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupMember"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupMember" 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="removeFacilityFromGroup" short-description="Remove Facility From FacilityGroup">
@@ -158,7 +158,7 @@
     <simple-method method-name="addFacilityGroupToGroup" short-description="Add FacilityGroup to FacilityGroup">
         <make-value value-field="newEntity" entity-name="FacilityGroupRollup"/>
         <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"/>
@@ -171,7 +171,7 @@
         <make-value value-field="lookupPKMap" entity-name="FacilityGroupRollup"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="FacilityGroupRollup" 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="removeFacilityGroupFromGroup" short-description="Remove FacilityGroup From FacilityGroup">
@@ -193,7 +193,7 @@
         </if-empty>
         <make-value value-field="newEntity" entity-name="FacilityParty"/>
         <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>            
@@ -203,7 +203,7 @@
     <simple-method method-name="addPartyToFacilityGroup" short-description="Add Party to FacilityGroup">
         <make-value value-field="newEntity" entity-name="FacilityGroupRole"/>
         <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/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Dec 30 03:59:10 2008
@@ -35,7 +35,7 @@
         </if-compare>  
 
         <make-value value-field="newEntity" entity-name="ProductStore"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
 
         <sequenced-id-to-env sequence-name="ProductStore" env-name="productStoreId" />
         <set from-field="productStoreId" field="newEntity.productStoreId"/>
@@ -61,7 +61,7 @@
         <set from-field="parameters.productStoreId" field="lookupPKMap.productStoreId"/>
         <find-by-primary-key entity-name="ProductStore" map="lookupPKMap" value-field="store"/>
         <set from-field="store.inventoryFacilityId" field="oldFacilityId"/>
-        <set-nonpk-fields map-name="parameters" value-name="store"/>
+        <set-nonpk-fields map="parameters" value-field="store"/>
 
         <if-compare field="store.showPricesWithVatTax" operator="equals" value="Y">                
             <if-empty field="store.vatTaxAuthGeoId">
@@ -104,7 +104,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductStoreCatalog"/>
         <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"/>
@@ -120,7 +120,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStoreCatalog"/>
         <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="deleteProductStoreCatalog" short-description="Delete ProductStoreCatalog">
@@ -140,7 +140,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductStorePaymentSetting"/>
         <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="updateProductStorePaymentSetting" short-description="Update a Product Store Payment Setting">
@@ -150,7 +150,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
-        <set-nonpk-fields map-name="parameters" value-name="setting"/>
+        <set-nonpk-fields map="parameters" value-field="setting"/>
         <store-value value-name="setting"/>
     </simple-method>
     <simple-method method-name="deleteProductStorePaymentSetting" short-description="Delete a Product Store Payment Setting">
@@ -160,7 +160,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStorePaymentSetting"/>
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         <find-by-primary-key entity-name="ProductStorePaymentSetting" map="lookupPKMap" value-field="setting"/>
-        <set-nonpk-fields map-name="parameters" value-name="setting"/>
+        <set-nonpk-fields map="parameters" value-field="setting"/>
         <remove-value value-name="setting"/>
     </simple-method>
 
@@ -172,7 +172,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductStoreEmailSetting"/>
-        <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"/>
@@ -186,7 +186,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductStoreEmailSetting"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ProductStoreEmailSetting" map="lookupKeyValue" 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="removeProductStoreEmail" short-description="Remove Product Store Email Setting">
@@ -227,7 +227,7 @@
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="ProductStoreShipmentMeth"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map="parameters" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="ProductStoreShipmentMeth" env-name="newEntity.productStoreShipMethId"/>
 
         <create-value value-name="newEntity"/>
@@ -241,7 +241,7 @@
         <make-value value-field="lookupKeyValue" entity-name="ProductStoreShipmentMeth"/>
         <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
         <find-by-primary-key entity-name="ProductStoreShipmentMeth" map="lookupKeyValue" 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="removeProductStoreShipMeth" short-description="Remove Product Store Carrier Shipment Method">
@@ -263,7 +263,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductStoreRole"/>
         <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"/>
@@ -279,7 +279,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStoreRole"/>
         <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"/>
 
         <if-empty field="lookedUpValue.thruDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -295,7 +295,7 @@
 
         <make-value value-field="newEntity" entity-name="ProductStoreKeywordOvrd"/>
         <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"/>
@@ -314,7 +314,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStoreKeywordOvrd"/>
         <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="deleteProductStoreKeywordOvrd" short-description="Delete a ProductStoreKeywordOvrd">
@@ -336,7 +336,7 @@
         <sequenced-id-to-env sequence-name="ProductStoreSurveyAppl" env-name="productStoreSurveyId"/>
         <set from-field="productStoreSurveyId" field="newEntity.productStoreSurveyId"/>
         <field-to-result field-name="productStoreSurveyId" result-name="productStoreSurveyId"/>
-        <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"/>
@@ -352,7 +352,7 @@
         <make-value value-field="lookupPKMap" entity-name="ProductStoreSurveyAppl"/>
         <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"/>
 
         <if-empty field="lookedUpValue.thruDate">
             <now-timestamp-to-env env-name="nowTimestamp"/>
@@ -368,7 +368,7 @@
 
         <make-value value-field="finAcctSetting" entity-name="ProductStoreFinActSetting"/>
         <set-pk-fields value-field="finAcctSetting" map="parameters"/>
-        <set-nonpk-fields value-name="finAcctSetting" map-name="parameters"/>
+        <set-nonpk-fields value-field="finAcctSetting" map="parameters"/>
         <create-value value-name="finAcctSetting"/>
     </simple-method>
     <simple-method method-name="updateProductStoreFinActSetting" short-description="Update a ProductStoreFinActSetting">
@@ -379,7 +379,7 @@
         <set-pk-fields value-field="lookupPk" map="parameters"/>
         <find-by-primary-key map="lookupPk" value-field="finAccountSetting"/>
 
-        <set-nonpk-fields value-name="finAccountSetting" map-name="parameters"/>
+        <set-nonpk-fields value-field="finAccountSetting" map="parameters"/>
         <store-value value-name="finAccountSetting"/>
     </simple-method>
     <simple-method method-name="removeProductStoreFinActSetting" short-description="Remove a ProductStoreFinActSetting">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Tue Dec 30 03:59:10 2008
@@ -40,17 +40,17 @@
                 </entity-and>
                 <first-from-list entry="resource" list="resourceList"/>
                 <if-not-empty field="resource">
-                    <set-nonpk-fields value-name="newEntity" map-name="resource"/>
+                    <set-nonpk-fields value-field="newEntity" map="resource"/>
                 </if-not-empty>
             </if-not-empty>
         </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"/>
     </simple-method>  
     <simple-method method-name="updateSubscription" short-description="Update a Subscription">
         <entity-one entity-name="Subscription" 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>
     
@@ -87,12 +87,12 @@
         <make-value entity-name="SubscriptionResource" value-field="newEntity"/>
         <sequenced-id-to-env sequence-name="SubscriptionResource" env-name="newEntity.subscriptionResourceId"/>
         <field-to-result field-name="newEntity.subscriptionResourceId" result-name="subscriptionResourceId"/>
-        <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="updateSubscriptionResource" short-description="Update a SubscriptionResource">
         <entity-one entity-name="SubscriptionResource" 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>
 
@@ -100,12 +100,12 @@
         <make-value entity-name="ProductSubscriptionResource" 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>
-        <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="updateProductSubscriptionResource" short-description="Update a ProductSubscriptionResource">
         <entity-one entity-name="ProductSubscriptionResource" 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="deleteProductSubscriptionResource" short-description="Delete a ProductSubscriptionResource">
@@ -118,10 +118,10 @@
         <if-empty field="lookedUpValue">
             <make-value entity-name="SubscriptionAttribute" 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"/>
             <else>
-                <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+                <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
                 <store-value value-name="lookedUpValue"/>
             </else>
         </if-empty>
@@ -130,7 +130,7 @@
     <simple-method method-name="createSubscriptionCommEvent" short-description="Create a Subscription Communication Event">
         <make-value value-field="newEntity" entity-name="SubscriptionCommEvent"/>
         <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="removeSubscriptionCommEvent" short-description="Remove a Subscription Communication Event">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml?rev=730107&r1=730106&r2=730107&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml Tue Dec 30 03:59:10 2008
@@ -26,7 +26,7 @@
 
         <make-value value-field="newEntity" entity-name="SupplierProduct"/>
         <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>
@@ -39,7 +39,7 @@
         <set-pk-fields map="parameters" value-field="lookupPKMap"/>
         
         <find-by-primary-key entity-name="SupplierProduct" map="lookupPKMap" value-field="sprod"/>
-        <set-nonpk-fields map-name="parameters" value-name="sprod"/>
+        <set-nonpk-fields map="parameters" value-field="sprod"/>
         <store-value value-name="sprod"/>
     </simple-method>
 
@@ -61,7 +61,7 @@
 
         <make-value value-field="newEntity" entity-name="SupplierProductFeature"/>
         <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>
@@ -70,7 +70,7 @@
         <check-errors/>
 
         <entity-one entity-name="SupplierProductFeature" value-name="sprod"/>
-        <set-nonpk-fields map-name="parameters" value-name="sprod"/>
+        <set-nonpk-fields map="parameters" value-field="sprod"/>
         <store-value value-name="sprod"/>
     </simple-method>
     <simple-method method-name="removeSupplierProductFeature" short-description="Remove a Supplier Product record">