Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryContentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryContentServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryContentServices.xml Wed Aug 23 20:44:44 2017 @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- ProductCategoryContent --> <simple-method method-name="createCategoryContent" short-description="Create Content For Product Category"> - <make-value value-field="newEntity" entity-name="ProductCategoryContent"/> + <make-value entity-name="ProductCategoryContent" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -41,7 +41,7 @@ under the License. <field-to-result field="newEntity.prodCatContentTypeId" result-name="prodCatContentTypeId"/> </simple-method> <simple-method method-name="updateCategoryContent" short-description="Update Content For Category"> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryContent"/> + <make-value entity-name="ProductCategoryContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryContent" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/category/CategoryServices.xml Wed Aug 23 20:44:44 2017 @@ -33,7 +33,7 @@ under the License. <check-errors/> <now-timestamp field="nowTimestamp"/> - <make-value value-field="newEntity" entity-name="ProductCategory"/> + <make-value entity-name="ProductCategory" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="parameters.productCategoryId"> @@ -67,7 +67,7 @@ under the License. </entity-and> <iterate list="productCategoryRoles" entry="productCategoryRole"> <!-- add this new product to the category --> - <make-value value-field="newLimitRollup" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="newLimitRollup"/> <set field="newLimitRollup.productCategoryId" from-field="newEntity.productCategoryId"/> <set field="newLimitRollup.parentProductCategoryId" from-field="productCategoryRole.productCategoryId"/> <set field="newLimitRollup.fromDate" from-field="nowTimestamp"/> @@ -145,7 +145,7 @@ under the License. <store-value value-field="product"/> </if-compare-field> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryMember"/> + <make-value entity-name="ProductCategoryMember" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryMember" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -161,7 +161,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryRole"/> + <make-value entity-name="ProductCategoryRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -177,7 +177,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> + <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -189,7 +189,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryRole"/> + <make-value entity-name="ProductCategoryRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -207,7 +207,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -227,7 +227,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/> <set field="newEntity.parentProductCategoryId" from-field="category"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -246,7 +246,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="newEntity"/> <set field="newEntity.parentProductCategoryId" from-field="parameters.categories"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -267,7 +267,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -282,7 +282,7 @@ under the License. <call-simple-method method-name="checkCategoryRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryRollup"/> + <make-value entity-name="ProductCategoryRollup" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryRollup" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -577,7 +577,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryAttribute"/> + <make-value entity-name="ProductCategoryAttribute" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -590,7 +590,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> + <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <set-nonpk-fields map="parameters" value-field="ProductCategoryAttributeInstance"/> @@ -603,7 +603,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> + <make-value entity-name="ProductCategoryAttribute" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductCategoryAttribute" map="lookupPKMap" value-field="ProductCategoryAttributeInstance"/> <remove-value value-field="ProductCategoryAttributeInstance"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/config/ProductConfigItemContentServices.xml Wed Aug 23 20:44:44 2017 @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- ProductConfigItemContent --> <simple-method method-name="createProductConfigItemContent" short-description="Create Content For ProductConfigItem"> - <make-value value-field="newEntity" entity-name="ProdConfItemContent"/> + <make-value entity-name="ProdConfItemContent" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -41,7 +41,7 @@ under the License. <field-to-result field="newEntity.confItemContentTypeId" result-name="confItemContentTypeId"/> </simple-method> <simple-method method-name="updateProductConfigItemContent" short-description="Update Content For ProductConfigItem"> - <make-value value-field="lookupPKMap" entity-name="ProdConfItemContent"/> + <make-value entity-name="ProdConfItemContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/cost/CostServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/cost/CostServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/cost/CostServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/cost/CostServices.xml Wed Aug 23 20:44:44 2017 @@ -45,7 +45,7 @@ under the License. <store-value value-field="existingCost"/> </iterate> <!-- The new cost is created --> - <make-value value-field="newEntity" entity-name="CostComponent"/> + <make-value entity-name="CostComponent" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="CostComponent" field="newEntity.costComponentId"/> <if-empty field="newEntity.fromDate"> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/feature/ProductFeatureServices.xml Wed Aug 23 20:44:44 2017 @@ -75,7 +75,7 @@ under the License. </if> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductFeatureType"/> + <make-value entity-name="ProductFeatureType" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -88,7 +88,7 @@ under the License. <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/> + <make-value entity-name="ProductFeatureApplAttr" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.fromDate"> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml Wed Aug 23 20:44:44 2017 @@ -147,7 +147,7 @@ under the License. </iterate> </if-not-empty> - <make-value value-field="lookupPKMap" entity-name="ProductContent"/> + <make-value entity-name="ProductContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/inventory/InventoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/inventory/InventoryServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/inventory/InventoryServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/inventory/InventoryServices.xml Wed Aug 23 20:44:44 2017 @@ -158,14 +158,14 @@ under the License. <field-map field-name="lotId" from-field="parameters.lotId" /> </entity-and> <if-empty field="lotList"> - <make-value value-field="lot" entity-name="Lot"/> + <make-value entity-name="Lot" value-field="lot"/> <set field="lot.lotId" from-field="parameters.lotId"/> <create-value value-field="lot"/> </if-empty> </if-not-empty> </if-compare> - <make-value value-field="inventoryItem" entity-name="InventoryItem"/> + <make-value entity-name="InventoryItem" value-field="inventoryItem"/> <!-- TODO: make sure availableToPromiseTotal and quantityOnHandTotal are not changed --> <set-nonpk-fields map="parameters" value-field="inventoryItem"/> @@ -308,7 +308,7 @@ under the License. <field-map field-name="lotId" from-field="parameters.lotId" /> </entity-and> <if-empty field="lotList"> - <make-value value-field="lot" entity-name="Lot"/> + <make-value entity-name="Lot" value-field="lot"/> <set field="lot.lotId" from-field="parameters.lotId"/> <create-value value-field="lot"/> </if-empty> @@ -339,7 +339,7 @@ under the License. <store-value value-field="oldInventoryItemStatus"/> </if-not-empty> - <make-value value-field="inventoryItemStatus" entity-name="InventoryItemStatus"/> + <make-value entity-name="InventoryItemStatus" value-field="inventoryItemStatus"/> <set-nonpk-fields map="parameters" value-field="inventoryItemStatus"/> <set-pk-fields map="parameters" value-field="inventoryItemStatus"/> <set field="inventoryItemStatus.statusDatetime" from-field="nowTimestamp"/> @@ -355,7 +355,7 @@ under the License. </simple-method> <simple-method method-name="createInventoryItemDetail" short-description="Create an InventoryItemDetail"> - <make-value value-field="newEntity" entity-name="InventoryItemDetail"/> + <make-value entity-name="InventoryItemDetail" value-field="newEntity"/> <set from-field="parameters.inventoryItemId" field="newEntity.inventoryItemId"/> <!-- NOTE DEJ20070927: not using make-next-seq-id because a single InventoryItem may see traffic from lots of threads at the same time, and make-next-seq-id doesn't do well with that <make-next-seq-id seq-field-name="inventoryItemDetailSeqId" value-field="newEntity" increment-by="1" numeric-padding="4"/> --> @@ -548,7 +548,7 @@ under the License. <simple-method method-name="createInventoryItemVariance" short-description="Create an InventoryItemVariance"> <!-- add changes to availableToPromise and quantityOnHand --> - <make-value value-field="inventoryItemLookup" entity-name="InventoryItem"/> + <make-value entity-name="InventoryItem" value-field="inventoryItemLookup"/> <set-pk-fields map="parameters" value-field="inventoryItemLookup"/> <find-by-primary-key map="inventoryItemLookup" value-field="inventoryItem"/> @@ -567,7 +567,7 @@ under the License. <set from-field="parameters.comments" field="createDetailMap.description"/> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> - <make-value value-field="newEntity" entity-name="InventoryItemVariance"/> + <make-value entity-name="InventoryItemVariance" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -900,7 +900,7 @@ under the License. <!-- Inventory Transfer Services --> <simple-method method-name="createInventoryTransfer" short-description="Create an Inventory Transfer"> - <make-value value-field="newEntity" entity-name="InventoryTransfer"/> + <make-value entity-name="InventoryTransfer" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="InventoryTransfer" field="newEntity.inventoryTransferId"/> <field-to-result field="newEntity.inventoryTransferId" result-name="inventoryTransferId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/price/PriceServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/price/PriceServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/price/PriceServices.xml Wed Aug 23 20:44:44 2017 @@ -32,7 +32,7 @@ under the License. <call-simple-method method-name="inlineHandlePriceWithTaxIncluded"/> - <make-value value-field="newEntity" entity-name="ProductPrice"/> + <make-value entity-name="ProductPrice" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -167,7 +167,7 @@ under the License. <!-- TODO NMA convert to entity auto when changed fileds are managed --> <simple-method method-name="saveProductPriceChange" short-description="Save History of ProductPrice Change"> <!-- 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"/> + <make-value entity-name="ProductPriceChange" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/> @@ -192,7 +192,7 @@ under the License. <if-not-empty field="parameters.condValueInput"> <set field="parameters.condValue" from-field="parameters.condValueInput"/> </if-not-empty> - <make-value value-field="newEntity" entity-name="ProductPriceCond"/> + <make-value entity-name="ProductPriceCond" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="productPriceCondSeqId" numeric-padding="2"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/CustomerDigitalDownloadServices.xml Wed Aug 23 20:44:44 2017 @@ -23,7 +23,7 @@ under the License. <simple-method method-name="createCustomerDigitalDownloadProduct" short-description="createCustomerDigitalDownloadProduct"> <now-timestamp field="nowTimestamp"/> - <make-value value-field="createProductMap" entity-name="Product"/> + <make-value entity-name="Product" value-field="createProductMap"/> <sequenced-id sequence-name="Product" field="createProductMap.productId"/> <set field="productId" from-field="createProductMap.productId"/> @@ -33,7 +33,7 @@ under the License. <set field="createProductMap.productTypeId" value="DIGITAL_GOOD"/> <create-value value-field="createProductMap"/> - <make-value value-field="createProductPriceMap" entity-name="ProductPrice"/> + <make-value entity-name="ProductPrice" value-field="createProductPriceMap"/> <set field="createProductPriceMap.productId" from-field="productId"/> <set field="createProductPriceMap.productPriceTypeId" value="DEFAULT_PRICE"/> <set field="createProductPriceMap.productPricePurposeId" value="PURCHASE"/> @@ -43,7 +43,7 @@ under the License. <set field="createProductPriceMap.price" from-field="parameters.price"/> <create-value value-field="createProductPriceMap"/> - <make-value value-field="createProductSupplierMap" entity-name="SupplierProduct"/> + <make-value entity-name="SupplierProduct" value-field="createProductSupplierMap"/> <set field="createProductSupplierMap.productId" from-field="productId"/> <set field="createProductSupplierMap.partyId" from-field="userLogin.partyId"/> <set field="createProductSupplierMap.currencyUomId" from-field="parameters.currencyUomId" default-value="USD"/> @@ -59,7 +59,7 @@ under the License. <!-- create association with ProductStore.digProdUploadCategoryId --> <entity-one entity-name="ProductStore" value-field="productStore"/> <if-not-empty field="productStore.digProdUploadCategoryId"> - <make-value value-field="addProductToCategoryMap" entity-name="ProductCategoryMember"/> + <make-value entity-name="ProductCategoryMember" value-field="addProductToCategoryMap"/> <set field="addProductToCategoryMap.productId" from-field="productId"/> <set field="addProductToCategoryMap.productCategoryId" from-field="productStore.digProdUploadCategoryId"/> <create-value value-field="addProductToCategoryMap"/> @@ -168,7 +168,7 @@ under the License. <check-errors/> - <make-value value-field="productContent" entity-name="ProductContent"/> + <make-value entity-name="ProductContent" value-field="productContent"/> <set field="productContent.productId" from-field="parameters.productId"/> <set field="productContent.contentId" from-field="parameters.contentId"/> <set field="productContent.productContentTypeId" value="DIGITAL_DOWNLOAD"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductContentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductContentServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductContentServices.xml Wed Aug 23 20:44:44 2017 @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- ProductContent --> <simple-method method-name="createProductContent" short-description="Create Content For Product"> - <make-value value-field="newEntity" entity-name="ProductContent"/> + <make-value entity-name="ProductContent" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -41,7 +41,7 @@ under the License. <field-to-result field="newEntity.productContentTypeId" result-name="productContentTypeId"/> </simple-method> <simple-method method-name="updateProductContent" short-description="Update Content For Product"> - <make-value value-field="lookupPKMap" entity-name="ProductContent"/> + <make-value entity-name="ProductContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -51,7 +51,7 @@ under the License. <call-service service-name="updateContent" in-map-name="updateContent"/> </simple-method> <simple-method method-name="removeProductContent" short-description="Remove Content From Product"> - <make-value value-field="lookupPKMap" entity-name="ProductContent"/> + <make-value entity-name="ProductContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/product/ProductServices.xml Wed Aug 23 20:44:44 2017 @@ -27,7 +27,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="Product"/> + <make-value entity-name="Product" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set from-field="parameters.productId" field="newEntity.productId"/> @@ -83,7 +83,7 @@ under the License. <iterate list="productCategoryRoles" entry="productCategoryRole"> <!-- add this new product to the category --> - <make-value value-field="newLimitMember" entity-name="ProductCategoryMember"/> + <make-value entity-name="ProductCategoryMember" value-field="newLimitMember"/> <set from-field="newEntity.productId" field="newLimitMember.productId"/> <set from-field="productCategoryRole.productCategoryId" field="newLimitMember.productCategoryId"/> <set from-field="nowTimestamp" field="newLimitMember.fromDate"/> @@ -426,7 +426,7 @@ under the License. <entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> <if-empty field="productCalculatedInfo"> <!-- go ahead and create it --> - <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/> + <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> <set from-field="parameters.productId" field="productCalculatedInfo.productId"/> <set from-field="parameters.weight" field="productCalculatedInfo.totalTimesViewed"/> <create-value value-field="productCalculatedInfo"/> @@ -453,7 +453,7 @@ under the License. </simple-method> <simple-method method-name="createProductReview" short-description="Create a ProductReview" login-required="false"> - <make-value value-field="newEntity" entity-name="ProductReview"/> + <make-value entity-name="ProductReview" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set from-field="userLogin.userLoginId" field="newEntity.userLoginId"/> <set value="PRR_PENDING" field="newEntity.statusId"/> @@ -492,7 +492,7 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductReview"/> + <make-value entity-name="ProductReview" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -515,7 +515,7 @@ under the License. <entity-one entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> <if-empty field="productCalculatedInfo"> <!-- go ahead and create it --> - <make-value value-field="productCalculatedInfo" entity-name="ProductCalculatedInfo"/> + <make-value entity-name="ProductCalculatedInfo" value-field="productCalculatedInfo"/> <set from-field="productId" field="productCalculatedInfo.productId"/> <set from-field="averageCustomerRating" field="productCalculatedInfo.averageCustomerRating"/> <create-value value-field="productCalculatedInfo"/> @@ -751,7 +751,7 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductRole"/> + <make-value entity-name="ProductRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -767,7 +767,7 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductRole"/> + <make-value entity-name="ProductRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -779,7 +779,7 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ProductRole"/> + <make-value entity-name="ProductRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -792,7 +792,7 @@ under the License. <call-simple-method method-name="checkProductRelatedPermission"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ProductCategoryGlAccount"/> + <make-value entity-name="ProductCategoryGlAccount" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/promo/PromoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/promo/PromoServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/promo/PromoServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/promo/PromoServices.xml Wed Aug 23 20:44:44 2017 @@ -23,7 +23,7 @@ under the License. <!-- ProductPromoCond methods --> <simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond"> - <make-value value-field="newEntity" entity-name="ProductPromoCond"/> + <make-value entity-name="ProductPromoCond" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-not-empty field="parameters.carrierShipmentMethod"> <set field="newEntity.otherValue" from-field="parameters.carrierShipmentMethod"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/FacilityContactMechServices.xml Wed Aug 23 20:44:44 2017 @@ -48,7 +48,7 @@ under the License. <!-- now create the FacilityContactMechPurpose record --> <if-not-empty field="parameters.contactMechPurposeTypeId"> - <make-value value-field="facilityContactMechPurpose" entity-name="FacilityContactMechPurpose"/> + <make-value entity-name="FacilityContactMechPurpose" value-field="facilityContactMechPurpose"/> <set-pk-fields map="newValue" value-field="facilityContactMechPurpose"/> <set field="facilityContactMechPurpose.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/> <create-value value-field="facilityContactMechPurpose"/> @@ -263,7 +263,7 @@ under the License. </simple-method> <simple-method method-name="createFacilityContactMechPurpose" short-description="Create a facility/contact mech purpose"> - <make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/> + <make-value entity-name="FacilityContactMechPurpose" value-field="lookUpMap"/> <set field="lookUpMap.facilityId" from-field="parameters.facilityId"/> <set field="lookUpMap.contactMechId" from-field="parameters.contactMechId"/> <set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/> @@ -278,7 +278,7 @@ under the License. </if-not-empty> <now-timestamp field="nowTimestamp"/> - <make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/> + <make-value entity-name="FacilityContactMechPurpose" value-field="newEntity"/> <set field="newEntity.facilityId" from-field="parameters.facilityId"/> <set field="newEntity.contactMechId" from-field="parameters.contactMechId"/> <set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/> @@ -290,7 +290,7 @@ under the License. </simple-method> <simple-method method-name="deleteFacilityContactMechPurpose" short-description="Delete a facility/contact mech purpose"> - <make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/> + <make-value entity-name="FacilityContactMechPurpose" value-field="lookUpMap"/> <set-pk-fields map="parameters" value-field="lookUpMap"/> <find-by-primary-key value-field="purposeEntity" entity-name="FacilityContactMechPurpose" map="lookUpMap"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml Wed Aug 23 20:44:44 2017 @@ -23,7 +23,7 @@ under the License. <!-- Facility Location Services --> <simple-method method-name="createFacilityLocation" short-description="Create a Facility Location"> - <make-value value-field="newEntity" entity-name="FacilityLocation"/> + <make-value entity-name="FacilityLocation" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.facilityId" from-field="parameters.facilityId"/> @@ -63,14 +63,14 @@ under the License. </simple-method> <simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup"> - <make-value value-field="lookupPKMap" entity-name="FacilityGroupRole"/> + <make-value entity-name="FacilityGroupRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteFacilityContent" short-description="Delete Content From Facility"> - <make-value value-field="lookupPKMap" entity-name="FacilityContent"/> + <make-value entity-name="FacilityContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="FacilityContent" map="lookupPKMap" value-field="lookedUpValue"/> <now-timestamp field="lookedUpValue.thruDate"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/store/ProductStoreServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/store/ProductStoreServices.xml Wed Aug 23 20:44:44 2017 @@ -49,7 +49,7 @@ under the License. <check-errors/> </if-compare> - <make-value value-field="newEntity" entity-name="ProductStore"/> + <make-value entity-name="ProductStore" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ProductStore" field="productStoreId"/> @@ -62,7 +62,7 @@ under the License. <now-timestamp field="nowTimestamp"/> <if-not-empty field="newEntity.inventoryFacilityId"> - <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> + <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/> <set from-field="newEntity.inventoryFacilityId" field="storeFacility.facilityId"/> <set from-field="newEntity.productStoreId" field="storeFacility.productStoreId"/> <set from-field="nowTimestamp" field="storeFacility.fromDate"/> @@ -119,7 +119,7 @@ under the License. </iterate> </if-compare> <!-- create the new entry --> - <make-value value-field="storeFacility" entity-name="ProductStoreFacility"/> + <make-value entity-name="ProductStoreFacility" value-field="storeFacility"/> <set from-field="store.inventoryFacilityId" field="storeFacility.facilityId"/> <set from-field="store.productStoreId" field="storeFacility.productStoreId"/> <set from-field="nowTimestamp" field="storeFacility.fromDate"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/issuance/IssuanceServices.xml Wed Aug 23 20:44:44 2017 @@ -26,7 +26,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ItemIssuance"/> + <make-value entity-name="ItemIssuance" value-field="newEntity"/> <sequenced-id sequence-name="ItemIssuance" field="newEntity.itemIssuanceId"/> <field-to-result field="newEntity.itemIssuanceId" result-name="itemIssuanceId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -87,7 +87,7 @@ under the License. <set value="Create ItemIssuanceRole" field="operationName"/> <call-simple-method method-name="checkCanChangeShipmentStatusPacked" xml-resource="component://product/minilang/shipment/shipment/ShipmentServices.xml"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ItemIssuanceRole"/> + <make-value entity-name="ItemIssuanceRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/picklist/PicklistServices.xml Wed Aug 23 20:44:44 2017 @@ -763,7 +763,7 @@ under the License. <!-- Picklist --> <simple-method method-name="createPicklist" short-description="Create Picklist"> - <make-value value-field="newEntity" entity-name="Picklist"/> + <make-value entity-name="Picklist" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="Picklist" field="newEntity.picklistId"/> @@ -783,7 +783,7 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updatePicklist" short-description="Update Picklist"> - <make-value value-field="lookupPKMap" entity-name="Picklist"/> + <make-value entity-name="Picklist" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> @@ -822,7 +822,7 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklist" short-description="Delete Picklist"> - <make-value value-field="lookupPKMap" entity-name="Picklist"/> + <make-value entity-name="Picklist" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -830,7 +830,7 @@ under the License. <!-- PicklistBin --> <simple-method method-name="createPicklistBin" short-description="Create PicklistBin"> - <make-value value-field="newEntity" entity-name="PicklistBin"/> + <make-value entity-name="PicklistBin" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="PicklistBin" field="newEntity.picklistBinId"/> @@ -839,7 +839,7 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deletePicklistBin" short-description="Delete PicklistBin"> - <make-value value-field="lookupPKMap" entity-name="PicklistBin"/> + <make-value entity-name="PicklistBin" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -847,7 +847,7 @@ under the License. <!-- PicklistItem --> <simple-method method-name="createPicklistItem" short-description="Create PicklistItem"> - <make-value value-field="newEntity" entity-name="PicklistItem"/> + <make-value entity-name="PicklistItem" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -858,7 +858,7 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updatePicklistItem" short-description="Update PicklistItem"> - <make-value value-field="lookupPKMap" entity-name="PicklistItem"/> + <make-value entity-name="PicklistItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> @@ -888,7 +888,7 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deletePicklistItem" short-description="Delete PicklistItem"> - <make-value value-field="lookupPKMap" entity-name="PicklistItem"/> + <make-value entity-name="PicklistItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -900,7 +900,7 @@ under the License. --> <simple-method method-name="editPicklistItem" short-description="Edit a Picklist Item"> - <make-value value-field="lookupPKMap" entity-name="PicklistItem"/> + <make-value entity-name="PicklistItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="picklistItem"/> @@ -1102,7 +1102,7 @@ under the License. <!-- PicklistRole --> <simple-method method-name="createPicklistRole" short-description="Create PicklistRole"> - <make-value value-field="newEntity" entity-name="PicklistRole"/> + <make-value entity-name="PicklistRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1113,7 +1113,7 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deletePicklistRole" short-description="Delete PicklistRole"> - <make-value value-field="lookupPKMap" entity-name="PicklistRole"/> + <make-value entity-name="PicklistRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -1192,7 +1192,7 @@ under the License. A Map with a List of PicklistItemInfo records keyed by the productId --> <if-not-empty field="picklistItemInfo.inventoryItemAndLocation.locationSeqId"> - <make-value value-field="facilityLocation" entity-name="FacilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/> + <make-value entity-name="FacilityLocation" value-field="facilityLocation" map="picklistItemInfo.inventoryItemAndLocation"/> <set from-field="facilityLocation" field="facilityLocationByLocationSeqIdMap[facilityLocation.locationSeqId]"/> <clear-field field="picklistItemInfoTempList"/> @@ -1550,12 +1550,12 @@ under the License. <!-- special method to check update the picklist status from the item status --> <simple-method method-name="checkPicklistBinItemStatuses" short-description="Checks the item status and updates the pick list status"> <!-- find the picklist bin --> - <make-value value-field="binLookup" entity-name="PicklistBin"/> + <make-value entity-name="PicklistBin" value-field="binLookup"/> <set-pk-fields map="parameters" value-field="binLookup"/> <find-by-primary-key map="binLookup" value-field="picklistBin"/> <!-- find the pick list --> - <make-value value-field="plLookup" entity-name="Picklist"/> + <make-value entity-name="Picklist" value-field="plLookup"/> <set-pk-fields map="picklistBin" value-field="plLookup"/> <find-by-primary-key map="plLookup" value-field="picklist"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml Wed Aug 23 20:44:44 2017 @@ -21,7 +21,7 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createShipmentReceipt" short-description="Create a ShipmentReceipt"> - <make-value value-field="newEntity" entity-name="ShipmentReceipt"/> + <make-value entity-name="ShipmentReceipt" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="ShipmentReceipt" field="receiptId"/> @@ -64,7 +64,7 @@ under the License. </simple-method> <simple-method method-name="createShipmentReceiptRole" short-description="Create a ShipmentReceipt Role"> - <make-value value-field="newEntity" entity-name="ShipmentReceiptRole"/> + <make-value entity-name="ShipmentReceiptRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -72,7 +72,7 @@ under the License. </simple-method> <simple-method method-name="removeShipmentReceiptRole" short-description="Remove a ShipmentReceipt Role"> - <make-value value-field="lookupPKMap" entity-name="ShipmentReceiptRole"/> + <make-value entity-name="ShipmentReceiptRole" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentReceiptRole" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/shipment/shipment/ShipmentServices.xml Wed Aug 23 20:44:44 2017 @@ -22,7 +22,7 @@ under the License. xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <!-- Shipment services --> <simple-method method-name="createShipment" short-description="Create Shipment"> - <make-value value-field="newEntity" entity-name="Shipment"/> + <make-value entity-name="Shipment" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-not-empty field="parameters.shipmentId"> @@ -116,7 +116,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusDelivered"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="Shipment"/> + <make-value entity-name="Shipment" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> @@ -822,7 +822,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ShipmentItem"/> + <make-value entity-name="ShipmentItem" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="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 --> @@ -835,7 +835,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/> + <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -857,7 +857,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value value-field="lookupPKMap" entity-name="ShipmentItem"/> + <make-value entity-name="ShipmentItem" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentItem" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -950,7 +950,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ShipmentPackage"/> + <make-value entity-name="ShipmentPackage" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -975,7 +975,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusShipped"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ShipmentPackage"/> + <make-value entity-name="ShipmentPackage" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackage" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -1034,7 +1034,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/> + <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1046,7 +1046,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/> + <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -1057,7 +1057,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ShipmentPackageContent"/> + <make-value entity-name="ShipmentPackageContent" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackageContent" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -1066,7 +1066,7 @@ under the License. <set value="Create ShipmentPackageContent" field="operationName"/> <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ShipmentPackageContent"/> + <make-value entity-name="ShipmentPackageContent" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <find-by-primary-key value-field="shipmentPackageContent" map="newEntity"/> <log level="verbose" message="In addShipmentContentToPackage trying values: ${newEntity}"/> @@ -1091,7 +1091,7 @@ under the License. <!-- ShipmentPackageRouteSeg services --> <simple-method method-name="createShipmentPackageRouteSeg" short-description="Create ShipmentPackageRouteSeg"> - <make-value value-field="newEntity" entity-name="ShipmentPackageRouteSeg"/> + <make-value entity-name="ShipmentPackageRouteSeg" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1102,7 +1102,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="ShipmentPackageRouteSeg"/> + <make-value entity-name="ShipmentPackageRouteSeg" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ShipmentPackageRouteSeg" map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -1114,7 +1114,7 @@ under the License. <call-simple-method method-name="checkCanChangeShipmentStatusPacked"/> <check-errors/> - <make-value value-field="newEntity" entity-name="ShipmentRouteSegment"/> + <make-value entity-name="ShipmentRouteSegment" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -1988,7 +1988,7 @@ under the License. <!-- QuantityBreak services --> <!-- create a new QuantityBreak --> <simple-method method-name="createQuantityBreak" short-description="Create a QuoteAttribute"> - <make-value value-field="quantityBreak" entity-name="QuantityBreak"/> + <make-value entity-name="QuantityBreak" value-field="quantityBreak"/> <set-nonpk-fields map="parameters" value-field="quantityBreak"/> <sequenced-id sequence-name="QuantityBreak" field="quantityBreak.quantityBreakId"/> <create-value value-field="quantityBreak"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/timesheet/TimesheetServices.xml Wed Aug 23 20:44:44 2017 @@ -23,7 +23,7 @@ under the License. <!-- Timesheet Services --> <simple-method method-name="createTimesheet" short-description="Create Timesheet"> - <make-value value-field="newEntity" entity-name="Timesheet"/> + <make-value entity-name="Timesheet" value-field="newEntity"/> <sequenced-id sequence-name="Timesheet" field="newEntity.timesheetId"/> <field-to-result field="newEntity.timesheetId" result-name="timesheetId"/> @@ -300,7 +300,7 @@ under the License. <set field="ensurePartyRoleCtx.partyId" from-field="parameters.partyId"/> <set field="ensurePartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="ensurePartyRole" in-map-name="ensurePartyRoleCtx"/> - <make-value value-field="newEntity" entity-name="TimesheetRole"/> + <make-value entity-name="TimesheetRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> @@ -314,7 +314,7 @@ under the License. <call-simple-method method-name="checkTimesheetStatus"/> <now-timestamp field="nowTimestamp"/> - <make-value value-field="newEntity" entity-name="TimeEntry"/> + <make-value entity-name="TimeEntry" value-field="newEntity"/> <sequenced-id sequence-name="TimeEntry" field="newEntity.timeEntryId"/> <field-to-result field="newEntity.timeEntryId" result-name="timeEntryId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Wed Aug 23 20:44:44 2017 @@ -27,7 +27,7 @@ under the License. <result-to-field result-name="workEffortId"/> </call-service> <check-errors /> - <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/> + <make-value entity-name="WorkEffortPartyAssignment" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set field="newEntity.workEffortId" from-field="workEffortId"/> @@ -40,7 +40,7 @@ under the License. </simple-method> <simple-method method-name="createWorkEffort" short-description="Create Work Effort"> - <make-value value-field="newEntity" entity-name="WorkEffort"/> + <make-value entity-name="WorkEffort" value-field="newEntity"/> <if-empty field="parameters.workEffortId"> <sequenced-id sequence-name="WorkEffort" field="newEntity.workEffortId"/> <else> @@ -62,7 +62,7 @@ under the License. <create-value value-field="newEntity"/> <!-- create new status entry, and set lastStatusUpdate date --> - <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/> + <make-value entity-name="WorkEffortStatus" value-field="newWorkEffortStatus"/> <set from-field="newEntity.workEffortId" field="newWorkEffortStatus.workEffortId"/> <set from-field="newEntity.currentStatusId" field="newWorkEffortStatus.statusId"/> <set from-field="nowTimestamp" field="newWorkEffortStatus.statusDatetime"/> @@ -71,7 +71,7 @@ under the License. <!-- Attach the workeffort to a requirement if passed --> <if-not-empty field="parameters.requirementId"> - <make-value value-field="workFullfillment" entity-name="WorkRequirementFulfillment"/> + <make-value entity-name="WorkRequirementFulfillment" value-field="workFullfillment"/> <set from-field="newEntity.workEffortId" field="workFullfillment.workEffortId"/> <set from-field="parameters.requirementId" field="workFullfillment.requirementId"/> <create-value value-field="workFullfillment"/> @@ -90,7 +90,7 @@ under the License. <check-errors/> </if-compare-field> <!-- create customer request / work effort relation --> - <make-value value-field="custRequestWorkEffort" entity-name="CustRequestWorkEffort"/> + <make-value entity-name="CustRequestWorkEffort" value-field="custRequestWorkEffort"/> <set field="custRequestWorkEffort.workEffortId" from-field="newEntity.workEffortId"/> <set field="custRequestWorkEffort.custRequestId" from-field="parameters.custRequestId"/> <create-value value-field="custRequestWorkEffort"/> @@ -157,7 +157,7 @@ under the License. </if-not-empty> <set from-field="nowTimestamp" field="lookedUpValue.lastStatusUpdate"/> - <make-value value-field="newWorkEffortStatus" entity-name="WorkEffortStatus"/> + <make-value entity-name="WorkEffortStatus" value-field="newWorkEffortStatus"/> <set from-field="lookedUpValue.workEffortId" field="newWorkEffortStatus.workEffortId"/> <set from-field="parameters.currentStatusId" field="newWorkEffortStatus.statusId"/> <set from-field="parameters.reason" field="newWorkEffortStatus.reason"/> @@ -267,7 +267,7 @@ under the License. <iterate list="relationValues" entry="relatedValue"> <clone-value value-field="relatedValue" new-value-field="newRelatedValue" /> <set field="newRelatedValue[relatedIdFieldName]" from-field="targetWorkEffortId" /> - <make-value value-field="newRelatedPks" entity-name="${relatedEntityName}" /> + <make-value entity-name="${relatedEntityName}" value-field="newRelatedPks" /> <set-pk-fields value-field="newRelatedPks" map="newRelatedValue" /> <find-by-primary-key entity-name="${relatedEntityName}" map="newRelatedPks" value-field="duplicateCheck" /> <if-empty field="duplicateCheck"> @@ -349,7 +349,7 @@ under the License. <set field="ensurePartyRoleCtx.partyId" from-field="parameters.partyId"/> <set field="ensurePartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="ensurePartyRole" in-map-name="ensurePartyRoleCtx"/> - <make-value value-field="newEntity" entity-name="WorkEffortPartyAssignment"/> + <make-value entity-name="WorkEffortPartyAssignment" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -399,7 +399,7 @@ under the License. <!-- Create a WorkEffortContactMech --> <simple-method method-name="createWorkEffortContactMech" short-description="Create a WorkEffortContactMech"> - <make-value value-field="newValue" entity-name="WorkEffortContactMech"/> + <make-value entity-name="WorkEffortContactMech" value-field="newValue"/> <if-empty field="parameters.contactMechId"> <if-empty field="parameters.contactMechTypeId"> <add-error> @@ -610,13 +610,13 @@ under the License. <if-not-empty field="parameters.quickAssignPartyId"> <now-timestamp field="nowTimestamp"/> <!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... --> - <make-value value-field="newPartyRole" entity-name="PartyRole"/> + <make-value entity-name="PartyRole" value-field="newPartyRole"/> <set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/> <set value="CAL_OWNER" field="newPartyRole.roleTypeId"/> <field-to-list field="newPartyRole" list="newPartyRoleList"/> <store-list list="newPartyRoleList"/> - <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/> + <make-value entity-name="WorkEffortPartyAssignment" value-field="newWorkEffortPartyAssignment"/> <set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/> <set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/> <set value="CAL_OWNER" field="newWorkEffortPartyAssignment.roleTypeId"/> @@ -628,13 +628,13 @@ under the License. <simple-method method-name="quickAssignPartyToWorkEffortWithRole" short-description="Quick Assign Party To WorkEffort"> <if-not-empty field="parameters.quickAssignPartyId"> <!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... --> - <make-value value-field="newPartyRole" entity-name="PartyRole"/> + <make-value entity-name="PartyRole" value-field="newPartyRole"/> <set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/> <set from-field="parameters.roleTypeId" field="newPartyRole.roleTypeId"/> <set field="newPartyRoleList[]" from-field="newPartyRole"/> <store-list list="newPartyRoleList"/> - <make-value value-field="newWorkEffortPartyAssignment" entity-name="WorkEffortPartyAssignment"/> + <make-value entity-name="WorkEffortPartyAssignment" value-field="newWorkEffortPartyAssignment"/> <set from-field="parameters.workEffortId" field="newWorkEffortPartyAssignment.workEffortId"/> <set from-field="parameters.quickAssignPartyId" field="newWorkEffortPartyAssignment.partyId"/> <set from-field="parameters.roleTypeId" field="newWorkEffortPartyAssignment.roleTypeId"/> @@ -644,7 +644,7 @@ under the License. </if-not-empty> </simple-method> <simple-method method-name="createWorkEffortNote" short-description="Create Work Effort Note"> - <make-value value-field="newEntity" entity-name="NoteData"/> + <make-value entity-name="NoteData" value-field="newEntity"/> <sequenced-id sequence-name="NoteData" field="newEntity.noteId"/> <field-to-result field="newEntity.noteId" result-name="noteId"/> <set from-field="parameters.noteInfo" field="newEntity.noteInfo"/> @@ -659,7 +659,7 @@ under the License. <create-value value-field="newEntity"/> <!-- create new status entry, and set lastStatusUpdate date --> - <make-value value-field="newWorkEffortNote" entity-name="WorkEffortNote"/> + <make-value entity-name="WorkEffortNote" value-field="newWorkEffortNote"/> <set from-field="newEntity.noteId" field="newWorkEffortNote.noteId"/> <set from-field="parameters.workEffortId" field="newWorkEffortNote.workEffortId"/> <set from-field="parameters.internalNote" field="newWorkEffortNote.internalNote"/> @@ -714,7 +714,7 @@ under the License. </add-error> <check-errors/> <else> - <make-value value-field="newEntity" entity-name="WorkEffortAssoc"/> + <make-value entity-name="WorkEffortAssoc" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <if-empty field="newEntity.sequenceNum"> @@ -765,7 +765,7 @@ under the License. </calculate> <store-value value-field="foundEntity"/> <else> - <make-value value-field="newEntity" entity-name="WorkEffortInventoryAssign"/> + <make-value entity-name="WorkEffortInventoryAssign" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -797,7 +797,7 @@ under the License. <iterate list="existingAssignments" entry="existingAssignment"> <remove-value value-field="existingAssignment"/> </iterate> - <make-value value-field="newEntity" entity-name="WorkEffortFixedAssetAssign"/> + <make-value entity-name="WorkEffortFixedAssetAssign" value-field="newEntity"/> <set from-field="workEffort.workEffortId" field="newEntity.workEffortId"/> <set from-field="workEffort.fixedAssetId" field="newEntity.fixedAssetId"/> <set from-field="workEffort.currentStatusId" field="newEntity.statusId"/> @@ -914,7 +914,7 @@ under the License. <fail-property resource="WorkEffortUiLabels" property="WorkEffortKeywordAlreadyExist"/> </add-error> <else> - <make-value value-field="newEntity" entity-name="WorkEffortKeyword"/> + <make-value entity-name="WorkEffortKeyword" value-field="newEntity"/> <if-empty field="parameters.workEffortId"> <add-error> <fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/minilang/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/minilang/CommonServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/minilang/CommonServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/minilang/CommonServices.xml Wed Aug 23 20:44:44 2017 @@ -30,7 +30,7 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> + <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <call-object-method obj-field="newEntity.enteredKeyword" method-name="toLowerCase" ret-field="newEntity.enteredKeyword"/> @@ -42,7 +42,7 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> + <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <store-value value-field="newEntity"/> @@ -52,14 +52,14 @@ under the License. <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/> </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="KeywordThesaurus"/> + <make-value entity-name="KeywordThesaurus" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <remove-by-and entity-name="KeywordThesaurus" map="newEntity"/> </simple-method> <!-- Uom Conversion service --> <simple-method method-name="createUomConversionDated" short-description="Create a new dated UOM conversion entity"> - <make-value value-field="newEntity" entity-name="UomConversionDated"/> + <make-value entity-name="UomConversionDated" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> @@ -285,7 +285,7 @@ under the License. </entity-one> <if-empty field="oldGeoAssoc"> <!-- Add as it does not exist --> - <make-value value-field="newGeoAssoc" entity-name="GeoAssoc"/> + <make-value entity-name="GeoAssoc" value-field="newGeoAssoc"/> <set field="newGeoAssoc.geoId" from-field="parameters.geoId"/> <set field="newGeoAssoc.geoIdTo" from-field="geoIdTo"/> <set field="newGeoAssoc.geoAssocTypeId" from-field="parameters.geoAssocTypeId"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/minilang/PortalPageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/minilang/PortalPageServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/minilang/PortalPageServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/minilang/PortalPageServices.xml Wed Aug 23 20:44:44 2017 @@ -27,7 +27,7 @@ under the License. <set field="parameters.portalPageId" from-field="parameters.newPortalPageId"/> <call-simple-method method-name="copyIfRequiredSystemPage" xml-resource="component://common/minilang/PortalPageMethods.xml"/> <set field="parameters.newPortalPageId" from-field="portalPageId"/> - <make-value value-field="newEntity" entity-name="PortalPagePortlet"/> + <make-value entity-name="PortalPagePortlet" value-field="newEntity"/> <set field="newEntity.portalPortletId" from-field="parameters.portalPortletId"/> <set field="newEntity.portalPageId" from-field="parameters.newPortalPageId"/> <set field="newEntity.columnNum" value="1"/> @@ -99,7 +99,7 @@ under the License. <call-simple-method method-name="checkOwnerShip"/> <entity-one entity-name="PortalPagePortlet" value-field="portlet" auto-field-map="true"/> <if-not-empty field="portlet"> - <make-value value-field="newEntity" entity-name="PortletAttribute"/> + <make-value entity-name="PortletAttribute" value-field="newEntity"/> <set field="newEntity.portalPageId" from-field="portlet.portalPageId"/> <set field="newEntity.portalPortletId" from-field="portlet.portalPortletId"/> <set field="newEntity.portletSeqId" from-field="portlet.portletSeqId"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/minilang/period/PeriodServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/minilang/period/PeriodServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/minilang/period/PeriodServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/minilang/period/PeriodServices.xml Wed Aug 23 20:44:44 2017 @@ -27,7 +27,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="newEntity" entity-name="CustomTimePeriod"/> + <make-value entity-name="CustomTimePeriod" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="CustomTimePeriod" field="customTimePeriodId"/> @@ -42,7 +42,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/> + <make-value entity-name="CustomTimePeriod" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> @@ -54,7 +54,7 @@ under the License. </check-permission> <check-errors/> - <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/> + <make-value entity-name="CustomTimePeriod" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/minilang/EntitySyncServices.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/minilang/EntitySyncServices.xml?rev=1805956&r1=1805955&r2=1805956&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/minilang/EntitySyncServices.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/minilang/EntitySyncServices.xml Wed Aug 23 20:44:44 2017 @@ -21,7 +21,7 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://ofbiz.apache.org/Simple-Method"; xsi:schemaLocation="http://ofbiz.apache.org/Simple-Method http://ofbiz.apache.org/dtds/simple-methods.xsd";> <simple-method method-name="createEntitySync" short-description="Create a EntitySync"> - <make-value value-field="newEntity" entity-name="EntitySync"/> + <make-value entity-name="EntitySync" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <sequenced-id sequence-name="EntitySync" field="entitySyncId"/> @@ -42,7 +42,7 @@ under the License. <!-- EntitySyncHistory services --> <simple-method method-name="createEntitySyncHistory" short-description="Create EntitySyncHistory"> - <make-value value-field="newEntity" entity-name="EntitySyncHistory"/> + <make-value entity-name="EntitySyncHistory" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <now-timestamp field="newEntity.startDate"/> <field-to-result field="newEntity.startDate" result-name="startDate"/> @@ -55,7 +55,7 @@ under the License. <store-value value-field="entitySync"/> </simple-method> <simple-method method-name="deleteEntitySyncHistory" short-description="Delete EntitySyncHistory"> - <make-value value-field="lookupPKMap" entity-name="EntitySyncHistory"/> + <make-value entity-name="EntitySyncHistory" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -63,13 +63,13 @@ under the License. <!-- EntitySyncInclude services --> <simple-method method-name="createEntitySyncInclude" short-description="Create EntitySyncInclude"> - <make-value value-field="newEntity" entity-name="EntitySyncInclude"/> + <make-value entity-name="EntitySyncInclude" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deleteEntitySyncInclude" short-description="Delete EntitySyncInclude"> - <make-value value-field="lookupPKMap" entity-name="EntitySyncInclude"/> + <make-value entity-name="EntitySyncInclude" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/>
