svn commit: r730183 [4/6] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730183 [4/6] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Dec 30 09:12:15 2008 @@ -120,7 +120,7 @@ --> <set field="relatedCategoryContext.parentProductCategoryId" from-field="defaultTopCategoryId"/> <call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext"> - <result-to-field result-name="categories" field-name="resCategories"/> + <result-to-field result-name="categories" field="resCategories"/> </call-service> <field-to-result field="resCategories" result-name="categories"/> <!-- iterate entry-name="category" list-name="resCategories"> @@ -138,15 +138,15 @@ </if-not-empty> <if-not-empty field="rollups"> <iterate list="rollups" entry="parent"> - <get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-name="currentProductCategory"/> - <field-to-list list-name="subCategories" field-name="currentProductCategory"/> + <get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-field="currentProductCategory"/> + <field-to-list list="subCategories" field-name="currentProductCategory"/> </iterate> <if-not-empty field="subCategories"> <set field="relatedCategoryContext.categories" from-field="subCategories"/> <iterate list="subCategories" entry="subCategory"> <set field="relatedCategoryContext.parentProductCategoryId" from-field="subCategory.productCategoryId"/> <call-service service-name="getRelatedCategories" in-map-name="relatedCategoryContext"> - <result-to-field result-name="categories" field-name="relCategories"/> + <result-to-field result-name="categories" field="relCategories"/> </call-service> <if-not-empty field="relCategories"> <if-not-empty field="categories"> @@ -186,15 +186,15 @@ <!-- Get all the categories from top category --> <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/> <call-service service-name="getAllCategories" in-map="categoryFindContext"> - <result-to-field result-name="categories" field-name="categories"/> + <result-to-field result-name="categories" field="categories"/> </call-service> <!-- Get the category from categories--> <if-not-empty field="categories"> <iterate list="categories" entry="category"> <set field="checkImageUrlForCategoryContext.categoryId" from-field="category.productCategoryId"/> <call-service service-name="checkImageUrlForCategoryAndProduct" in-map-name="checkImageUrlForCategoryContext"> - <result-to-field result-name="fileExists" field-name="fileStatusMap.fileExists"/> - <result-to-field result-name="fileNotExists" field-name="fileStatusMap.fileNotExists"/> + <result-to-field result-name="fileExists" field="fileStatusMap.fileExists"/> + <result-to-field result-name="fileNotExists" field="fileStatusMap.fileNotExists"/> </call-service> <set field="categoryId" from-field="category.productCategoryId"/> <set field="categoriesMap.${categoryId}" from-field="fileStatusMap" /> @@ -207,15 +207,15 @@ <!--set from-field="parameters.categoryId" field="productCategoryContext.categoryId"/ --> <set-service-fields to-map="productCategoryContext" service-name="getProductCategoryMembers" map="parameters"/> <call-service service-name="getProductCategoryMembers" in-map="productCategoryContext" > - <result-to-field result-name="categoryMembers" field-name="categoryMembers"/> - <result-to-field result-name="category" field-name="category"/> + <result-to-field result-name="categoryMembers" field="categoryMembers"/> + <result-to-field result-name="category" field="category"/> </call-service> <!-- Get category images and check it exists or not --> <if-not-empty field="category"> <set field="checkImageUrlForCategoryContext.categoryId" from-field="category.productCategoryId"/> <call-service service-name="checkImageUrlForCategory" in-map-name="checkImageUrlForCategoryContext"> - <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> + <result-to-field result-name="filesImageMap" field="filesImageMap"/> </call-service> <if-not-empty field="filesImageMap.categoryImageUrlMap.categoryImageUrl"> @@ -248,7 +248,7 @@ <iterate list="categoryMembers" entry="productCategoryMember"> <set field="checkImageUrlForProductContext.productId" from-field="productCategoryMember.productId"/> <call-service service-name="checkImageUrlForProduct" in-map-name="checkImageUrlForProductContext"> - <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> + <result-to-field result-name="filesImageMap" field="filesImageMap"/> </call-service> <if-not-empty field="filesImageMap"> <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> @@ -286,7 +286,7 @@ </if-not-empty> <!-- Case For virtual Product --> <!-- get related assoc product --> - <get-related-one relation-name="Product" value-name="productCategoryMember" to-value-name="product"/> + <get-related-one relation-name="Product" value-name="productCategoryMember" to-value-field="product"/> <if-compare operator="equals" field="product.isVirtual" value="Y"> <!-- log level="info" message = "Virtual product =====${productCategoryMember.productId}"/ --> <set field="virtualProductContext.productId" from-field="product.productId"/> @@ -298,7 +298,7 @@ <!-- log level="info" message = "Variant product =====${variantProduct.productIdTo}"/ --> <set field="variantProductContext.productId" from-field="variantProduct.productIdTo"/> <call-service service-name="checkImageUrlForProduct" in-map-name="variantProductContext"> - <result-to-field result-name="filesImageMap" field-name="filesImageMap"/> + <result-to-field result-name="filesImageMap" field="filesImageMap"/> </call-service> <if-not-empty field="filesImageMap"> <if-not-empty field="filesImageMap.smallImageUrlMap.smallImageUrl"> @@ -357,7 +357,7 @@ <if-not-empty field="category.categoryImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="category.categoryImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="categoryImageUrlMap.categoryImageUrl" from-field="category.categoryImageUrl"/> <set field="categoryImageUrlMap.isExists" from-field="isExists"/> @@ -371,7 +371,7 @@ <clear-field field="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="category.linkOneImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="linkOneImageUrlMap.linkOneImageUrl" from-field="category.linkOneImageUrl"/> <set field="linkOneImageUrlMap.isExists" from-field="isExists"/> @@ -385,7 +385,7 @@ <clear-field field="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="category.linkTwoImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="linkTwoImageUrlMap.largeImageUrl" from-field="category.linkTwoImageUrl"/> <set field="linkTwoImageUrlMap.isExists" from-field="isExists"/> @@ -408,7 +408,7 @@ <if-not-empty field="product.smallImageUrl"> <set field="checkImageUrlContext.imageUrl" from-field="product.smallImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="smallImageUrlMap.smallImageUrl" from-field="product.smallImageUrl"/> <set field="smallImageUrlMap.isExists" from-field="isExists"/> @@ -423,7 +423,7 @@ <clear-field field="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.mediumImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="mediumImageUrlMap.mediumImageUrl" from-field="product.mediumImageUrl"/> <set field="mediumImageUrlMap.isExists" from-field="isExists"/> @@ -437,7 +437,7 @@ <clear-field field="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.largeImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="largeImageUrlMap.largeImageUrl" from-field="product.largeImageUrl"/> <set field="largeImageUrlMap.isExists" from-field="isExists"/> @@ -451,7 +451,7 @@ <clear-field field="checkImageUrlContext.imageUrl"/> <set field="checkImageUrlContext.imageUrl" from-field="product.detailImageUrl"/> <call-service service-name="checkImageUrl" in-map-name="checkImageUrlContext"> - <result-to-field result-name="isExists" field-name="isExists"/> + <result-to-field result-name="isExists" field="isExists"/> </call-service> <set field="detailImageUrlMap.detailImageUrl" from-field="product.detailImageUrl"/> <set field="detailImageUrlMap.isExists" from-field="isExists"/> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -100,11 +100,11 @@ <first-from-list list="otherCosts" entry="otherCost"/> <set field="productCost" value="0" type="Double" /> - <calculate field-name="productCost" type="Double" decimal-scale="6"> - <calcop field-name="laborCost.cost" operator="add"> - <calcop field-name="materialsCost.cost" operator="get"/> - <calcop field-name="routeCost.cost" operator="get"/> - <calcop field-name="otherCost.cost" operator="get"/> + <calculate field="productCost" type="Double" decimal-scale="6"> + <calcop field="laborCost.cost" operator="add"> + <calcop field="materialsCost.cost" operator="get"/> + <calcop field="routeCost.cost" operator="get"/> + <calcop field="otherCost.cost" operator="get"/> </calcop> </calculate> <!-- if the cost is zero, and the product is a variant, get the cost of the virtual --> @@ -154,7 +154,7 @@ <set from-field="priceCost.currencyUomId" field="inputMap.uomId"/> <set from-field="parameters.currencyUomId" field="inputMap.uomIdTo"/> <call-service service-name="convertUom" in-map-name="inputMap"> - <result-to-field result-name="convertedValue" field-name="productCost"/> + <result-to-field result-name="convertedValue" field="productCost"/> </call-service> </if-not-empty> </if-compare> @@ -184,40 +184,40 @@ <result-to-field result-name="setupTime"/> </call-service> - <calculate field-name="estimatedTaskTime" type="Double" decimal-scale="6"> - <calcop field-name="estimatedTaskTime" operator="subtract"> - <calcop field-name="setupTime" operator="get"/> + <calculate field="estimatedTaskTime" type="Double" decimal-scale="6"> + <calcop field="estimatedTaskTime" operator="subtract"> + <calcop field="setupTime" operator="get"/> </calcop> </calculate> <entity-one entity-name="WorkEffort" value-field="task"/> <if-not-empty field="task"> - <get-related-one value-name="task" relation-name="FixedAsset" to-value-name="fixedAsset"/> + <get-related-one value-name="task" relation-name="FixedAsset" to-value-field="fixedAsset"/> <set from-field="parameters.currencyUomId" field="costsAndMap.amountUomId"/> <set value="SETUP_COST" field="costsAndMap.fixedAssetStdCostTypeId"/> - <get-related value-name="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list-name="setupCosts"/> - <filter-list-by-date list-name="setupCosts"/> + <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list="setupCosts"/> + <filter-list-by-date list="setupCosts"/> <!--<filter-list-by-and list-name="costs" map-name="costsAndMap"/>--> <first-from-list list="setupCosts" entry="setupCost"/> <set value="USAGE_COST" field="costsAndMap.fixedAssetStdCostTypeId"/> - <get-related value-name="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list-name="usageCosts"/> - <filter-list-by-date list-name="usageCosts"/> + <get-related value-field="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list="usageCosts"/> + <filter-list-by-date list="usageCosts"/> <first-from-list list="usageCosts" entry="usageCost"/> </if-not-empty> - <calculate field-name="taskCost" type="Double" decimal-scale="6"> + <calculate field="taskCost" type="Double" decimal-scale="6"> <calcop operator="add"> - <calcop field-name="estimatedTaskTime" operator="multiply"> - <calcop field-name="usageCost.amount" operator="get"/> + <calcop field="estimatedTaskTime" operator="multiply"> + <calcop field="usageCost.amount" operator="get"/> </calcop> - <calcop field-name="setupTime" operator="multiply"> - <calcop field-name="setupCost.amount" operator="get"/> + <calcop field="setupTime" operator="multiply"> + <calcop field="setupCost.amount" operator="get"/> </calcop> </calcop> </calculate> <!-- Time is converted from milliseconds to hours --> - <calculate field-name="taskCost" type="Double" decimal-scale="6"> - <calcop field-name="taskCost" operator="divide"> + <calculate field="taskCost" type="Double" decimal-scale="6"> + <calcop field="taskCost" operator="divide"> <number value="3600000"/> </calcop> </calculate> @@ -261,10 +261,10 @@ <call-service service-name="getProductCost" in-map-name="inputMap"> <result-to-field result-name="productCost"/> </call-service> - <calculate field-name="totalProductsCost" type="Double" decimal-scale="6"> - <calcop field-name="totalProductsCost" operator="add"> - <calcop field-name="componentMap.quantity" operator="multiply"> - <calcop field-name="productCost" operator="get"/> + <calculate field="totalProductsCost" type="Double" decimal-scale="6"> + <calcop field="totalProductsCost" operator="add"> + <calcop field="componentMap.quantity" operator="multiply"> + <calcop field="productCost" operator="get"/> </calcop> </calcop> </calculate> @@ -277,8 +277,8 @@ <call-service service-name="getProductCost" in-map-name="inputMap"> <result-to-field result-name="productCost"/> </call-service> - <calculate field-name="totalProductsCost" type="Double" decimal-scale="6"> - <calcop field-name="productCost" operator="get"/> + <calculate field="totalProductsCost" type="Double" decimal-scale="6"> + <calcop field="productCost" operator="get"/> </calculate> </else> </if-not-empty> @@ -295,18 +295,18 @@ <set from-field="parameters.productId" field="callSvcMap.productId"/> <set from-field="routing.workEffortId" field="callSvcMap.routingId"/> <call-service service-name="getTaskCost" in-map-name="callSvcMap"> - <result-to-field result-name="taskCost" field-name="taskCost"/> + <result-to-field result-name="taskCost" field="taskCost"/> </call-service> - <calculate field-name="totalTaskCost" type="Double" decimal-scale="6"> - <calcop field-name="totalTaskCost" operator="add"> - <calcop field-name="taskCost" operator="get"/> + <calculate field="totalTaskCost" type="Double" decimal-scale="6"> + <calcop field="totalTaskCost" operator="add"> + <calcop field="taskCost" operator="get"/> </calcop> </calculate> </iterate> - <calculate field-name="totalCost" type="Double" decimal-scale="6"> - <calcop field-name="totalTaskCost" operator="add"> - <calcop field-name="totalProductsCost" operator="get"/> + <calculate field="totalCost" type="Double" decimal-scale="6"> + <calcop field="totalTaskCost" operator="add"> + <calcop field="totalProductsCost" operator="get"/> </calcop> </calculate> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Dec 30 09:12:15 2008 @@ -29,7 +29,7 @@ <if-not-empty field="orderHeader"> <if-compare field="orderHeader.needsInventoryIssuance" operator="equals" value="Y"> - <get-related list-name="orderItemList" relation-name="OrderItem" value-name="orderHeader"/> + <get-related list="orderItemList" relation-name="OrderItem" value-field="orderHeader"/> <!-- before issuing inventory, check to see if there is inventory information in this database --> <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals --> @@ -138,11 +138,11 @@ <set field="createDetailMap.orderId" from-field="parameters.orderId" /> <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" /> <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" /> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.quantityNotIssued" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.quantityNotIssued" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="parameters.quantityNotIssued" operator="negative"/> + <calculate field="createDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="parameters.quantityNotIssued" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> @@ -156,7 +156,7 @@ <set field="createInvItemInMap.facilityId" from-field="orderHeader.originFacilityId"/> <set field="createInvItemInMap.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/> <call-service service-name="createInventoryItem" in-map-name="createInvItemInMap"> - <result-to-field result-name="inventoryItemId" field-name="createInvItemOutMap.inventoryItemId"/> + <result-to-field result-name="inventoryItemId" field="createInvItemOutMap.inventoryItemId"/> </call-service> <!-- create ItemIssuance record --> @@ -173,11 +173,11 @@ <set field="createDetailMap.orderId" from-field="parameters.orderId" /> <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" /> <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" /> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.quantityNotIssued" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.quantityNotIssued" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="parameters.quantityNotIssued" operator="negative"/> + <calculate field="createDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="parameters.quantityNotIssued" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> @@ -186,7 +186,7 @@ </else> </if-not-empty> - <calculate field-name="quantityNotIssued" map-name="parameters"><number value="0"/></calculate> + <calculate field="quantityNotIssued" map-name="parameters"><number value="0"/></calculate> </if-compare> </if-not-empty> </simple-method> @@ -204,12 +204,12 @@ <set field="issuanceCreateMap.orderId" from-field="parameters.orderId"/> <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/> <set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/> - <calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate> + <calculate field="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate> <call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap"/> <clear-field field="issuanceCreateMap"/> - <calculate field-name="parameters.quantityNotIssued"> - <calcop field-name="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop> + <calculate field="parameters.quantityNotIssued"> + <calcop field="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop> </calculate> </if-compare> </if-compare> @@ -249,18 +249,18 @@ <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" /> <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" /> <!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance --> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.deductAmount" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.deductAmount" operator="negative"/> </calculate> - <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="parameters.deductAmount" operator="negative"/> + <calculate field="createDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="parameters.deductAmount" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field="createDetailMap"/> - <calculate field-name="quantityNotIssued" map-name="parameters"> - <calcop operator="subtract" field-name="parameters.quantityNotIssued"> - <calcop operator="get" field-name="parameters.deductAmount"/> + <calculate field="quantityNotIssued" map-name="parameters"> + <calcop operator="subtract" field="parameters.quantityNotIssued"> + <calcop operator="get" field="parameters.deductAmount"/> </calcop> </calculate> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -39,7 +39,7 @@ <!-- check the product; make sure its a physical item --> <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <get-related-one value-name="product" relation-name="ProductType" to-value-field="productType"/> + <get-related-one value-field="product" relation-name="ProductType" to-value-field="productType"/> <if-compare field="productType.isPhysical" operator="equals" value="N"> <set field="parameters.quantityNotReserved" value="0" type="Double"/> <else> @@ -163,14 +163,14 @@ <set from-field="parameters.orderId" field="createDetailMap.orderId"/> <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/> <set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.quantityNotReserved" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.quantityNotReserved" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field="createDetailMap"/> <!-- get the promiseDatetime --> - <get-related-one value-name="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> + <get-related-one value-name="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-field="productFacility"/> <clear-field field="daysToShip"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> <if-empty field="daysToShip"> @@ -217,7 +217,7 @@ <set value="NON_SERIAL_INV_ITEM" field="createInventoryItemInMap.inventoryItemTypeId"/> <set from-field="permUserLogin" field="createInventoryItemInMap.userLogin"/> <call-service service-name="createInventoryItem" in-map-name="createInventoryItemInMap" include-user-login="false"> - <result-to-field result-name="inventoryItemId" field-name="createInventoryItemOutMap.inventoryItemId"/> + <result-to-field result-name="inventoryItemId" field="createInventoryItemOutMap.inventoryItemId"/> </call-service> <entity-one entity-name="InventoryItem" value-field="newNonSerInventoryItem"> <field-map field-name="inventoryItemId" from-field="createInventoryItemOutMap.inventoryItemId"/> @@ -228,14 +228,14 @@ <set from-field="parameters.orderId" field="createDetailMap.orderId"/> <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/> <set from-field="parameters.shipGroupSeqId" field="createDetailMap.shipGroupSeqId"/> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.quantityNotReserved" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.quantityNotReserved" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field="createDetailMap"/> <!-- get the promiseDatetime --> - <get-related-one value-name="newNonSerInventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> + <get-related-one value-name="newNonSerInventoryItem" relation-name="ProductFacility" to-value-field="productFacility"/> <clear-field field="daysToShip"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> <if-empty field="daysToShip"> @@ -320,7 +320,7 @@ <set field="receiveCtx.inventoryItemTypeId" value="SERIALIZED_INV_ITEM"/> <set field="receiveCtx.serialNumber" from-field="parameters.serialNumber"/> <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"> - <result-to-field result-name="inventoryItemId" field-name="inventoryItemLookupPk.inventoryItemId"/> + <result-to-field result-name="inventoryItemId" field="inventoryItemLookupPk.inventoryItemId"/> </call-service> <find-by-primary-key entity-name="InventoryItem" map="inventoryItemLookupPk" value-field="inventoryItem"/> </if-empty> @@ -401,8 +401,8 @@ <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> <clear-field field="reserveOisgirMap"/> - <calculate field-name="parameters.quantityNotReserved"> - <calcop field-name="parameters.quantityNotReserved" operator="subtract"><number value="1.0"/></calcop> + <calculate field="parameters.quantityNotReserved"> + <calcop field="parameters.quantityNotReserved" operator="subtract"><number value="1.0"/></calcop> </calculate> </if-compare> </if-compare> @@ -428,8 +428,8 @@ <set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/> <set from-field="parameters.orderId" field="createDetailMap.orderId"/> <set from-field="parameters.orderItemSeqId" field="createDetailMap.orderItemSeqId"/> - <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="parameters.deductAmount" operator="negative"/> + <calculate field="createDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="parameters.deductAmount" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/> <clear-field field="createDetailMap"/> @@ -450,9 +450,9 @@ <call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/> <clear-field field="reserveOisgirMap"/> - <calculate field-name="quantityNotReserved" map-name="parameters"> - <calcop operator="subtract" field-name="quantityNotReserved" map-name="parameters"> - <calcop operator="get" field-name="deductAmount" map-name="parameters"/> + <calculate field="quantityNotReserved" map-name="parameters"> + <calcop operator="subtract" field="quantityNotReserved" map-name="parameters"> + <calcop operator="get" field="deductAmount" map-name="parameters"/> </calcop> </calculate> </then> @@ -466,7 +466,7 @@ <simple-method method-name="getPromisedDateTime" short-description="Get Inventory Promised Date/Time"> <!-- get the promiseDatetime --> - <get-related-one value-name="inventoryItem" relation-name="ProductFacility" to-value-name="productFacility"/> + <get-related-one value-name="inventoryItem" relation-name="ProductFacility" to-value-field="productFacility"/> <set field="daysToShip" from-field="productFacility.daysToShip"/> <if-empty field="daysToShip"> <!-- if the product does not have its own days to ship, use Facility.defaultDaysToShip, if not then use 30 days as a USA industry default --> @@ -503,13 +503,13 @@ </if-empty> <create-value value-field="newOisgirEntity"/> <else> - <calculate field-name="checkOisgirEntity.quantity"> - <calcop operator="add" field-name="checkOisgirEntity.quantity"/> - <calcop operator="add" field-name="parameters.quantity"/> + <calculate field="checkOisgirEntity.quantity"> + <calcop operator="add" field="checkOisgirEntity.quantity"/> + <calcop operator="add" field="parameters.quantity"/> </calculate> - <calculate field-name="checkOisgirEntity.quantityNotAvailable"> - <calcop operator="add" field-name="checkOisgirEntity.quantityNotAvailable"/> - <calcop operator="add" field-name="parameters.quantityNotAvailable"/> + <calculate field="checkOisgirEntity.quantityNotAvailable"> + <calcop operator="add" field="checkOisgirEntity.quantityNotAvailable"/> + <calcop operator="add" field="parameters.quantityNotAvailable"/> </calculate> <store-value value-name="checkOisgirEntity"/> </else> @@ -581,9 +581,9 @@ <set from-field="oisgir.inventoryItemId" field="checkDiiMap.inventoryItemId"/> <call-service service-name="checkDecomposeInventoryItem" in-map-name="checkDiiMap"/> <!-- update the toCancelAmount --> - <calculate field-name="toCancelAmount"> - <calcop operator="subtract" field-name="toCancelAmount"> - <calcop operator="get" field-name="cancelOisgirMap.cancelQuantity"/> + <calculate field="toCancelAmount"> + <calcop operator="subtract" field="toCancelAmount"> + <calcop operator="get" field="cancelOisgirMap.cancelQuantity"/> </calcop> </calculate> </if-compare> @@ -592,7 +592,7 @@ </simple-method> <simple-method method-name="cancelOrderItemShipGrpInvRes" short-description="Cancel An Inventory Reservation"> <entity-one entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvRes"/> - <get-related-one relation-name="InventoryItem" value-name="orderItemShipGrpInvRes" to-value-field="inventoryItem"/> + <get-related-one relation-name="InventoryItem" value-field="orderItemShipGrpInvRes" to-value-field="inventoryItem"/> <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> <log level="verbose" message="Serialized inventory re-enabled."/> <set value="INV_AVAILABLE" field="inventoryItem.statusId"/> @@ -616,9 +616,9 @@ <clear-field field="createDetailMap"/> <if-compare-field field="cancelQuantity" to-field="orderItemShipGrpInvRes.quantity" operator="less" type="Double"> - <calculate field-name="orderItemShipGrpInvRes.quantity"> - <calcop operator="subtract" field-name="orderItemShipGrpInvRes.quantity"> - <calcop operator="get" field-name="cancelQuantity"/> + <calculate field="orderItemShipGrpInvRes.quantity"> + <calcop operator="subtract" field="orderItemShipGrpInvRes.quantity"> + <calcop operator="get" field="cancelQuantity"/> </calcop> </calculate> <store-value value-name="orderItemShipGrpInvRes"/> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -161,7 +161,7 @@ </if-empty> <!-- if inventoryItem's ownerPartyId is empty, get the ownerPartyId from the facility --> <if-empty field="inventoryItem.ownerPartyId"> - <get-related-one value-name="inventoryItem" relation-name="Facility" to-value-name="facility"/> + <get-related-one value-name="inventoryItem" relation-name="Facility" to-value-field="facility"/> <set field="inventoryItem.ownerPartyId" from-field="facility.ownerPartyId"/> <!-- if inventoryItem's ownerPartyId is still empty, return an error message --> <if-empty field="inventoryItem.ownerPartyId"> @@ -176,7 +176,7 @@ <if-empty field="inventoryItem.currencyUomId"> <set field="partyAccountingPreferencesCallMap.organizationPartyId" from-field="inventoryItem.ownerPartyId"/> <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> - <result-to-field result-name="partyAccountingPreference" field-name="accPref"/> + <result-to-field result-name="partyAccountingPreference" field="accPref"/> </call-service> <set field="inventoryItem.currencyUomId" from-field="accPref.baseCurrencyUomId"/> <if-empty field="inventoryItem.currencyUomId"> @@ -197,7 +197,7 @@ <set from-field="inventoryItem.currencyUomId" field="inputMap.currencyUomId"/> <set value="EST_STD" field="inputMap.costComponentTypePrefix"/> <!-- TODO: create a new service getProductStdCost that calls getProductCost --> <call-service service-name="getProductCost" in-map-name="inputMap"> - <result-to-field result-name="productCost" field-name="inventoryItem.unitCost"/> + <result-to-field result-name="productCost" field="inventoryItem.unitCost"/> </call-service> </if-empty> <!-- if inventoryItem's unitCost is still empty, or negative return an error message --> @@ -228,7 +228,7 @@ <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/> <if-empty field="lookedUpValue.ownerPartyId"> - <get-related-one value-name="lookedUpValue" relation-name="Facility" to-value-name="oldFacility"/> + <get-related-one value-name="lookedUpValue" relation-name="Facility" to-value-field="oldFacility"/> <set field="lookedUpValue.ownerPartyId" from-field="oldFacility.ownerPartyId"/> </if-empty> <field-to-result field="lookedUpValue.ownerPartyId" result-name="oldOwnerPartyId"/> @@ -418,7 +418,7 @@ <find-by-and entity-name="ProductAssoc" map-name="getAssoc" list-name="assocs"/> <filter-list-by-date list-name="assocs" to-list-name="assocsDate"/> <first-from-list entry="assoc" list="assocsDate"/> - <get-related-one value-name="assoc" relation-name="MainProduct" to-value-name="virtProduct"/> + <get-related-one value-name="assoc" relation-name="MainProduct" to-value-field="virtProduct"/> <if-empty field="product.salesDiscWhenNotAvail"> <set field="product.salesDiscWhenNotAvail" from-field="virtProduct.salesDiscWhenNotAvail"/> </if-empty> @@ -516,7 +516,7 @@ <simple-method method-name="createPhysicalInventoryAndVariance" short-description="Create a PhysicalInventory and an InventoryItemVariance"> <set-service-fields service-name="createPhysicalInventory" map="parameters" to-map="createPhysicalInventoryMap"/> <call-service service-name="createPhysicalInventory" in-map="createPhysicalInventoryMap"> - <result-to-field result-name="physicalInventoryId" field-name="physicalInventoryId" map-name="parameters"/> + <result-to-field result-name="physicalInventoryId" field="parameters.physicalInventoryId"/> <result-to-result result-name="physicalInventoryId" service-result-name="physicalInventoryId"/> </call-service> <set-service-fields service-name="createInventoryItemVariance" map="parameters" to-map="createInventoryItemVarianceMap"/> @@ -626,14 +626,14 @@ </or> </condition> <then> - <calculate field-name="parameters.quantityOnHandTotal" type="Double"> - <calcop field-name="parameters.quantityOnHandTotal" operator="add"><number value="1.0"/></calcop> + <calculate field="parameters.quantityOnHandTotal" type="Double"> + <calcop field="parameters.quantityOnHandTotal" operator="add"><number value="1.0"/></calcop> </calculate> </then> </if> <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> - <calculate field-name="parameters.availableToPromiseTotal" type="Double"> - <calcop field-name="parameters.availableToPromiseTotal" operator="add"><number value="1.0"/></calcop> + <calculate field="parameters.availableToPromiseTotal" type="Double"> + <calcop field="parameters.availableToPromiseTotal" operator="add"><number value="1.0"/></calcop> </calculate> </if-compare> </if-compare> @@ -656,15 +656,15 @@ </condition> <then> <if-not-empty field="inventoryItem.quantityOnHandTotal"> - <calculate field-name="parameters.quantityOnHandTotal" type="Double"> - <calcop operator="get" field-name="parameters.quantityOnHandTotal"/> - <calcop operator="get" field-name="inventoryItem.quantityOnHandTotal"/> + <calculate field="parameters.quantityOnHandTotal" type="Double"> + <calcop operator="get" field="parameters.quantityOnHandTotal"/> + <calcop operator="get" field="inventoryItem.quantityOnHandTotal"/> </calculate> </if-not-empty> <if-not-empty field="inventoryItem.availableToPromiseTotal"> - <calculate field-name="parameters.availableToPromiseTotal" type="Double"> - <calcop operator="get" field-name="parameters.availableToPromiseTotal"/> - <calcop operator="get" field-name="inventoryItem.availableToPromiseTotal"/> + <calculate field="parameters.availableToPromiseTotal" type="Double"> + <calcop operator="get" field="parameters.availableToPromiseTotal"/> + <calcop operator="get" field="inventoryItem.availableToPromiseTotal"/> </calculate> </if-not-empty> </then> @@ -951,7 +951,7 @@ <simple-method method-name="balanceOrderItemsWithNegativeReservations" short-description="To balance order items with negative reservations"> <entity-one entity-name="OrderHeader" value-field="orderHeader" auto-field-map="true"/> - <get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-field="productStore"/> + <get-related-one value-field="orderHeader" relation-name="ProductStore" to-value-field="productStore"/> <if-compare field="productStore.balanceResOnOrderCreation" operator="equals" value="Y"> <entity-condition entity-name="OrderItemAndShipGrpInvResAndItem" list="oisgirais"> <condition-list combine="and"> @@ -1025,7 +1025,7 @@ <!-- check the product; make sure its a physical item --> <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> - <get-related-one value-name="product" relation-name="ProductType" to-value-field="productType"/> + <get-related-one value-field="product" relation-name="ProductType" to-value-field="productType"/> <if-compare field="productType.isPhysical" operator="equals" value="N"> <set field="quantityNotTransferred" value="0" type="Double"/> <else> @@ -1092,9 +1092,9 @@ </else> </if-compare-field> <call-service service-name="createInventoryTransfer" in-map-name="inputMap"/> - <calculate field-name="quantityNotTransferred"> - <calcop operator="subtract" field-name="quantityNotTransferred"> - <calcop operator="get" field-name="inputMap.xferQty"/> + <calculate field="quantityNotTransferred"> + <calcop operator="subtract" field="quantityNotTransferred"> + <calcop operator="get" field="inputMap.xferQty"/> </calcop> </calculate> </if-compare> @@ -1130,9 +1130,9 @@ </else> </if-compare-field> <call-service service-name="createInventoryTransfer" in-map-name="inputMap"/> - <calculate field-name="quantityNotTransferred"> - <calcop operator="subtract" field-name="quantityNotTransferred"> - <calcop operator="get" field-name="inputMap.xferQty"/> + <calculate field="quantityNotTransferred"> + <calcop operator="subtract" field="quantityNotTransferred"> + <calcop operator="get" field="inputMap.xferQty"/> </calcop> </calculate> </if-compare> @@ -1169,9 +1169,9 @@ </else> </if-compare-field> <call-service service-name="createInventoryTransfer" in-map-name="inputMap"/> - <calculate field-name="quantityNotTransferred"> - <calcop operator="subtract" field-name="quantityNotTransferred"> - <calcop operator="get" field-name="inputMap.xferQty"/> + <calculate field="quantityNotTransferred"> + <calcop operator="subtract" field="quantityNotTransferred"> + <calcop operator="get" field="inputMap.xferQty"/> </calcop> </calculate> </if-compare> @@ -1243,7 +1243,7 @@ <field-map field-name="userLoginId" value="system"/> </entity-one> <call-service service-name="createPhysicalInventoryAndVariance" in-map-name="createPhysicalInventoryAndVarianceMap"> - <result-to-field result-name="physicalInventoryId" field-name="physicalInventoryId"/> + <result-to-field result-name="physicalInventoryId" field="physicalInventoryId"/> </call-service> <assert> <not> @@ -1256,10 +1256,10 @@ </simple-method> <simple-method method-name="changeOwnerUponIssuance" short-description="If product store setOwnerUponIssuance is Y or empty, set the inventory item owner upon issuance."> <entity-one entity-name="ItemIssuance" value-field="itemIssuance"/> - <get-related-one value-name="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/> + <get-related-one value-field="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/> <if-not-empty field="inventoryItem"> <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"> - <get-related-one value-name="itemIssuance" relation-name="OrderHeader" to-value-name="orderHeader"/> + <get-related-one value-name="itemIssuance" relation-name="OrderHeader" to-value-field="orderHeader"/> <if-not-empty field="orderHeader"> <set field="orderRoleAndMap.orderId" from-field="orderHeader.orderId"/> <set field="orderRoleAndMap.roleTypeId" value="END_USER_CUSTOMER"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 30 09:12:15 2008 @@ -89,14 +89,14 @@ <else> <!-- should generally only be one pick/primary location, just choose the first... --> <first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/> - <get-related-one value-name="productFacilityLocationView" relation-name="FacilityLocation" to-value-name="moveInfo.facilityLocationTo"/> - <get-related-one value-name="productFacilityLocationView" relation-name="ProductFacilityLocation" to-value-name="moveInfo.targetProductFacilityLocation"/> + <get-related-one value-name="productFacilityLocationView" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationTo"/> + <get-related-one value-field="productFacilityLocationView" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/> <!-- get totalQuantity: iterate through perProductOiirailList and add up quantity (from OrderItemShipGrpInvRes) --> - <calculate field-name="moveInfo.totalQuantity" type="Double"><number value="0"/></calculate> + <calculate field="moveInfo.totalQuantity" type="Double"><number value="0"/></calculate> <iterate entry="perProductOiirail" list="perProductOiirailList"> - <calculate field-name="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field-name="perProductOiirail.quantity" operator="get"/></calcop> + <calculate field="moveInfo.totalQuantity" type="Double"> + <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="perProductOiirail.quantity" operator="get"/></calcop> </calculate> </iterate> @@ -107,14 +107,14 @@ <field-map field-name="locationSeqId" from-field="locationSeqId"/> </entity-and> - <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate> - <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate> + <calculate field="totalQuantityOnHand" type="Double"><number value="0"/></calculate> + <calculate field="totalAvailableToPromise" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="inventoryItemList"> - <calculate field-name="totalQuantityOnHand" type="Double"> - <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calculate field="totalQuantityOnHand" type="Double"> + <calcop field-name="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> - <calculate field-name="totalAvailableToPromise" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="add"><calcop field-name="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calculate field="totalAvailableToPromise" type="Double"> + <calcop field-name="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> </iterate> <set from-field="totalQuantityOnHand" field="moveInfo.quantityOnHandTotalFrom"/> @@ -127,15 +127,15 @@ <!-- check ProductFacilityLocation for where this is going and see if we should do a pre-emptive transfer too... --> <!-- get all InventoryItems and total the availableToPromise (and quantityOnHand) for the target location --> - <get-related value-name="moveInfo.targetProductFacilityLocation" relation-name="InventoryItem" list-name="targetInventoryItemList"/> - <calculate field-name="targetTotalAvailableToPromise" type="Double"><number value="0"/></calculate> - <calculate field-name="targetTotalQuantityOnHand" type="Double"><number value="0"/></calculate> + <get-related value-field="moveInfo.targetProductFacilityLocation" relation-name="InventoryItem" list="targetInventoryItemList"/> + <calculate field="targetTotalAvailableToPromise" type="Double"><number value="0"/></calculate> + <calculate field="targetTotalQuantityOnHand" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="targetInventoryItemList"> - <calculate field-name="targetTotalAvailableToPromise" type="Double"> - <calcop field-name="targetTotalAvailableToPromise" operator="add"><calcop field-name="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calculate field="targetTotalAvailableToPromise" type="Double"> + <calcop field-name="targetTotalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> - <calculate field-name="targetTotalQuantityOnHand" type="Double"> - <calcop field-name="targetTotalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calculate field="targetTotalQuantityOnHand" type="Double"> + <calcop field-name="targetTotalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> </iterate> <set from-field="targetTotalAvailableToPromise" field="moveInfo.availableToPromiseTotalTo"/> @@ -149,8 +149,8 @@ <!-- if targetTotalAvailableToPromise is less than productFacilityLocation.minimumStock, move over the moveInfo.targetProductFacilityLocation.moveQuantity --> <!-- if trying to move more from the location than is there, find the difference and put it in targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} --> - <calculate field-name="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field-name="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop> + <calculate field="moveInfo.totalQuantity" type="Double"> + <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="moveInfo.targetProductFacilityLocation.moveQuantity" operator="get"/></calcop> </calculate> <else> <!-- @@ -159,14 +159,14 @@ if not do whatever is available and put difference back in targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId} --> - <calculate field-name="moveInfo.totalQuantity" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field-name="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" operator="get"/></calcop> + <calculate field="moveInfo.totalQuantity" type="Double"> + <calcop field-name="moveInfo.totalQuantity" operator="add"><calcop field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" operator="get"/></calcop> </calculate> </else> </if-empty> <if-compare-field field="totalQuantityOnHand" to-field="moveInfo.totalQuantity" operator="less" type="Double"> - <calculate field-name="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" type="Double"> - <calcop field-name="moveInfo.totalQuantity" operator="subtract"><calcop field-name="totalQuantityOnHand" operator="get"/></calcop> + <calculate field="targetLocationSimpleMoveQuantity.${moveInfo.targetProductFacilityLocation.locationSeqId}" type="Double"> + <calcop field-name="moveInfo.totalQuantity" operator="subtract"><calcop field="totalQuantityOnHand" operator="get"/></calcop> </calculate> <set from-field="totalQuantityOnHand" field="moveInfo.totalQuantity"/> </if-compare-field> @@ -251,10 +251,10 @@ </condition> <then> <if-compare-field field="productFacilityLocationQuantityTest.productId" to-field="productSave.productId" operator="not-equals"> - <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="Product" to-value-name="productSave"/> + <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="Product" to-value-field="productSave"/> <clear-field field="fromLocationTotalAvailableToPromise"/> </if-compare-field> - <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="FacilityLocation" to-value-name="targetFacilityLocationSave"/> + <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="FacilityLocation" to-value-field="targetFacilityLocationSave"/> <!-- create a moveInfo for each from location with a corresponding quantity --> <entity-and entity-name="InventoryItemAndLocation" list="inventoryItemAndLocationList"> @@ -276,14 +276,14 @@ <clear-field field="perLocationInventoryItemAndLocList"/> <iterate-map key="locationSeqId" value="perLocationInventoryItemAndLocList" map="InventoryItemAndLocationByLocMap"> <if-empty field="fromLocationTotalAvailableToPromise.${locationSeqId}"> - <calculate field-name="totalQuantityOnHand" type="Double"><number value="0"/></calculate> - <calculate field-name="totalAvailableToPromise" type="Double"><number value="0"/></calculate> + <calculate field="totalQuantityOnHand" type="Double"><number value="0"/></calculate> + <calculate field="totalAvailableToPromise" type="Double"><number value="0"/></calculate> <iterate entry="inventoryItem" list="perLocationInventoryItemAndLocList"> - <calculate field-name="totalQuantityOnHand" type="Double"> - <calcop field-name="totalQuantityOnHand" operator="add"><calcop field-name="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> + <calculate field="totalQuantityOnHand" type="Double"> + <calcop field-name="totalQuantityOnHand" operator="add"><calcop field="inventoryItem.quantityOnHandTotal" operator="get"/></calcop> </calculate> - <calculate field-name="totalAvailableToPromise" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="add"><calcop field-name="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> + <calculate field="totalAvailableToPromise" type="Double"> + <calcop field-name="totalAvailableToPromise" operator="add"><calcop field="inventoryItem.availableToPromiseTotal" operator="get"/></calcop> </calculate> </iterate> <else> @@ -302,8 +302,8 @@ <set from-field="productSave" field="moveInfo.product"/> <set from-field="targetFacilityLocationSave" field="moveInfo.facilityLocationTo"/> <first-from-list entry="InventoryItemAndLocation" list="perLocationInventoryItemAndLocList"/> - <get-related-one value-name="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-name="moveInfo.facilityLocationFrom"/> - <get-related-one value-name="productFacilityLocationQuantityTest" relation-name="ProductFacilityLocation" to-value-name="moveInfo.targetProductFacilityLocation"/> + <get-related-one value-name="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationFrom"/> + <get-related-one value-field="productFacilityLocationQuantityTest" relation-name="ProductFacilityLocation" to-value-field="moveInfo.targetProductFacilityLocation"/> <set from-field="productFacilityLocationQuantityTest.availableToPromiseTotal" field="moveInfo.availableToPromiseTotalTo"/> <set from-field="productFacilityLocationQuantityTest.quantityOnHandTotal" field="moveInfo.quantityOnHandTotalTo"/> <set from-field="totalAvailableToPromise" field="moveInfo.availableToPromiseTotalFrom"/> @@ -313,17 +313,17 @@ if not do whatever is available and put difference back in targetLocationMoveQuantity, trying to move more from the location than is there, find the difference and put it in targetLocationMoveQuantity --> <if-compare-field field="totalAvailableToPromise" to-field="targetLocationMoveQuantity" operator="less" type="Double"> - <calculate field-name="targetLocationMoveQuantity" type="Double"> - <calcop field-name="targetLocationMoveQuantity" operator="subtract"><calcop field-name="totalAvailableToPromise" operator="get"/></calcop> + <calculate field="targetLocationMoveQuantity" type="Double"> + <calcop field-name="targetLocationMoveQuantity" operator="subtract"><calcop field="totalAvailableToPromise" operator="get"/></calcop> </calculate> <set from-field="totalAvailableToPromise" field="moveInfo.totalQuantity"/> - <calculate field-name="fromLocationTotalAvailableToPromise.${locationSeqId}" type="Double"><number value="0"/></calculate> + <calculate field="fromLocationTotalAvailableToPromise.${locationSeqId}" type="Double"><number value="0"/></calculate> <else> <set from-field="targetLocationMoveQuantity" field="moveInfo.totalQuantity"/> <calculate map-name="fromLocationTotalAvailableToPromise" field-name="${locationSeqId}" type="Double"> - <calcop field-name="totalAvailableToPromise" operator="subtract"><calcop field-name="targetLocationMoveQuantity" operator="get"/></calcop> + <calcop field-name="totalAvailableToPromise" operator="subtract"><calcop field="targetLocationMoveQuantity" operator="get"/></calcop> </calculate> - <calculate field-name="targetLocationMoveQuantity" type="Double"><number value="0"/></calculate> + <calculate field="targetLocationMoveQuantity" type="Double"><number value="0"/></calculate> </else> </if-compare-field> @@ -395,7 +395,7 @@ <clear-field field="createNonOisgirTargetDetailMap"/> <set-service-fields map="targetInventoryItem" service-name="createInventoryItem" to-map="createInventoryItemMap"/> <call-service service-name="createInventoryItem" in-map="createInventoryItemMap"> - <result-to-field result-name="inventoryItemId" field-name="createNonOisgirTargetDetailMap.inventoryItemId"/> + <result-to-field result-name="inventoryItemId" field="createNonOisgirTargetDetailMap.inventoryItemId"/> </call-service> <!-- instead of updating InventoryItem, add an InventoryItemDetail for new Target InventoryItem --> @@ -407,11 +407,11 @@ <!-- instead of updating InventoryItem, add an InventoryItemDetail --> <clear-field field="createNonOisgirDetailMap"/> <set from-field="inventoryItem.inventoryItemId" field="createNonOisgirDetailMap.inventoryItemId"/> - <calculate field-name="createNonOisgirDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="currentQuantityToMove" operator="negative"/> + <calculate field="createNonOisgirDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="currentQuantityToMove" operator="negative"/> </calculate> - <calculate field-name="createNonOisgirDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="currentQuantityToMove" operator="negative"/> + <calculate field="createNonOisgirDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="currentQuantityToMove" operator="negative"/> </calculate> <call-service service-name="createInventoryItemDetail" in-map-name="createNonOisgirDetailMap"/> @@ -480,7 +480,7 @@ --> <set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/> <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList"> - <get-related-one value-name="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-name="orderItemShipGrpInvRes"/> + <get-related-one value-name="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-field="orderItemShipGrpInvRes"/> <!-- see if there is enough physically moved over to move this reservation --> <!-- note that we need to check this because if there was a reservation against an @@ -490,9 +490,9 @@ <clear-field field="reservedQuantityLeftOver"/> <if-compare-field field="quantityLeftToProcess" to-field="orderItemShipGrpInvRes.quantity" operator="less" type="Double"> <!-- the complicated part: can split up the OISGIR (reservation) into two parts, and then transfer the inventory, somewhat complicated... --> - <calculate field-name="reservedQuantityLeftOver" type="Double"> - <calcop field-name="orderItemShipGrpInvRes.quantity" operator="get"/> - <calcop field-name="quantityLeftToProcess" operator="negative"/> + <calculate field="reservedQuantityLeftOver" type="Double"> + <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/> + <calcop field="quantityLeftToProcess" operator="negative"/> </calculate> <set from-field="quantityLeftToProcess" field="currentQuantityToMove"/> @@ -521,9 +521,9 @@ </and> </condition> <then> - <calculate field-name="quantityNotAvailableToMove"> - <calcop field-name="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/> - <calcop field-name="reservedQuantityLeftOver" operator="negative"/> + <calculate field="quantityNotAvailableToMove"> + <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/> + <calcop field="reservedQuantityLeftOver" operator="negative"/> </calculate> </then> <else> @@ -541,11 +541,11 @@ <clear-field field="createOisgirTargetDetailMap"/> <set from-field="inventoryItem.inventoryItemId" field="createOisgirDetailMap.inventoryItemId"/> <set from-field="targetInventoryItem.inventoryItemId" field="createOisgirTargetDetailMap.inventoryItemId"/> - <calculate field-name="createOisgirDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="currentQuantityToMove" operator="negative"/> + <calculate field="createOisgirDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="currentQuantityToMove" operator="negative"/> </calculate> - <calculate field-name="createOisgirTargetDetailMap.quantityOnHandDiff" type="Double"> - <calcop field-name="currentQuantityToMove" operator="get"/> + <calculate field="createOisgirTargetDetailMap.quantityOnHandDiff" type="Double"> + <calcop field="currentQuantityToMove" operator="get"/> </calculate> <!-- @@ -556,11 +556,11 @@ <!-- if the OISGIR has a quantityNotAvailable, move that over by adding it to the origin, and subtracting it from the target --> <if-not-empty field="orderItemShipGrpInvRes.quantityNotAvailable"> <if-compare field="orderItemShipGrpInvRes.quantityNotAvailable" operator="greater" value="0" type="Double"> - <calculate field-name="createOisgirDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="quantityNotAvailableToMove" operator="get"/> + <calculate field="createOisgirDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="quantityNotAvailableToMove" operator="get"/> </calculate> - <calculate field-name="createOisgirTargetDetailMap.availableToPromiseDiff" type="Double"> - <calcop field-name="quantityNotAvailableToMove" operator="negative"/> + <calculate field="createOisgirTargetDetailMap.availableToPromiseDiff" type="Double"> + <calcop field="quantityNotAvailableToMove" operator="negative"/> </calculate> </if-compare> </if-not-empty> @@ -573,13 +573,13 @@ <if-empty field="reservedQuantityLeftOver"> <remove-value value-name="orderItemShipGrpInvRes"/> <else> - <calculate field-name="orderItemShipGrpInvRes.quantity" type="Double"> - <calcop field-name="orderItemShipGrpInvRes.quantity" operator="get"/> - <calcop field-name="reservedQuantityLeftOver" operator="negative"/> + <calculate field="orderItemShipGrpInvRes.quantity" type="Double"> + <calcop field="orderItemShipGrpInvRes.quantity" operator="get"/> + <calcop field="reservedQuantityLeftOver" operator="negative"/> </calculate> - <calculate field-name="orderItemShipGrpInvRes.quantityNotAvailable" type="Double"> - <calcop field-name="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/> - <calcop field-name="quantityNotAvailableToMove" operator="negative"/> + <calculate field="orderItemShipGrpInvRes.quantityNotAvailable" type="Double"> + <calcop field="orderItemShipGrpInvRes.quantityNotAvailable" operator="get"/> + <calcop field="quantityNotAvailableToMove" operator="negative"/> </calculate> <store-value value-name="orderItemShipGrpInvRes"/> </else> @@ -588,13 +588,13 @@ <set value="Y" field="haveSetIiDetail"/> <!-- deduct the orderItemShipGrpInvRes.quantity from quantityLeftToProcess --> - <calculate field-name="quantityLeftToProcess" type="Double"> - <calcop field-name="quantityLeftToProcess" operator="get"/> - <calcop field-name="currentQuantityToMove" operator="negative"/> + <calculate field="quantityLeftToProcess" type="Double"> + <calcop field="quantityLeftToProcess" operator="get"/> + <calcop field="currentQuantityToMove" operator="negative"/> </calculate> - <calculate field-name="remainingQuantityOnHand" type="Double"> - <calcop field-name="remainingQuantityOnHand" operator="subtract"/> - <calcop field-name="currentQuantityToMove" operator="negative"/> + <calculate field="remainingQuantityOnHand" type="Double"> + <calcop field="remainingQuantityOnHand" operator="subtract"/> + <calcop field="currentQuantityToMove" operator="negative"/> </calculate> <!-- part of the following log data prep: <refresh-value value-name="targetInventoryItem"/> --> <!-- <log level="info" message="Just update targetInventoryItem from OISGIR [${targetInventoryItem}]"/> --> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -30,7 +30,7 @@ <make-value value-field="productDimension" entity-name="ProductDimension"/> <set-nonpk-fields map="product" value-field="productDimension"/> - <get-related-one value-name="product" relation-name="ProductType" to-value-name="productType"/> + <get-related-one value-name="product" relation-name="ProductType" to-value-field="productType"/> <set field="productDimension.productType" from-field="productType.description"/> <field-to-result field="productDimension"/> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -107,7 +107,7 @@ <simple-method method-name="createSimpleTextContentForAlternateLocale" short-description="Create Simple Text Content For Alternate Locale"> <set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/> <call-service service-name="createSimpleTextContent" in-map="createSimpleTextMap"> - <result-to-field result-name="contentId" field-name="createContentAssocMap.contentIdTo"/> + <result-to-field result-name="contentId" field="createContentAssocMap.contentIdTo"/> </call-service> <set field="createContentAssocMap.contentId" from-field="parameters.mainContentId"/> <set field="createContentAssocMap.contentAssocTypeId" value="ALTERNATE_LOCALE"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |