You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/31 12:00:52 UTC
svn commit: r730373 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/ecommerce/script/org/ofbiz/ecommerce/customer/
applications/manufacturing/scrip...
Author: jleroux
Date: Wed Dec 31 03:00:51 2008
New Revision: 730373
URL: http://svn.apache.org/viewvc?rev=730373&view=rev
Log:
Reverted 730372 : an error realted to calculate tag has slipped in
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryReserveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml Wed Dec 31 03:00:51 2008
@@ -332,7 +332,7 @@
<!-- we do this by first calculating a postingAmount (positive or negative) then adding to the postingBalance -->
<clear-field field="postingAmount"/>
<!-- use the parent of the GlAccountClass, which should either be DEBIT or CREDIT -->
- <get-related-one relation-name="GlAccountClass" value-field="glAccount" to-value-field="glAccountClass"/>
+ <get-related-one relation-name="GlAccountClass" value-name="glAccount" to-value-field="glAccountClass"/>
<get-related-one relation-name="ParentGlAccountClass" value-field="glAccountClass" to-value-field="parentGlAccountClass"/>
<!-- test if the account is a DEBIT account -->
<set field="isDebit" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/>
@@ -402,7 +402,7 @@
<!-- update GlAccountHistory's debit and credit totals -->
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
- <calculate field="postedDebits" map-name="glAccountHistory" type="BigDecimal">
+ <calculate field="glAccountHistory" type="BigDecimal.postedDebits" >
<calcop operator="add">
<calcop operator="get" field="amount" map-name="acctgTransEntry"/>
<calcop operator="get" field="postedDebits" map-name="glAccountHistory"/>
@@ -410,7 +410,7 @@
</calculate>
<else>
<if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
- <calculate field="postedCredits" map-name="glAccountHistory" type="BigDecimal">
+ <calculate field="glAccountHistory" type="BigDecimal.postedCredits" >
<calcop operator="add">
<calcop operator="get" field="amount" map-name="acctgTransEntry"/>
<calcop operator="get" field="postedCredits" map-name="glAccountHistory"/>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Wed Dec 31 03:00:51 2008
@@ -202,7 +202,7 @@
<call-service service-name="removePaymentApplication" in-map-name="removePaymentApplicationMap"/>
</iterate>
<!-- if new status is cancelled and the payment is associated to an OrderPaymentPreference, update the status of that record too. -->
- <get-related-one value-field="payment" relation-name="OrderPaymentPreference" to-value-field="orderPaymentPreference"/>
+ <get-related-one value-name="payment" relation-name="OrderPaymentPreference" to-value-field="orderPaymentPreference"/>
<if-not-empty field="orderPaymentPreference">
<set field="updateOrderPaymentPreferenceMap.orderPaymentPreferenceId" from-field="orderPaymentPreference.orderPaymentPreferenceId"/>
<set field="updateOrderPaymentPreferenceMap.cancelThis" value="true"/>
@@ -260,7 +260,7 @@
<set field="remainingAppliedAmount" from-field="invoiceTotalAmountPaid" type="BigDecimal"/>
<set field="computedTotalAmount" value="0.0" type="BigDecimal"/>
<iterate list="invoiceTerms" entry="invoiceTerm">
- <get-related-one relation-name="TermType" value-field="invoiceTerm" to-value-field="termType" use-cache="true"/>
+ <get-related-one relation-name="TermType" value-name="invoiceTerm" to-value-field="termType" use-cache="true"/>
<if-compare field="termType.parentTypeId" operator="equals" value="FIN_PAYMENT_TERM">
<clear-field field="invoicePaymentInfo"/>
<set field="invoicePaymentInfo.invoiceId" from-field="invoice.invoiceId"/>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Wed Dec 31 03:00:51 2008
@@ -412,7 +412,7 @@
<find-by-primary-key map="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-field="storeEmail"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<!-- prepare the email context -->
- <get-related-one value-field="createdUserLogin" relation-name="Person" to-value-field="personObj"/>
+ <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-field="personObj"/>
<set from-field="createdUserLogin" field="emailCtx.userLogin"/>
<set from-field="personObj" field="emailCtx.person"/>
<!-- prepare the notification service context -->
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31 03:00:51 2008
@@ -219,7 +219,7 @@
<clear-field field="createDetailMap"/>
</else>
</if-not-empty>
- <calculate field="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
+ <calculate field="parameters.quantityNotIssued" ><number value="0"/></calculate>
</if-compare>
<if-not-empty field="workEffortGoodStandard">
<entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign">
@@ -253,7 +253,7 @@
<!-- create ItemIssuance record -->
<set from-field="parameters.workEffortId" field="issuanceCreateMap.workEffortId"/>
<set from-field="inventoryItem.inventoryItemId" field="issuanceCreateMap.inventoryItemId"/>
- <calculate field="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
+ <calculate field="issuanceCreateMap.quantity" ><number value="1"/></calculate>
<call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
<clear-field field="issuanceCreateMap"/>
@@ -312,7 +312,7 @@
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
- <calculate field="quantityNotIssued" map-name="parameters">
+ <calculate field="parameters.quantityNotIssued" >
<calcop operator="subtract" field="parameters.quantityNotIssued">
<calcop operator="get" field="parameters.deductAmount"/>
</calcop>
@@ -344,7 +344,7 @@
<!-- create ItemIssuance record -->
<set field="issuanceCreateMap.workEffortId" from-field="parameters.workEffortId"/>
<set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
- <calculate field="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
+ <calculate field="issuanceCreateMap.quantity" ><number value="1"/></calculate>
<call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
<field-to-result field="issuanceCreateMap.quantity" result-name="quantityIssued"/>
</if-compare>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Wed Dec 31 03:00:51 2008
@@ -149,7 +149,7 @@
<get-related list="returnItems" relation-name="ReturnItem" value-field="returnHeader"/>
<log level="info" message="Return items lists are : ${returnItems}"/>
<iterate list="returnItems" entry="returnItem">
- <get-related-one relation-name="OrderHeader" value-field="returnItem" to-value-field="orderHeader"/>
+ <get-related-one relation-name="OrderHeader" value-name="returnItem" to-value-field="orderHeader"/>
<set field="trackingCodeOrderFindContext.orderId" from-field="orderHeader.orderId"/>
<!-- set field="trackingCodeOrderFindContext.trackingCodeTypeId" value="PARTNER_MGD"/-->
<!-- get the siteId ,trackingCodeId from TrackingCodeOrder -->
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Wed Dec 31 03:00:51 2008
@@ -388,8 +388,8 @@
<set value="1" field="newEntity.returnItemSeqId"/>
<else>
<first-from-list entry="newestItem" list="currentItems"/>
- <calculate field="newEntity" type="Integer.returnItemSeqId" >
- <calcop field="newestItem" operator="add.returnItemSeqId" >
+ <calculate field="returnItemSeqId" map-name="newEntity" type="Integer">
+ <calcop field="returnItemSeqId" map-name="newestItem" operator="add">
<number value="1"/>
</calcop>
</calculate>
@@ -539,11 +539,11 @@
<find-by-and entity-name="ShipmentReceipt" map="lookupPKMap" list="shipmentReceipts"/>
<iterate list="shipmentReceipts" entry="receipt">
<if-empty field="totalsMap.${receipt.returnItemSeqId}">
- <calculate field="totalsMap.${receipt.returnItemSeqId}" >
+ <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap">
<number value="0"/>
</calculate>
</if-empty>
- <calculate field="totalsMap" type="Double.${receipt.returnItemSeqId}" >
+ <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap" type="Double">
<calcop field="${receipt.returnItemSeqId}" map-name="totalsMap" operator="add">
<calcop field="quantityAccepted" map-name="receipt" operator="get"/>
<calcop field="quantityRejected" map-name="receipt" operator="get"/>
@@ -598,7 +598,7 @@
This activates SECAS such as creating return invoices. This MUST be done before updating the return header so that
the ReturnItemBillings are created and then whatever SECA binds to the return header update will have them. . -->
<iterate list="shipmentReceipts" entry="receipt">
- <get-related-one relation-name="Shipment" value-field="receipt" to-value-field="shipment"/>
+ <get-related-one relation-name="Shipment" value-name="receipt" to-value-field="shipment"/>
<if-not-empty field="shipment.shipmentId">
<if-compare field="shipment.statusId" operator="not-equals" value="RETURN_RECEIVED">
<set field="serviceInput.shipmentId" from-field="shipment.shipmentId"/>
@@ -675,7 +675,7 @@
<set from-field="returnHeaderTypeId" field="createHeaderCtx.returnHeaderTypeId"/>
<!-- get the return to party for customer return and return from party for vendor return from the product store -->
- <get-related-one relation-name="ProductStore" value-field="orderHeader" to-value-field="productStore"/>
+ <get-related-one relation-name="ProductStore" value-name="orderHeader" to-value-field="productStore"/>
<if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
<set field="createHeaderCtx.fromPartyId" from-field="orderRole.partyId"/>
<set field="createHeaderCtx.toPartyId" from-field="productStore.payToPartyId"/>
@@ -897,7 +897,7 @@
</condition>
<then>
<!-- get the returned order item -->
- <get-related-one value-field="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
+ <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
<!-- get the order items of the replacement order associated to the returned item -->
<set field="oiaMap.orderItemAssocTypeId" value="REPLACEMENT"/>
<get-related value-field="orderItem" relation-name="FromOrderItemAssoc" map-name="oiaMap" list="replacementOrderItems"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Wed Dec 31 03:00:51 2008
@@ -187,7 +187,7 @@
<set field="postalAddressBoundaryLookupMap.geoId" from-field="parameters.geoId"/>
<find-by-and entity-name="PostalAddressBoundary" map="postalAddressBoundaryLookupMap" list="postalAddressBoundaries"/>
<iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
- <get-related-one value-field="postalAddressBoundary" to-value-field="geo" relation-name="Geo"/>
+ <get-related-one value-name="postalAddressBoundary" to-value-field="geo" relation-name="Geo"/>
<field-to-list field="geo" list="geos"/>
</iterate>
<field-to-result field="geos"/>
@@ -450,7 +450,7 @@
<find-by-and entity-name="PartyRelationship" map="lookupMap" list="partyRelationships"/>
<iterate list="partyRelationships" entry="partyRelationship">
- <get-related-one value-field="partyRelationship" relation-name="ToParty" to-value-field="party"/>
+ <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-field="party"/>
<field-to-list field="party" list="parties"/>
</iterate>
<if-not-empty field="parties">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml Wed Dec 31 03:00:51 2008
@@ -166,7 +166,7 @@
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
<clear-field field="telecomNumber"/>
- <get-related-one value-field="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
+ <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
<assert>
<not><if-empty field="telecomNumber"/></not>
<if-compare-field field="telecomNumber.areaCode" to-field="serviceCtx.areaCode" operator="equals"/>
@@ -190,7 +190,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/>
</assert>
- <get-related-one value-field="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
+ <get-related-one value-name="contactMech" relation-name="TelecomNumber" to-value-field="telecomNumber"/>
<assert>
<not><if-empty field="telecomNumber"/></not>
<if-compare-field field="telecomNumber.contactNumber" to-field="serviceCtx.contactNumber" operator="equals"/>
@@ -235,7 +235,7 @@
<if-compare-field field="contactMechId" to-field="serviceCtx.contactMechId" operator="equals"/>
</assert>
<clear-field field="postalAddress"/>
- <get-related-one value-field="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
+ <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
<assert>
<not><if-empty field="postalAddress"/></not>
<if-compare-field field="postalAddress.address1" to-field="serviceCtx.address1" operator="equals"/>
@@ -261,7 +261,7 @@
<not><if-empty field="contactMech"/></not>
<if-compare-field field="newContactMechId" to-field="serviceCtx.contactMechId" operator="not-equals"/>
</assert>
- <get-related-one value-field="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
+ <get-related-one value-name="contactMech" relation-name="PostalAddress" to-value-field="postalAddress"/>
<assert>
<not><if-empty field="postalAddress"/></not>
<if-compare-field field="postalAddress.stateProvinceGeoId" to-field="serviceCtx.stateProvinceGeoId" operator="equals"/>
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
@@ -138,7 +138,7 @@
</if-not-empty>
<if-not-empty field="rollups">
<iterate list="rollups" entry="parent">
- <get-related-one relation-name="CurrentProductCategory" value-field="parent" to-value-field="currentProductCategory"/>
+ <get-related-one relation-name="CurrentProductCategory" value-name="parent" to-value-field="currentProductCategory"/>
<field-to-list list="subCategories" field="currentProductCategory"/>
</iterate>
<if-not-empty field="subCategories">
@@ -286,7 +286,7 @@
</if-not-empty>
<!-- Case For virtual Product -->
<!-- get related assoc product -->
- <get-related-one relation-name="Product" value-field="productCategoryMember" to-value-field="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"/>
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
@@ -192,7 +192,7 @@
<entity-one entity-name="WorkEffort" value-field="task"/>
<if-not-empty field="task">
- <get-related-one value-field="task" relation-name="FixedAsset" to-value-field="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-field="fixedAsset" relation-name="FixedAssetStdCost" map-name="costsAndMap" list="setupCosts"/>
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
@@ -186,7 +186,7 @@
</else>
</if-not-empty>
- <calculate field="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
+ <calculate field="parameters.quantityNotIssued" ><number value="0"/></calculate>
</if-compare>
</if-not-empty>
</simple-method>
@@ -204,7 +204,7 @@
<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="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
+ <calculate field="issuanceCreateMap.quantity" ><number value="1"/></calculate>
<call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap"/>
<clear-field field="issuanceCreateMap"/>
@@ -258,7 +258,7 @@
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
- <calculate field="quantityNotIssued" map-name="parameters">
+ <calculate field="parameters.quantityNotIssued" >
<calcop operator="subtract" field="parameters.quantityNotIssued">
<calcop operator="get" field="parameters.deductAmount"/>
</calcop>
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
@@ -170,7 +170,7 @@
<clear-field field="createDetailMap"/>
<!-- get the promiseDatetime -->
- <get-related-one value-field="lastNonSerInventoryItem" relation-name="ProductFacility" to-value-field="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">
@@ -235,7 +235,7 @@
<clear-field field="createDetailMap"/>
<!-- get the promiseDatetime -->
- <get-related-one value-field="newNonSerInventoryItem" relation-name="ProductFacility" to-value-field="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">
@@ -450,8 +450,8 @@
<call-service service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
<clear-field field="reserveOisgirMap"/>
- <calculate field="parameters.quantityNotReserved" >
- <calcop operator="subtract" field="parameters.quantityNotReserved" >
+ <calculate field="quantityNotReserved" map-name="parameters">
+ <calcop operator="subtract" field="quantityNotReserved" map-name="parameters">
<calcop operator="get" field="deductAmount" map-name="parameters"/>
</calcop>
</calculate>
@@ -466,7 +466,7 @@
<simple-method method-name="getPromisedDateTime" short-description="Get Inventory Promised Date/Time">
<!-- get the promiseDatetime -->
- <get-related-one value-field="inventoryItem" relation-name="ProductFacility" to-value-field="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 -->
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="inventoryItem" relation-name="Facility" to-value-field="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">
@@ -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-field="lookedUpValue" relation-name="Facility" to-value-field="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="getAssoc" list="assocs"/>
<filter-list-by-date list-name="assocs" to-list-name="assocsDate"/>
<first-from-list entry="assoc" list="assocsDate"/>
- <get-related-one value-field="assoc" relation-name="MainProduct" to-value-field="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>
@@ -1259,7 +1259,7 @@
<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-field="itemIssuance" relation-name="OrderHeader" to-value-field="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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
@@ -89,7 +89,7 @@
<else>
<!-- should generally only be one pick/primary location, just choose the first... -->
<first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/>
- <get-related-one value-field="productFacilityLocationView" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationTo"/>
+ <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) -->
@@ -251,10 +251,10 @@
</condition>
<then>
<if-compare-field field="productFacilityLocationQuantityTest.productId" to-field="productSave.productId" operator="not-equals">
- <get-related-one value-field="productFacilityLocationQuantityTest" relation-name="Product" to-value-field="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-field="productFacilityLocationQuantityTest" relation-name="FacilityLocation" to-value-field="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">
@@ -302,7 +302,7 @@
<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-field="InventoryItemAndLocation" relation-name="FacilityLocation" to-value-field="moveInfo.facilityLocationFrom"/>
+ <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"/>
@@ -480,7 +480,7 @@
-->
<set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/>
<iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
- <get-related-one value-field="orderItemShipGrpInvResAndItemLocation" relation-name="OrderItemShipGrpInvRes" to-value-field="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
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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="product" relation-name="ProductType" to-value-field="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/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Dec 31 03:00:51 2008
@@ -38,7 +38,7 @@
<create-value value-field="newEntity"/>
<!-- if the InventoryItem issued is serialized, then change its status to DELIVERED -->
- <get-related-one value-field="newEntity" relation-name="InventoryItem" to-value-field="inventoryItem"/>
+ <get-related-one value-name="newEntity" relation-name="InventoryItem" to-value-field="inventoryItem"/>
<if-not-empty field="inventoryItem">
<if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
<set field="updateContext.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
@@ -296,8 +296,8 @@
<set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
<find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
<else>
- <calculate field="shipmentItem.quantity" >
- <calcop operator="add" field="shipmentItem.quantity" >
+ <calculate field="quantity" map-name="shipmentItem">
+ <calcop operator="add" field="quantity" map-name="shipmentItem">
<calcop operator="get" field="quantity" map-name="parameters"/>
</calcop>
</calculate>
@@ -420,7 +420,7 @@
<entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<get-related-one value-field="itemIssuance" relation-name="OrderHeader" to-value-field="orderHeader"/>
<get-related-one value-field="itemIssuance" relation-name="InventoryItem" to-value-field="inventoryItem"/>
- <get-related-one value-field="itemIssuance" relation-name="Shipment" to-value-field="shipment"/>
+ <get-related-one value-name="itemIssuance" relation-name="Shipment" to-value-field="shipment"/>
<!-- issuance can be canceled only if the sales shipment is not packed -->
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Wed Dec 31 03:00:51 2008
@@ -129,13 +129,13 @@
<set value="Y" field="allPickStarted"/>
<set value="N" field="hasStockToPick"/>
<iterate entry="orderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
- <get-related-one value-field="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-field="orderItem"/>
+ <get-related-one value-name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-field="orderItem"/>
<if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
<set value="N" field="pickThisOrder"/>
</if-compare>
<if-compare field="pickThisOrder" operator="equals" value="Y">
- <get-related-one value-field="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-field="inventoryItem"/>
+ <get-related-one value-name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-field="inventoryItem"/>
<!-- Look for other picklists which might include this order item ship group inventory reservation. If it is on another picklist, then
we should not include it again. We screen out picklists which are either cancelled or already picked or packed, so that we can re-pick items if
(1) the previous picklist was cancelled, or
@@ -199,7 +199,7 @@
</if>
<!-- check InventoryItem->FacilityLocation (if exists), if it is of type FLT_BULK set needs stock move to true -->
- <get-related-one value-field="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
+ <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
<if-not-empty field="facilityLocation">
<if-compare field="facilityLocation.locationTypeEnumId" operator="equals" value="FLT_BULK">
<set value="Y" field="needsStockMove"/>
@@ -258,7 +258,7 @@
<!-- put in pick or move lists for the given shipmentMethodTypeId -->
<set from-field="orderItemShipGroup.shipmentMethodTypeId" field="shipmentMethodTypeId"/>
<if-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}">
- <get-related-one value-field="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.shipmentMethodType"/>
+ <get-related-one value-name="orderItemShipGroup" relation-name="ShipmentMethodType" to-value-field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.shipmentMethodType"/>
</if-empty>
<if-compare field="needsStockMove" operator="equals" value="Y">
<field-to-list field="orderHeaderInfo" list="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
@@ -386,7 +386,7 @@
<clear-field field="orderItemInfo"/>
<set field="orderItemInfo.orderItemAndShipGroupAssoc" from-field="orderItemAndShipGroupAssoc"/>
<set field="orderItemInfo.orderItemShipGrpInvResList" from-field="perItemResListValid"/>
- <get-related-one value-field="orderItemAndShipGroupAssoc" relation-name="Product" to-value-field="orderItemInfo.product" use-cache="true"/>
+ <get-related-one value-name="orderItemAndShipGroupAssoc" relation-name="Product" to-value-field="orderItemInfo.product" use-cache="true"/>
<set field="orderItemInfoList[]" from-field="orderItemInfo"/>
</if-not-empty>
<clear-field field="perItemResListValid"/>
@@ -1028,7 +1028,7 @@
<get-related value-field="picklist" relation-name="PicklistRole" list="picklistRoleList"/>
<iterate entry="picklistRole" list="picklistRoleList">
<clear-field field="picklistRoleInfo"/>
- <get-related-one value-field="picklistRole" relation-name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
+ <get-related-one value-name="picklistRole" relation-name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
<get-related-one value-field="picklistRole" relation-name="RoleType" to-value-field="picklistRoleInfo.roleType" use-cache="true"/>
<set from-field="picklistRole" field="picklistRoleInfo.picklistRole"/>
<field-to-list field="picklistRoleInfo" list="picklistRoleInfoList"/>
@@ -1038,7 +1038,7 @@
<get-related value-field="picklist" relation-name="PicklistStatusHistory" list="picklistStatusHistoryList"/>
<iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
<clear-field field="picklistStatusHistoryInfo"/>
- <get-related-one value-field="picklistStatusHistory" relation-name="StatusItem" to-value-field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
+ <get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
<get-related-one value-field="picklistStatusHistory" relation-name="ToStatusItem" to-value-field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
<set from-field="picklistStatusHistory" field="picklistStatusHistoryInfo.picklistStatusHistory"/>
<field-to-list field="picklistStatusHistoryInfo" list="picklistStatusHistoryInfoList"/>
@@ -1051,16 +1051,16 @@
<get-related value-field="picklist" relation-name="PicklistBin" list-name="picklistBinList" order-by-list="picklistBinOrderList"/>
<iterate entry="picklistBin" list="picklistBinList">
<clear-field field="picklistBinInfo"/>
- <get-related-one value-field="picklistBin" relation-name="PrimaryOrderHeader" to-value-field="picklistBinInfo.primaryOrderHeader"/>
+ <get-related-one value-name="picklistBin" relation-name="PrimaryOrderHeader" to-value-field="picklistBinInfo.primaryOrderHeader"/>
<get-related-one value-field="picklistBin" relation-name="PrimaryOrderItemShipGroup" to-value-field="picklistBinInfo.primaryOrderItemShipGroup"/>
<clear-field field="picklistItemInfoList"/>
<get-related value-field="picklistBin" relation-name="PicklistItem" list="picklistItemList" use-cache="true"/>
<iterate entry="picklistItem" list="picklistItemList">
<clear-field field="picklistItemInfo"/>
- <get-related-one value-field="picklistItem" relation-name="OrderItem" to-value-field="picklistItemInfo.orderItem"/>
+ <get-related-one value-name="picklistItem" relation-name="OrderItem" to-value-field="picklistItemInfo.orderItem"/>
<get-related-one value-field="picklistItemInfo.orderItem" relation-name="Product" to-value-field="picklistItemInfo.product"/>
- <get-related-one value-field="picklistItem" relation-name="InventoryItemAndLocation" to-value-field="picklistItemInfo.inventoryItemAndLocation"/>
+ <get-related-one value-name="picklistItem" relation-name="InventoryItemAndLocation" to-value-field="picklistItemInfo.inventoryItemAndLocation"/>
<get-related-one value-field="picklistItem" relation-name="OrderItemShipGrpInvRes" to-value-field="picklistItemInfo.orderItemShipGrpInvRes"/>
<get-related value-field="picklistItem" relation-name="ItemIssuance" list="picklistItemInfo.itemIssuanceList"/>
<set from-field="picklistItem" field="picklistItemInfo.picklistItem"/>
@@ -1079,9 +1079,9 @@
<set from-field="picklistStatusHistoryInfoList" field="picklistInfo.picklistStatusHistoryInfoList"/>
<set from-field="picklistBinInfoList" field="picklistInfo.picklistBinInfoList"/>
<string-to-list string="sequenceId" list-name="orderBy"/>
- <get-related-one value-field="picklist" relation-name="StatusItem" to-value-field="picklistInfo.statusItem" use-cache="true"/>
+ <get-related-one value-name="picklist" relation-name="StatusItem" to-value-field="picklistInfo.statusItem" use-cache="true"/>
<get-related-one value-field="picklist" relation-name="Facility" to-value-field="picklistInfo.facility" use-cache="true"/>
- <get-related-one value-field="picklist" relation-name="ShipmentMethodType" to-value-field="picklistInfo.shipmentMethodType" use-cache="true"/>
+ <get-related-one value-name="picklist" relation-name="ShipmentMethodType" to-value-field="picklistInfo.shipmentMethodType" use-cache="true"/>
<get-related value-field="picklist" relation-name="StatusValidChangeToDetail" order-by-list="orderBy" list="picklistInfo.statusValidChangeToDetailList"/>
</simple-method>
@@ -1143,7 +1143,7 @@
<!-- create a list of locations, then sort it, will have to create a reverse Map to go from location to inventory item -->
<clear-field field="facilityLocation"/>
- <get-related-one value-field="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
+ <get-related-one value-name="inventoryItem" relation-name="FacilityLocation" to-value-field="facilityLocation"/>
<if-not-empty field="facilityLocation">
<set from-field="facilityLocation" field="facilityLocationMap.${facilityLocation.locationSeqId}"/>
<!-- support multiple invnetoryItemIds per facilityLocation.locationSeqId -->
@@ -1184,7 +1184,7 @@
<set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
+ <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
<get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
<field-to-list field="inventoryItemInfo" list="inventoryItemInfoList"/>
@@ -1221,7 +1221,7 @@
<set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
<set from-field="inventoryItemOrderItems.${inventoryItemId}" field="inventoryItemInfo.orderItems"/>
<set from-field="inventoryItemQuantities.${inventoryItemId}" field="inventoryItemInfo.quantity"/>
- <get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
+ <get-related-one value-name="inventoryItemInfo.inventoryItem" relation-name="Product" to-value-field="inventoryItemInfo.product"/>
<get-related-one value-field="inventoryItemInfo.inventoryItem" relation-name="StatusItem" to-value-field="inventoryItemInfo.statusItem"/>
<set from-field="inventoryItemInfo" field="inventoryItemInfoList[]"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml Wed Dec 31 03:00:51 2008
@@ -215,7 +215,7 @@
<!-- if no inventory item type specified, get default from facility -->
<if-empty field="parameters.inventoryItemTypeId">
- <get-related-one value-field="returnHeader" relation-name="Facility" to-value-field="facility"/>
+ <get-related-one value-name="returnHeader" relation-name="Facility" to-value-field="facility"/>
<set from-field="facility.defaultInventoryItemTypeId" field="parameters.inventoryItemTypeId"/>
</if-empty>
@@ -243,7 +243,7 @@
<if-empty field="returnItem.expectedItemStatus">
<set value="INV_RETURNED" field="returnItem.expectedItemStatus" type="String"/>
</if-empty>
- <get-related-one value-field="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
+ <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
<if-not-empty field="orderItem.productId">
<set field="costCtx.returnItemSeqId" from-field="returnItem.returnItemSeqId"/>
<set field="costCtx.returnId" from-field="returnItem.returnId"/>
@@ -258,7 +258,7 @@
<condition-expr field-name="inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM"/>
</condition-list>
</entity-count>
- <get-related-one value-field="returnHeader" relation-name="Facility" to-value-field="destinationFacility"/>
+ <get-related-one value-name="returnHeader" relation-name="Facility" to-value-field="destinationFacility"/>
<set field="setNonSerial" value="false"/>
<if-compare field="destinationFacility.defaultInventoryItemTypeId" value="NON_SERIAL_INV_ITEM" operator="equals">
<if-compare field="serializedItemCount" value="0" operator="equals">
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Dec 31 03:00:51 2008
@@ -1257,7 +1257,7 @@
</or>
</condition>
<then>
- <get-related-one relation-name="StatusItem" value-field="testShipment" to-value-field="testShipmentStatus"/>
+ <get-related-one relation-name="StatusItem" value-name="testShipment" to-value-field="testShipmentStatus"/>
<string-to-list string="Cannot perform operation ${operationName} when the shipment is in the ${testShipmentStatus.description} [${testShipment.statusId}] status." list="error_list"/>
</then>
</if>
@@ -1382,7 +1382,7 @@
<field-map field-name="shipGroupSeqId" from-field="parameters.shipGroupSeqId"/>
</entity-and>
<iterate entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
- <get-related-one relation-name="OrderItem" value-field="orderItemShipGroupAssoc" to-value-field="orderItem"/>
+ <get-related-one relation-name="OrderItem" value-name="orderItemShipGroupAssoc" to-value-field="orderItem"/>
<!-- Set the item status to completed -->
<set field="itemStatusContext.orderId" from-field="parameters.orderId"/>
@@ -1593,7 +1593,7 @@
<!-- make sure the OrderItem is for a Product that has a ProductType with isPhysical=Y -->
<if-not-empty field="itemProduct">
- <get-related-one value-field="itemProduct" relation-name="ProductType" to-value-field="itemProductType" use-cache="true"/>
+ <get-related-one value-name="itemProduct" relation-name="ProductType" to-value-field="itemProductType" use-cache="true"/>
<if-compare field="itemProductType.isPhysical" operator="equals" value="Y">
<!-- Create shipment item -->
<clear-field field="addOrderShipmentToShipmentCtx"/>
@@ -1620,7 +1620,7 @@
<make-value entity-name="OrderItemShipGrpInvRes" value-field="orderItemShipGrpInvResLookupPk"/>
<set-pk-fields value-field="orderItemShipGrpInvResLookupPk" map="parameters"/>
<find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-field="orderItemShipGrpInvRes"/>
- <get-related-one to-value-field="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
+ <get-related-one to-value-name="inventoryItem" relation-name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
<if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
<!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we want -->
<set-service-fields map="parameters" to-map="reserveAnInventoryItemCtx" service-name="reserveAnInventoryItem"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Wed Dec 31 03:00:51 2008
@@ -218,7 +218,7 @@
<get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/>
<if-not-empty field="custRequestWorkEfforts">
<first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
- <get-related-one value-field="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/>
+ <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/>
<if-not-empty field="custRequest">
<set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/>
</if-not-empty>
@@ -346,7 +346,7 @@
<set field="getRate.rateCurrencyUomId" from-field="parameters.currencyUomId"/>
<set field="getRate.rateTypeId" from-field="timeEntry.rateTypeId"/>
<if-empty field="timeEntry.partyId">
- <get-related-one value-field="timeEntry" relation-name="Timesheet" to-value-field="timesheet"/>
+ <get-related-one value-name="timeEntry" relation-name="Timesheet" to-value-field="timesheet"/>
<if-not-empty field="timesheet">
<set field="getRate.partyId" from-field="timesheet.partyId"/>
</if-not-empty>
@@ -380,7 +380,7 @@
</if-empty>
<!-- check if the status is in progress... -->
<if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="not-equals">
- <get-related-one value-field="timesheet" relation-name="StatusItem" to-value-field="statusItem"/>
+ <get-related-one value-name="timesheet" relation-name="StatusItem" to-value-field="statusItem"/>
<add-error><fail-message message="Can only update Timesheet, when status is in-process...current status: ${statusItem.description}"/></add-error>
<log level="info" message="Can only update Timesheet, when status is in-process...is now: ${timesheet.statusId}"/>
</if-compare>
Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Wed Dec 31 03:00:51 2008
@@ -47,7 +47,7 @@
<set value="hhFacility Receipt" field="receiveCtx.comments"/>
<set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/>
<set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/>
- <calculate field="quantityRejected" map-name="receiveCtx" type="Double">
+ <calculate field="receiveCtx" type="Double.quantityRejected" >
<number value="0"/>
</calculate>
<call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730373&r1=730372&r2=730373&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Dec 31 03:00:51 2008
@@ -484,7 +484,7 @@
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-one>
<if-not-empty field="task">
- <get-related-one value-field="task" relation-name="ParentWorkEffort" to-value-field="phase"/>
+ <get-related-one value-name="task" relation-name="ParentWorkEffort" to-value-field="phase"/>
<else>
<return/>
</else>
@@ -495,7 +495,7 @@
</entity-one>
</else>
</if-not-empty>
- <get-related-one value-field="phase" relation-name="ParentWorkEffort" to-value-field="project"/>
+ <get-related-one value-name="phase" relation-name="ParentWorkEffort" to-value-field="project"/>
<field-to-result field="project.workEffortId" result-name="projectId"/>
<field-to-result field="project.workEffortName" result-name="projectName"/>
<field-to-result field="phase.workEffortId" result-name="phaseId"/>
@@ -890,7 +890,7 @@
<!-- get the planned hours -->
<set field="lowInfo" from-field="task"/>
<set field="hoursPartyId" from-field="task.partyId"/>
- <get-related-one value-field="task" relation-name="WorkEffort" to-value-field="lowInfo"/>
+ <get-related-one value-name="task" relation-name="WorkEffort" to-value-field="lowInfo"/>
<call-simple-method method-name="getHours"/>
<set field="taskParty.plannedHours" from-field="highInfo.plannedHours"/>
<set field="taskParty.actualHours" from-field="highInfo.actualHours"/>
@@ -1034,7 +1034,7 @@
<if-not-empty field="actuals">
<iterate entry="actual" list="actuals">
<if-not-empty field="actual.hours">
- <get-related-one value-field="actual" relation-name="Timesheet" to-value-field="timesheet"/>
+ <get-related-one value-name="actual" relation-name="Timesheet" to-value-field="timesheet"/>
<!-- check if only a part of the registered hours need to be taken into account -->
<set field="originalActualHours" from-field="actual.hours"/>
Re: svn commit: r730373 - in /ofbiz/trunk: applications/accounting/script/org/ofbiz/accounting/ledger/ applications/accounting/script/org/ofbiz/accounting/payment/ applications/ecommerce/script/org/ofbiz/ecommerce/customer/ applications/manufacturing/scrip
Posted by Jacques Le Roux <ja...@les7arts.com>.
Yes, it has been done in r730374
Jacques
From: "David E Jones" <de...@me.com>
>
> There is still something really wrong here. These lines show it:
>
> - <calculate field="postedDebits" map- name="glAccountHistory" type="BigDecimal">
> + <calculate field="glAccountHistory" type="BigDecimal.postedDebits" >
>
> The old (-) line may actually work, but the new (+) line would definitely not... the value in the type attribute is pretty messed
> up... :)
>
> If this is a revert then I guess we need to revert further back...
>
> -David
>
>
> On Dec 31, 2008, at 4:00 AM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Wed Dec 31 03:00:51 2008
>> New Revision: 730373
>>
>> URL: http://svn.apache.org/viewvc?rev=730373&view=rev
>> Log:
>> Reverted 730372 : an error realted to calculate tag has slipped in
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ ledger/AcctgTransServices.xml
>> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ payment/PaymentServices.xml
>> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/ customer/CustomerEvents.xml
>> ofbiz/trunk/applications/manufacturing/script/org/ofbiz/ manufacturing/jobshopmgt/ProductionRunServices.xml
>> ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/ tracking/TrackingCodeServices.xml
>> ofbiz/trunk/applications/order/script/org/ofbiz/order/order/ OrderReturnServices.xml
>> ofbiz/trunk/applications/party/script/org/ofbiz/party/party/ PartyServices.xml
>> ofbiz/trunk/applications/party/script/org/ofbiz/party/test/ PartyTestServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/ CatalogServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/ CostServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/ inventory/InventoryIssueServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/ inventory/InventoryReserveServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/ inventory/InventoryServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/ inventory/StockMoveServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ ProductDimensionServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ issuance/IssuanceServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ picklist/PicklistServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ receipt/ShipmentReceiptServices.xml
>> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ shipment/ShipmentServices.xml
>> ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/ timesheet/TimesheetServices.xml
>> ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/ FacilityServices.xml
>> ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ ProjectServices.xml
>>
>> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/ accounting/ledger/AcctgTransServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ ledger/AcctgTransServices.xml (original)
>> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ ledger/AcctgTransServices.xml Wed Dec 31 03:00:51 2008
>> @@ -332,7 +332,7 @@
>> <!-- we do this by first calculating a postingAmount (positive or negative) then adding to the
>> postingBalance -->
>> <clear-field field="postingAmount"/>
>> <!-- use the parent of the GlAccountClass, which should either be DEBIT or CREDIT -->
>> - <get-related-one relation-name="GlAccountClass" value-field="glAccount" to-value-field="glAccountClass"/>
>> + <get-related-one relation-name="GlAccountClass" value-name="glAccount" to-value-field="glAccountClass"/>
>> <get-related-one relation- name="ParentGlAccountClass" value-field="glAccountClass" to-value-
>> field="parentGlAccountClass"/>
>> <!-- test if the account is a DEBIT account -->
>> <set field="isDebit" value="$ {bsh:org .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/>
>> @@ -402,7 +402,7 @@
>>
>> <!-- update GlAccountHistory's debit and credit totals -->
>> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
>> - <calculate field="postedDebits" map- name="glAccountHistory" type="BigDecimal">
>> + <calculate field="glAccountHistory" type="BigDecimal.postedDebits" >
>> <calcop operator="add">
>> <calcop operator="get" field="amount" map-name="acctgTransEntry"/>
>> <calcop operator="get" field="postedDebits" map-name="glAccountHistory"/>
>> @@ -410,7 +410,7 @@
>> </calculate>
>> <else>
>> <if-compare field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
>> - <calculate field="postedCredits" map- name="glAccountHistory" type="BigDecimal">
>> + <calculate field="glAccountHistory" type="BigDecimal.postedCredits" >
>> <calcop operator="add">
>> <calcop operator="get" field="amount" map-name="acctgTransEntry"/>
>> <calcop operator="get" field="postedCredits" map-name="glAccountHistory"/>
>>
>> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/ accounting/payment/PaymentServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ payment/PaymentServices.xml (original)
>> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ payment/PaymentServices.xml Wed Dec 31 03:00:51 2008
>> @@ -202,7 +202,7 @@
>> <call-service service- name="removePaymentApplication" in-map- name="removePaymentApplicationMap"/>
>> </iterate>
>> <!-- if new status is cancelled and the payment is associated to an OrderPaymentPreference, update the
>> status of that record too. -->
>> - <get-related-one value-field="payment" relation-name="OrderPaymentPreference" to-value-
>> field="orderPaymentPreference"/>
>> + <get-related-one value-name="payment" relation-name="OrderPaymentPreference" to-value-
>> field="orderPaymentPreference"/>
>> <if-not-empty field="orderPaymentPreference">
>> <set field="updateOrderPaymentPreferenceMap.orderPaymentPreferenceId"
>> from-field="orderPaymentPreference.orderPaymentPreferenceId"/>
>> <set field="updateOrderPaymentPreferenceMap.cancelThis" value="true"/>
>> @@ -260,7 +260,7 @@
>> <set field="remainingAppliedAmount" from- field="invoiceTotalAmountPaid" type="BigDecimal"/>
>> <set field="computedTotalAmount" value="0.0" type="BigDecimal"/>
>> <iterate list="invoiceTerms" entry="invoiceTerm">
>> - <get-related-one relation-name="TermType" value- field="invoiceTerm" to-value-field="termType" use-cache="true"/>
>> + <get-related-one relation-name="TermType" value- name="invoiceTerm" to-value-field="termType" use-cache="true"/>
>> <if-compare field="termType.parentTypeId" operator="equals" value="FIN_PAYMENT_TERM">
>> <clear-field field="invoicePaymentInfo"/>
>> <set field="invoicePaymentInfo.invoiceId" from- field="invoice.invoiceId"/>
>>
>> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ ecommerce/customer/CustomerEvents.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/ customer/CustomerEvents.xml (original)
>> +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/ customer/CustomerEvents.xml Wed Dec 31 03:00:51 2008
>> @@ -412,7 +412,7 @@
>> <find-by-primary-key map="storeEmailLookup" entity- name="ProductStoreEmailSetting" value-field="storeEmail"/>
>> <if-not-empty field="storeEmail.bodyScreenLocation">
>> <!-- prepare the email context -->
>> - <get-related-one value-field="createdUserLogin" relation-name="Person" to-value-field="personObj"/>
>> + <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-field="personObj"/>
>> <set from-field="createdUserLogin" field="emailCtx.userLogin"/>
>> <set from-field="personObj" field="emailCtx.person"/>
>> <!-- prepare the notification service context -->
>>
>> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/ manufacturing/jobshopmgt/ProductionRunServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/ manufacturing/jobshopmgt/ProductionRunServices.xml (original)
>> +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/ manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31
>> 03:00:51 2008
>> @@ -219,7 +219,7 @@
>> <clear-field field="createDetailMap"/>
>> </else>
>> </if-not-empty>
>> - <calculate field="quantityNotIssued" map- name="parameters"><number value="0"/></calculate>
>> + <calculate field="parameters.quantityNotIssued"
>> ><number value="0"/></calculate>
>> </if-compare>
>> <if-not-empty field="workEffortGoodStandard">
>> <entity-and list="issuances" entity- name="WorkEffortAndInventoryAssign">
>> @@ -253,7 +253,7 @@
>> <!-- create ItemIssuance record -->
>> <set from-field="parameters.workEffortId" field="issuanceCreateMap.workEffortId"/>
>> <set from-field="inventoryItem.inventoryItemId" field="issuanceCreateMap.inventoryItemId"/>
>> - <calculate field="quantity" map- name="issuanceCreateMap"><number value="1"/></calculate>
>> + <calculate field="issuanceCreateMap.quantity"
>> ><number value="1"/></calculate>
>> <call-service service- name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
>> <clear-field field="issuanceCreateMap"/>
>>
>> @@ -312,7 +312,7 @@
>> <call-service service- name="createInventoryItemDetail" in-map-name="createDetailMap"/>
>> <clear-field field="createDetailMap"/>
>>
>> - <calculate field="quantityNotIssued" map-name="parameters">
>> + <calculate field="parameters.quantityNotIssued" >
>> <calcop operator="subtract" field="parameters.quantityNotIssued">
>> <calcop operator="get" field="parameters.deductAmount"/>
>> </calcop>
>> @@ -344,7 +344,7 @@
>> <!-- create ItemIssuance record -->
>> <set field="issuanceCreateMap.workEffortId" from- field="parameters.workEffortId"/>
>> <set field="issuanceCreateMap.inventoryItemId" from- field="inventoryItem.inventoryItemId"/>
>> - <calculate field="quantity" map- name="issuanceCreateMap"><number value="1"/></calculate>
>> + <calculate field="issuanceCreateMap.quantity"
>> ><number value="1"/></calculate>
>> <call-service service- name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
>> <field-to-result field="issuanceCreateMap.quantity" result-name="quantityIssued"/>
>> </if-compare>
>>
>> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/ marketing/tracking/TrackingCodeServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/ tracking/TrackingCodeServices.xml (original)
>> +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/ tracking/TrackingCodeServices.xml Wed Dec 31 03:00:51 2008
>> @@ -149,7 +149,7 @@
>> <get-related list="returnItems" relation- name="ReturnItem" value-field="returnHeader"/>
>> <log level="info" message="Return items lists are : $ {returnItems}"/>
>> <iterate list="returnItems" entry="returnItem">
>> - <get-related-one relation-name="OrderHeader" value- field="returnItem" to-value-field="orderHeader"/>
>> + <get-related-one relation-name="OrderHeader" value- name="returnItem" to-value-field="orderHeader"/>
>> <set field="trackingCodeOrderFindContext.orderId" from-field="orderHeader.orderId"/>
>> <!-- set field="trackingCodeOrderFindContext.trackingCodeTypeId" value="PARTNER_MGD"/-->
>> <!-- get the siteId ,trackingCodeId from TrackingCodeOrder -->
>>
>> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/ order/OrderReturnServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/ OrderReturnServices.xml (original)
>> +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/ OrderReturnServices.xml Wed Dec 31 03:00:51 2008
>> @@ -388,8 +388,8 @@
>> <set value="1" field="newEntity.returnItemSeqId"/>
>> <else>
>> <first-from-list entry="newestItem" list="currentItems"/>
>> - <calculate field="newEntity" type="Integer.returnItemSeqId" >
>> - <calcop field="newestItem" operator="add.returnItemSeqId" >
>> + <calculate field="returnItemSeqId" map-name="newEntity" type="Integer">
>> + <calcop field="returnItemSeqId" map- name="newestItem" operator="add">
>> <number value="1"/>
>> </calcop>
>> </calculate>
>> @@ -539,11 +539,11 @@
>> <find-by-and entity-name="ShipmentReceipt" map="lookupPKMap" list="shipmentReceipts"/>
>> <iterate list="shipmentReceipts" entry="receipt">
>> <if-empty field="totalsMap.${receipt.returnItemSeqId}">
>> - <calculate field="totalsMap.$ {receipt.returnItemSeqId}" >
>> + <calculate field="${receipt.returnItemSeqId}" map- name="totalsMap">
>> <number value="0"/>
>> </calculate>
>> </if-empty>
>> - <calculate field="totalsMap" type="Double.$ {receipt.returnItemSeqId}" >
>> + <calculate field="${receipt.returnItemSeqId}" map- name="totalsMap" type="Double">
>> <calcop field="${receipt.returnItemSeqId}" map- name="totalsMap" operator="add">
>> <calcop field="quantityAccepted" map- name="receipt" operator="get"/>
>> <calcop field="quantityRejected" map- name="receipt" operator="get"/>
>> @@ -598,7 +598,7 @@
>> This activates SECAS such as creating return invoices. This MUST be done before updating the return header so
>> that
>> the ReturnItemBillings are created and then whatever SECA binds to the return header update will have them.
>> . -->
>> <iterate list="shipmentReceipts" entry="receipt">
>> - <get-related-one relation-name="Shipment" value- field="receipt" to-value-field="shipment"/>
>> + <get-related-one relation-name="Shipment" value- name="receipt" to-value-field="shipment"/>
>> <if-not-empty field="shipment.shipmentId">
>> <if-compare field="shipment.statusId" operator="not-equals" value="RETURN_RECEIVED">
>> <set field="serviceInput.shipmentId" from- field="shipment.shipmentId"/>
>> @@ -675,7 +675,7 @@
>> <set from-field="returnHeaderTypeId" field="createHeaderCtx.returnHeaderTypeId"/>
>>
>> <!-- get the return to party for customer return and return from party for vendor return from the product store -->
>> - <get-related-one relation-name="ProductStore" value- field="orderHeader" to-value-field="productStore"/>
>> + <get-related-one relation-name="ProductStore" value- name="orderHeader" to-value-field="productStore"/>
>> <if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
>> <set field="createHeaderCtx.fromPartyId" from- field="orderRole.partyId"/>
>> <set field="createHeaderCtx.toPartyId" from- field="productStore.payToPartyId"/>
>> @@ -897,7 +897,7 @@
>> </condition>
>> <then>
>> <!-- get the returned order item -->
>> - <get-related-one value-field="returnItem" relation- name="OrderItem" to-value-field="orderItem"/>
>> + <get-related-one value-name="returnItem" relation- name="OrderItem" to-value-field="orderItem"/>
>> <!-- get the order items of the replacement order associated to the returned item -->
>> <set field="oiaMap.orderItemAssocTypeId" value="REPLACEMENT"/>
>> <get-related value-field="orderItem" relation- name="FromOrderItemAssoc" map-name="oiaMap"
>> list="replacementOrderItems"/>
>>
>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/ party/PartyServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/ PartyServices.xml (original)
>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/ PartyServices.xml Wed Dec 31 03:00:51 2008
>> @@ -187,7 +187,7 @@
>> <set field="postalAddressBoundaryLookupMap.geoId" from- field="parameters.geoId"/>
>> <find-by-and entity-name="PostalAddressBoundary" map="postalAddressBoundaryLookupMap" list="postalAddressBoundaries"/>
>> <iterate list="postalAddressBoundaries" entry="postalAddressBoundary">
>> - <get-related-one value-field="postalAddressBoundary" to- value-field="geo" relation-name="Geo"/>
>> + <get-related-one value-name="postalAddressBoundary" to- value-field="geo" relation-name="Geo"/>
>> <field-to-list field="geo" list="geos"/>
>> </iterate>
>> <field-to-result field="geos"/>
>> @@ -450,7 +450,7 @@
>>
>> <find-by-and entity-name="PartyRelationship" map="lookupMap" list="partyRelationships"/>
>> <iterate list="partyRelationships" entry="partyRelationship">
>> - <get-related-one value-field="partyRelationship" relation-name="ToParty" to-value-field="party"/>
>> + <get-related-one value-name="partyRelationship" relation-name="ToParty" to-value-field="party"/>
>> <field-to-list field="party" list="parties"/>
>> </iterate>
>> <if-not-empty field="parties">
>>
>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/ PartyTestServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/ PartyTestServices.xml (original)
>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/ PartyTestServices.xml Wed Dec 31 03:00:51 2008
>> @@ -166,7 +166,7 @@
>> <if-compare-field field="contactMechId" to- field="serviceCtx.contactMechId" operator="equals"/>
>> </assert>
>> <clear-field field="telecomNumber"/>
>> - <get-related-one value-field="contactMech" relation- name="TelecomNumber" to-value-field="telecomNumber"/>
>> + <get-related-one value-name="contactMech" relation- name="TelecomNumber" to-value-field="telecomNumber"/>
>> <assert>
>> <not><if-empty field="telecomNumber"/></not>
>> <if-compare-field field="telecomNumber.areaCode" to- field="serviceCtx.areaCode" operator="equals"/>
>> @@ -190,7 +190,7 @@
>> <not><if-empty field="contactMech"/></not>
>> <if-compare-field field="newContactMechId" to- field="serviceCtx.contactMechId" operator="not-equals"/>
>> </assert>
>> - <get-related-one value-field="contactMech" relation- name="TelecomNumber" to-value-field="telecomNumber"/>
>> + <get-related-one value-name="contactMech" relation- name="TelecomNumber" to-value-field="telecomNumber"/>
>> <assert>
>> <not><if-empty field="telecomNumber"/></not>
>> <if-compare-field field="telecomNumber.contactNumber" to- field="serviceCtx.contactNumber" operator="equals"/>
>> @@ -235,7 +235,7 @@
>> <if-compare-field field="contactMechId" to- field="serviceCtx.contactMechId" operator="equals"/>
>> </assert>
>> <clear-field field="postalAddress"/>
>> - <get-related-one value-field="contactMech" relation- name="PostalAddress" to-value-field="postalAddress"/>
>> + <get-related-one value-name="contactMech" relation- name="PostalAddress" to-value-field="postalAddress"/>
>> <assert>
>> <not><if-empty field="postalAddress"/></not>
>> <if-compare-field field="postalAddress.address1" to- field="serviceCtx.address1" operator="equals"/>
>> @@ -261,7 +261,7 @@
>> <not><if-empty field="contactMech"/></not>
>> <if-compare-field field="newContactMechId" to- field="serviceCtx.contactMechId" operator="not-equals"/>
>> </assert>
>> - <get-related-one value-field="contactMech" relation- name="PostalAddress" to-value-field="postalAddress"/>
>> + <get-related-one value-name="contactMech" relation- name="PostalAddress" to-value-field="postalAddress"/>
>> <assert>
>> <not><if-empty field="postalAddress"/></not>
>> <if-compare-field field="postalAddress.stateProvinceGeoId" to- field="serviceCtx.stateProvinceGeoId"
>> operator="equals"/>
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
>> @@ -138,7 +138,7 @@
>> </if-not-empty>
>> <if-not-empty field="rollups">
>> <iterate list="rollups" entry="parent">
>> - <get-related-one relation- name="CurrentProductCategory" value-field="parent" to-value-
>> field="currentProductCategory"/>
>> + <get-related-one relation- name="CurrentProductCategory" value-name="parent" to-value-
>> field="currentProductCategory"/>
>> <field-to-list list="subCategories" field="currentProductCategory"/>
>> </iterate>
>> <if-not-empty field="subCategories">
>> @@ -286,7 +286,7 @@
>> </if-not-empty>
>> <!-- Case For virtual Product -->
>> <!-- get related assoc product -->
>> - <get-related-one relation-name="Product" value- field="productCategoryMember" to-value-field="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"/>
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
>> @@ -192,7 +192,7 @@
>>
>> <entity-one entity-name="WorkEffort" value-field="task"/>
>> <if-not-empty field="task">
>> - <get-related-one value-field="task" relation- name="FixedAsset" to-value-field="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-field="fixedAsset" relation- name="FixedAssetStdCost" map-name="costsAndMap" list="setupCosts"/>
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
>> @@ -186,7 +186,7 @@
>> </else>
>> </if-not-empty>
>>
>> - <calculate field="quantityNotIssued" map- name="parameters"><number value="0"/></calculate>
>> + <calculate field="parameters.quantityNotIssued"
>> ><number value="0"/></calculate>
>> </if-compare>
>> </if-not-empty>
>> </simple-method>
>> @@ -204,7 +204,7 @@
>> <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="quantity" map- name="issuanceCreateMap"><number value="1"/></calculate>
>> + <calculate field="issuanceCreateMap.quantity"
>> ><number value="1"/></calculate>
>> <call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap"/>
>> <clear-field field="issuanceCreateMap"/>
>>
>> @@ -258,7 +258,7 @@
>> <call-service service- name="createInventoryItemDetail" in-map-name="createDetailMap"/>
>> <clear-field field="createDetailMap"/>
>>
>> - <calculate field="quantityNotIssued" map- name="parameters">
>> + <calculate field="parameters.quantityNotIssued" >
>> <calcop operator="subtract" field="parameters.quantityNotIssued">
>> <calcop operator="get" field="parameters.deductAmount"/>
>> </calcop>
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
>> @@ -170,7 +170,7 @@
>> <clear-field field="createDetailMap"/>
>>
>> <!-- get the promiseDatetime -->
>> - <get-related-one value- field="lastNonSerInventoryItem" relation-name="ProductFacility" to-
>> value-field="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">
>> @@ -235,7 +235,7 @@
>> <clear-field field="createDetailMap"/>
>>
>> <!-- get the promiseDatetime -->
>> - <get-related-one value- field="newNonSerInventoryItem" relation-name="ProductFacility" to-
>> value-field="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">
>> @@ -450,8 +450,8 @@
>> <call-service service- name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
>> <clear-field field="reserveOisgirMap"/>
>>
>> - <calculate field="parameters.quantityNotReserved" >
>> - <calcop operator="subtract" field="parameters.quantityNotReserved" >
>> + <calculate field="quantityNotReserved" map- name="parameters">
>> + <calcop operator="subtract" field="quantityNotReserved" map-name="parameters">
>> <calcop operator="get" field="deductAmount" map-name="parameters"/>
>> </calcop>
>> </calculate>
>> @@ -466,7 +466,7 @@
>>
>> <simple-method method-name="getPromisedDateTime" short- description="Get Inventory Promised Date/Time">
>> <!-- get the promiseDatetime -->
>> - <get-related-one value-field="inventoryItem" relation- name="ProductFacility" to-value-field="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 -->
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="inventoryItem" relation- name="Facility" to-value-field="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">
>> @@ -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-field="lookedUpValue" relation- name="Facility" to-value-field="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="getAssoc" list="assocs"/>
>> <filter-list-by-date list-name="assocs" to-list- name="assocsDate"/>
>> <first-from-list entry="assoc" list="assocsDate"/>
>> - <get-related-one value-field="assoc" relation- name="MainProduct" to-value-field="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>
>> @@ -1259,7 +1259,7 @@
>> <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-field="itemIssuance" relation-name="OrderHeader" to-value-field="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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
>> @@ -89,7 +89,7 @@
>> <else>
>> <!-- should generally only be one pick/primary location, just choose the first... -->
>> <first-from-list entry="productFacilityLocationView" list="productFacilityLocationViewList"/>
>> - <get-related-one value- field="productFacilityLocationView" relation-name="FacilityLocation"
>> to-value-field="moveInfo.facilityLocationTo"/>
>> + <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) -->
>> @@ -251,10 +251,10 @@
>> </condition>
>> <then>
>> <if-compare-field field="productFacilityLocationQuantityTest.productId" to-
>> field="productSave.productId" operator="not-equals">
>> - <get-related-one value- field="productFacilityLocationQuantityTest" relation-name="Product"
>> to-value-field="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- field="productFacilityLocationQuantityTest" relation-
>> name="FacilityLocation" to-value-field="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">
>> @@ -302,7 +302,7 @@
>> <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- field="InventoryItemAndLocation"
>> relation-name="FacilityLocation" to- value-field="moveInfo.facilityLocationFrom"/>
>> + <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"/>
>> @@ -480,7 +480,7 @@
>> -->
>> <set from-field="inventoryItem.quantityOnHandTotal" field="remainingQuantityOnHand"/>
>> <iterate entry="orderItemShipGrpInvResAndItemLocation" list="orderItemShipGrpInvResAndItemLocationList">
>> - <get-related-one value- field="orderItemShipGrpInvResAndItemLocation" relation-
>> name="OrderItemShipGrpInvRes" to-value- field="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
>>
>> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="product" relation- name="ProductType" to-value-field="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/shipment/ issuance/IssuanceServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ issuance/IssuanceServices.xml (original)
>> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ issuance/IssuanceServices.xml Wed Dec 31 03:00:51 2008
>> @@ -38,7 +38,7 @@
>> <create-value value-field="newEntity"/>
>>
>> <!-- if the InventoryItem issued is serialized, then change its status to DELIVERED -->
>> - <get-related-one value-field="newEntity" relation- name="InventoryItem" to-value-field="inventoryItem"/>
>> + <get-related-one value-name="newEntity" relation- name="InventoryItem" to-value-field="inventoryItem"/>
>> <if-not-empty field="inventoryItem">
>> <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="SERIALIZED_INV_ITEM">
>> <set field="updateContext.inventoryItemId" from- field="inventoryItem.inventoryItemId"/>
>> @@ -296,8 +296,8 @@
>> <set from-field="parameters.shipmentId" field="shipmentItemLookupPk.shipmentId"/>
>> <find-by-primary-key entity-name="ShipmentItem" map="shipmentItemLookupPk" value-field="shipmentItem"/>
>> <else>
>> - <calculate field="shipmentItem.quantity" >
>> - <calcop operator="add" field="shipmentItem.quantity" >
>> + <calculate field="quantity" map-name="shipmentItem">
>> + <calcop operator="add" field="quantity" map- name="shipmentItem">
>> <calcop operator="get" field="quantity" map- name="parameters"/>
>> </calcop>
>> </calculate>
>> @@ -420,7 +420,7 @@
>> <entity-one entity-name="ItemIssuance" value- field="itemIssuance"/>
>> <get-related-one value-field="itemIssuance" relation- name="OrderHeader" to-value-field="orderHeader"/>
>> <get-related-one value-field="itemIssuance" relation- name="InventoryItem" to-value-field="inventoryItem"/>
>> - <get-related-one value-field="itemIssuance" relation- name="Shipment" to-value-field="shipment"/>
>> + <get-related-one value-name="itemIssuance" relation- name="Shipment" to-value-field="shipment"/>
>>
>> <!-- issuance can be canceled only if the sales shipment is not packed -->
>>
>>
>> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ picklist/PicklistServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ picklist/PicklistServices.xml (original)
>> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ picklist/PicklistServices.xml Wed Dec 31 03:00:51 2008
>> @@ -129,13 +129,13 @@
>> <set value="Y" field="allPickStarted"/>
>> <set value="N" field="hasStockToPick"/>
>> <iterate entry="orderItemShipGrpInvRes" list="orderItemShipGrpInvResList">
>> - <get-related-one value- field="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-
>> field="orderItem"/>
>> + <get-related-one value- name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-
>> field="orderItem"/>
>> <if-compare field="orderItem.statusId" value="ITEM_APPROVED" operator="not-equals">
>> <set value="N" field="pickThisOrder"/>
>> </if-compare>
>>
>> <if-compare field="pickThisOrder" operator="equals" value="Y">
>> - <get-related-one value- field="orderItemShipGrpInvRes" relation-name="InventoryItem" to-
>> value-field="inventoryItem"/>
>> + <get-related-one value- name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-
>> field="inventoryItem"/>
>> <!-- Look for other picklists which might include this order item ship group inventory
>> reservation. If it is on another picklist, then
>> we should not include it again. We screen out picklists which are either cancelled or
>> already picked or packed, so that we can re-pick items if
>> (1) the previous picklist was cancelled, or
>> @@ -199,7 +199,7 @@
>> </if>
>>
>> <!-- check InventoryItem-
>> >FacilityLocation (if exists), if it is of type FLT_BULK set needs
>> stock move to true -->
>> - <get-related-one value- field="inventoryItem" relation-name="FacilityLocation"
>> to-value- field="facilityLocation"/>
>> + <get-related-one value- name="inventoryItem" relation-name="FacilityLocation"
>> to-value- field="facilityLocation"/>
>> <if-not-empty field="facilityLocation">
>> <if-compare field="facilityLocation.locationTypeEnumId" operator="equals"
>> value="FLT_BULK">
>> <set value="Y" field="needsStockMove"/>
>> @@ -258,7 +258,7 @@
>> <!-- put in pick or move lists for the given shipmentMethodTypeId -->
>> <set from- field="orderItemShipGroup.shipmentMethodTypeId" field="shipmentMethodTypeId"/>
>> <if-empty field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}">
>> - <get-related-one value- field="orderItemShipGroup" relation-name="ShipmentMethodType" to-
>> value-field="pickMoveByShipmentMethodInfoMap.$ {shipmentMethodTypeId}.shipmentMethodType"/>
>> + <get-related-one value- name="orderItemShipGroup" relation-name="ShipmentMethodType" to-
>> value-field="pickMoveByShipmentMethodInfoMap.$ {shipmentMethodTypeId}.shipmentMethodType"/>
>> </if-empty>
>> <if-compare field="needsStockMove" operator="equals" value="Y">
>> <field-to-list field="orderHeaderInfo" list="pickMoveByShipmentMethodInfoMap.$
>> {shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
>> @@ -386,7 +386,7 @@
>> <clear-field field="orderItemInfo"/>
>> <set field="orderItemInfo.orderItemAndShipGroupAssoc" from- field="orderItemAndShipGroupAssoc"/>
>> <set field="orderItemInfo.orderItemShipGrpInvResList" from- field="perItemResListValid"/>
>> - <get-related-one value- field="orderItemAndShipGroupAssoc" relation-name="Product" to-value-
>> field="orderItemInfo.product" use-cache="true"/>
>> + <get-related-one value- name="orderItemAndShipGroupAssoc" relation-name="Product" to-value-
>> field="orderItemInfo.product" use-cache="true"/>
>> <set field="orderItemInfoList[]" from- field="orderItemInfo"/>
>> </if-not-empty>
>> <clear-field field="perItemResListValid"/>
>> @@ -1028,7 +1028,7 @@
>> <get-related value-field="picklist" relation- name="PicklistRole" list="picklistRoleList"/>
>> <iterate entry="picklistRole" list="picklistRoleList">
>> <clear-field field="picklistRoleInfo"/>
>> - <get-related-one value-field="picklistRole" relation- name="PartyNameView"
>> to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
>> + <get-related-one value-name="picklistRole" relation- name="PartyNameView"
>> to-value-field="picklistRoleInfo.partyNameView" use-cache="true"/>
>> <get-related-one value-field="picklistRole" relation- name="RoleType" to-value-field="picklistRoleInfo.roleType" use-
>> cache="true"/>
>> <set from-field="picklistRole" field="picklistRoleInfo.picklistRole"/>
>> <field-to-list field="picklistRoleInfo" list="picklistRoleInfoList"/>
>> @@ -1038,7 +1038,7 @@
>> <get-related value-field="picklist" relation- name="PicklistStatusHistory" list="picklistStatusHistoryList"/>
>> <iterate entry="picklistStatusHistory" list="picklistStatusHistoryList">
>> <clear-field field="picklistStatusHistoryInfo"/>
>> - <get-related-one value-field="picklistStatusHistory" relation-name="StatusItem" to-value-
>> field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
>> + <get-related-one value-name="picklistStatusHistory" relation-name="StatusItem" to-value-
>> field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
>> <get-related-one value-field="picklistStatusHistory" relation-name="ToStatusItem" to-value-
>> field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
>> <set from-field="picklistStatusHistory" field="picklistStatusHistoryInfo.picklistStatusHistory"/>
>> <field-to-list field="picklistStatusHistoryInfo" list="picklistStatusHistoryInfoList"/>
>> @@ -1051,16 +1051,16 @@
>> <get-related value-field="picklist" relation- name="PicklistBin" list-name="picklistBinList" order-by-
>> list="picklistBinOrderList"/>
>> <iterate entry="picklistBin" list="picklistBinList">
>> <clear-field field="picklistBinInfo"/>
>> - <get-related-one value-field="picklistBin" relation- name="PrimaryOrderHeader" to-value-
>> field="picklistBinInfo.primaryOrderHeader"/>
>> + <get-related-one value-name="picklistBin" relation- name="PrimaryOrderHeader" to-value-
>> field="picklistBinInfo.primaryOrderHeader"/>
>> <get-related-one value-field="picklistBin" relation- name="PrimaryOrderItemShipGroup" to-value-
>> field="picklistBinInfo.primaryOrderItemShipGroup"/>
>>
>> <clear-field field="picklistItemInfoList"/>
>> <get-related value-field="picklistBin" relation- name="PicklistItem" list="picklistItemList" use-cache="true"/>
>> <iterate entry="picklistItem" list="picklistItemList">
>> <clear-field field="picklistItemInfo"/>
>> - <get-related-one value-field="picklistItem" relation-name="OrderItem" to-value-
>> field="picklistItemInfo.orderItem"/>
>> + <get-related-one value-name="picklistItem" relation- name="OrderItem"
>> to-value-field="picklistItemInfo.orderItem"/>
>> <get-related-one value- field="picklistItemInfo.orderItem" relation-name="Product" to-value-
>> field="picklistItemInfo.product"/>
>> - <get-related-one value-field="picklistItem" relation-name="InventoryItemAndLocation" to-value-
>> field="picklistItemInfo.inventoryItemAndLocation"/>
>> + <get-related-one value-name="picklistItem" relation- name="InventoryItemAndLocation" to-value-
>> field="picklistItemInfo.inventoryItemAndLocation"/>
>> <get-related-one value-field="picklistItem" relation- name="OrderItemShipGrpInvRes" to-value-
>> field="picklistItemInfo.orderItemShipGrpInvRes"/>
>> <get-related value-field="picklistItem" relation- name="ItemIssuance" list="picklistItemInfo.itemIssuanceList"/>
>> <set from-field="picklistItem" field="picklistItemInfo.picklistItem"/>
>> @@ -1079,9 +1079,9 @@
>> <set from-field="picklistStatusHistoryInfoList" field="picklistInfo.picklistStatusHistoryInfoList"/>
>> <set from-field="picklistBinInfoList" field="picklistInfo.picklistBinInfoList"/>
>> <string-to-list string="sequenceId" list-name="orderBy"/>
>> - <get-related-one value-field="picklist" relation- name="StatusItem" to-value-field="picklistInfo.statusItem" use-
>> cache="true"/>
>> + <get-related-one value-name="picklist" relation- name="StatusItem" to-value-field="picklistInfo.statusItem" use-
>> cache="true"/>
>> <get-related-one value-field="picklist" relation- name="Facility" to-value-field="picklistInfo.facility" use-
>> cache="true"/>
>> - <get-related-one value-field="picklist" relation- name="ShipmentMethodType" to-value-
>> field="picklistInfo.shipmentMethodType" use-cache="true"/>
>> + <get-related-one value-name="picklist" relation- name="ShipmentMethodType" to-value-
>> field="picklistInfo.shipmentMethodType" use-cache="true"/>
>> <get-related value-field="picklist" relation- name="StatusValidChangeToDetail" order-by-list="orderBy"
>> list="picklistInfo.statusValidChangeToDetailList"/>
>> </simple-method>
>>
>> @@ -1143,7 +1143,7 @@
>>
>> <!-- create a list of locations, then sort it, will have to create a reverse Map to go from location to inventory
>> item -->
>> <clear-field field="facilityLocation"/>
>> - <get-related-one value-field="inventoryItem" relation- name="FacilityLocation" to-value-field="facilityLocation"/>
>> + <get-related-one value-name="inventoryItem" relation- name="FacilityLocation" to-value-field="facilityLocation"/>
>> <if-not-empty field="facilityLocation">
>> <set from-field="facilityLocation" field="facilityLocationMap.${facilityLocation.locationSeqId}"/>
>> <!-- support multiple invnetoryItemIds per facilityLocation.locationSeqId -->
>> @@ -1184,7 +1184,7 @@
>> <set from-field="inventoryItems.${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
>> <set from-field="inventoryItemOrderItems.$ {inventoryItemId}" field="inventoryItemInfo.orderItems"/>
>> <set from-field="inventoryItemQuantities.$ {inventoryItemId}" field="inventoryItemInfo.quantity"/>
>> - <get-related-one value- field="inventoryItemInfo.inventoryItem" relation-name="Product" to-
>> value-field="inventoryItemInfo.product"/>
>> + <get-related-one value- name="inventoryItemInfo.inventoryItem" relation-name="Product" to-
>> value-field="inventoryItemInfo.product"/>
>> <get-related-one value- field="inventoryItemInfo.inventoryItem" relation-name="StatusItem"
>> to-value-field="inventoryItemInfo.statusItem"/>
>>
>> <field-to-list field="inventoryItemInfo" list="inventoryItemInfoList"/>
>> @@ -1221,7 +1221,7 @@
>> <set from-field="inventoryItems${inventoryItemId}" field="inventoryItemInfo.inventoryItem"/>
>> <set from-field="inventoryItemOrderItems.$ {inventoryItemId}" field="inventoryItemInfo.orderItems"/>
>> <set from-field="inventoryItemQuantities.$ {inventoryItemId}" field="inventoryItemInfo.quantity"/>
>> - <get-related-one value- field="inventoryItemInfo.inventoryItem" relation-name="Product" to-
>> value-field="inventoryItemInfo.product"/>
>> + <get-related-one value- name="inventoryItemInfo.inventoryItem" relation-name="Product" to-
>> value-field="inventoryItemInfo.product"/>
>> <get-related-one value- field="inventoryItemInfo.inventoryItem" relation-name="StatusItem"
>> to-value-field="inventoryItemInfo.statusItem"/>
>>
>> <set from-field="inventoryItemInfo" field="inventoryItemInfoList[]"/>
>>
>> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ receipt/ShipmentReceiptServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ receipt/ShipmentReceiptServices.xml (original)
>> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ receipt/ShipmentReceiptServices.xml Wed Dec 31 03:00:51 2008
>> @@ -215,7 +215,7 @@
>>
>> <!-- if no inventory item type specified, get default from facility -->
>> <if-empty field="parameters.inventoryItemTypeId">
>> - <get-related-one value-field="returnHeader" relation-name="Facility" to-value-field="facility"/>
>> + <get-related-one value-name="returnHeader" relation-name="Facility" to-value-field="facility"/>
>> <set from- field="facility.defaultInventoryItemTypeId" field="parameters.inventoryItemTypeId"/>
>> </if-empty>
>>
>> @@ -243,7 +243,7 @@
>> <if-empty field="returnItem.expectedItemStatus">
>> <set value="INV_RETURNED" field="returnItem.expectedItemStatus" type="String"/>
>> </if-empty>
>> - <get-related-one value-field="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
>> + <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
>> <if-not-empty field="orderItem.productId">
>> <set field="costCtx.returnItemSeqId" from- field="returnItem.returnItemSeqId"/>
>> <set field="costCtx.returnId" from- field="returnItem.returnId"/>
>> @@ -258,7 +258,7 @@
>> <condition-expr field- name="inventoryItemTypeId" operator="equals"
>> value="SERIALIZED_INV_ITEM"/>
>> </condition-list>
>> </entity-count>
>> - <get-related-one value-field="returnHeader" relation-name="Facility"
>> to-value-field="destinationFacility"/>
>> + <get-related-one value-name="returnHeader" relation-name="Facility"
>> to-value-field="destinationFacility"/>
>> <set field="setNonSerial" value="false"/>
>> <if-compare field="destinationFacility.defaultInventoryItemTypeId" value="NON_SERIAL_INV_ITEM"
>> operator="equals">
>> <if-compare field="serializedItemCount" value="0" operator="equals">
>>
>> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ shipment/ShipmentServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ shipment/ShipmentServices.xml (original)
>> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/ shipment/ShipmentServices.xml Wed Dec 31 03:00:51 2008
>> @@ -1257,7 +1257,7 @@
>> </or>
>> </condition>
>> <then>
>> - <get-related-one relation-name="StatusItem" value- field="testShipment" to-value-field="testShipmentStatus"/>
>> + <get-related-one relation-name="StatusItem" value- name="testShipment" to-value-field="testShipmentStatus"/>
>> <string-to-list string="Cannot perform operation $ {operationName} when the shipment is in the $
>> {testShipmentStatus.description} [${testShipment.statusId}] status." list="error_list"/>
>> </then>
>> </if>
>> @@ -1382,7 +1382,7 @@
>> <field-map field-name="shipGroupSeqId" from- field="parameters.shipGroupSeqId"/>
>> </entity-and>
>> <iterate entry="orderItemShipGroupAssoc" list="orderItemShipGroupAssocs">
>> - <get-related-one relation-name="OrderItem" value- field="orderItemShipGroupAssoc" to-value-field="orderItem"/>
>> + <get-related-one relation-name="OrderItem" value- name="orderItemShipGroupAssoc" to-value-field="orderItem"/>
>>
>> <!-- Set the item status to completed -->
>> <set field="itemStatusContext.orderId" from- field="parameters.orderId"/>
>> @@ -1593,7 +1593,7 @@
>>
>> <!-- make sure the OrderItem is for a Product that has a ProductType with isPhysical=Y -->
>> <if-not-empty field="itemProduct">
>> - <get-related-one value-field="itemProduct" relation-name="ProductType" to-value-field="itemProductType"
>> use- cache="true"/>
>> + <get-related-one value-name="itemProduct" relation-name="ProductType" to-value-field="itemProductType" use-
>> cache="true"/>
>> <if-compare field="itemProductType.isPhysical" operator="equals" value="Y">
>> <!-- Create shipment item -->
>> <clear-field field="addOrderShipmentToShipmentCtx"/>
>> @@ -1620,7 +1620,7 @@
>> <make-value entity-name="OrderItemShipGrpInvRes" value- field="orderItemShipGrpInvResLookupPk"/>
>> <set-pk-fields value-field="orderItemShipGrpInvResLookupPk" map="parameters"/>
>> <find-by-primary-key entity-name="OrderItemShipGrpInvRes" map="orderItemShipGrpInvResLookupPk" value-
>> field="orderItemShipGrpInvRes"/>
>> - <get-related-one to-value-field="inventoryItem" relation- name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
>> + <get-related-one to-value-name="inventoryItem" relation- name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
>> <if-compare-field operator="not-equals" field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
>> <!-- The inventory that we have reserved is not what we shipped. Lets reReserve, this time we'll get what we
>> want -->
>> <set-service-fields map="parameters" to- map="reserveAnInventoryItemCtx" service- name="reserveAnInventoryItem"/>
>>
>> Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/ workeffort/timesheet/TimesheetServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/ timesheet/TimesheetServices.xml (original)
>> +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/ timesheet/TimesheetServices.xml Wed Dec 31 03:00:51 2008
>> @@ -218,7 +218,7 @@
>> <get-related value- field="workEffort" relation-name="CustRequestWorkEffort"
>> list="custRequestWorkEfforts"/>
>> <if-not-empty field="custRequestWorkEfforts">
>> <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
>> - <get-related-one value- field="custRequestWorkEffort" relation-name="CustRequest"
>> to-value- field="custRequest"/>
>> + <get-related-one value- name="custRequestWorkEffort" relation-name="CustRequest"
>> to-value- field="custRequest"/>
>> <if-not-empty field="custRequest">
>> <set field="invoiceItemMap.description" value="$ {custRequest.custRequestName}
>> [CRQ:${custRequest.custRequestId}]"/>
>> </if-not-empty>
>> @@ -346,7 +346,7 @@
>> <set field="getRate.rateCurrencyUomId" from- field="parameters.currencyUomId"/>
>> <set field="getRate.rateTypeId" from- field="timeEntry.rateTypeId"/>
>> <if-empty field="timeEntry.partyId">
>> - <get-related-one value-field="timeEntry" relation- name="Timesheet" to-value-field="timesheet"/>
>> + <get-related-one value-name="timeEntry" relation- name="Timesheet" to-value-field="timesheet"/>
>> <if-not-empty field="timesheet">
>> <set field="getRate.partyId" from- field="timesheet.partyId"/>
>> </if-not-empty>
>> @@ -380,7 +380,7 @@
>> </if-empty>
>> <!-- check if the status is in progress... -->
>> <if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="not-equals">
>> - <get-related-one value-field="timesheet" relation-name="StatusItem" to-value-field="statusItem"/>
>> + <get-related-one value-name="timesheet" relation-name="StatusItem" to-value-field="statusItem"/>
>> <add-error><fail-message message="Can only update Timesheet, when status is in-process...current status: $
>> {statusItem.description}"/></add-error>
>> <log level="info" message="Can only update Timesheet, when status is in-process...is now: $
>> {timesheet.statusId}"/>
>> </if-compare>
>>
>> Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/ hhfacility/FacilityServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/ hhfacility/FacilityServices.xml (original)
>> +++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/ hhfacility/FacilityServices.xml Wed Dec 31 03:00:51 2008
>> @@ -47,7 +47,7 @@
>> <set value="hhFacility Receipt" field="receiveCtx.comments"/>
>> <set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/>
>> <set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/>
>> - <calculate field="quantityRejected" map-name="receiveCtx" type="Double">
>> + <calculate field="receiveCtx" type="Double.quantityRejected" >
>> <number value="0"/>
>> </calculate>
>> <call-service service-name="receiveInventoryProduct" in-map- name="receiveCtx"/>
>>
>> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/ project/ProjectServices.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730373&r1=730372&r2=730373&view=diff
>> = = = = = = = = ======================================================================
>> --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ ProjectServices.xml (original)
>> +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ ProjectServices.xml Wed Dec 31 03:00:51 2008
>> @@ -484,7 +484,7 @@
>> <field-map field-name="workEffortId" from- field="parameters.taskId"/>
>> </entity-one>
>> <if-not-empty field="task">
>> - <get-related-one value-field="task" relation- name="ParentWorkEffort" to-value-field="phase"/>
>> + <get-related-one value-name="task" relation- name="ParentWorkEffort" to-value-field="phase"/>
>> <else>
>> <return/>
>> </else>
>> @@ -495,7 +495,7 @@
>> </entity-one>
>> </else>
>> </if-not-empty>
>> - <get-related-one value-field="phase" relation- name="ParentWorkEffort" to-value-field="project"/>
>> + <get-related-one value-name="phase" relation- name="ParentWorkEffort" to-value-field="project"/>
>> <field-to-result field="project.workEffortId" result- name="projectId"/>
>> <field-to-result field="project.workEffortName" result- name="projectName"/>
>> <field-to-result field="phase.workEffortId" result- name="phaseId"/>
>> @@ -890,7 +890,7 @@
>> <!-- get the planned hours -->
>> <set field="lowInfo" from-field="task"/>
>> <set field="hoursPartyId" from-field="task.partyId"/>
>> - <get-related-one value-field="task" relation- name="WorkEffort" to-value-field="lowInfo"/>
>> + <get-related-one value-name="task" relation- name="WorkEffort" to-value-field="lowInfo"/>
>> <call-simple-method method-name="getHours"/>
>> <set field="taskParty.plannedHours" from- field="highInfo.plannedHours"/>
>> <set field="taskParty.actualHours" from- field="highInfo.actualHours"/>
>> @@ -1034,7 +1034,7 @@
>> <if-not-empty field="actuals">
>> <iterate entry="actual" list="actuals">
>> <if-not-empty field="actual.hours">
>> - <get-related-one value-field="actual" relation- name="Timesheet" to-value-field="timesheet"/>
>> + <get-related-one value-name="actual" relation- name="Timesheet" to-value-field="timesheet"/>
>>
>> <!-- check if only a part of the registered hours need to be taken into account -->
>> <set field="originalActualHours" from- field="actual.hours"/>
>>
>>
>
Re: svn commit: r730373 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/ecommerce/script/org/ofbiz/ecommerce/customer/
applications/manufacturing/scrip...
Posted by David E Jones <de...@me.com>.
There is still something really wrong here. These lines show it:
- <calculate field="postedDebits" map-
name="glAccountHistory" type="BigDecimal">
+ <calculate field="glAccountHistory"
type="BigDecimal.postedDebits" >
The old (-) line may actually work, but the new (+) line would
definitely not... the value in the type attribute is pretty messed
up... :)
If this is a revert then I guess we need to revert further back...
-David
On Dec 31, 2008, at 4:00 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Wed Dec 31 03:00:51 2008
> New Revision: 730373
>
> URL: http://svn.apache.org/viewvc?rev=730373&view=rev
> Log:
> Reverted 730372 : an error realted to calculate tag has slipped in
>
> Modified:
> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> ledger/AcctgTransServices.xml
> ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> payment/PaymentServices.xml
> ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/
> customer/CustomerEvents.xml
> ofbiz/trunk/applications/manufacturing/script/org/ofbiz/
> manufacturing/jobshopmgt/ProductionRunServices.xml
> ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/
> tracking/TrackingCodeServices.xml
> ofbiz/trunk/applications/order/script/org/ofbiz/order/order/
> OrderReturnServices.xml
> ofbiz/trunk/applications/party/script/org/ofbiz/party/party/
> PartyServices.xml
> ofbiz/trunk/applications/party/script/org/ofbiz/party/test/
> PartyTestServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/
> CatalogServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/
> CostServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/
> inventory/InventoryIssueServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/
> inventory/InventoryReserveServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/
> inventory/InventoryServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/
> inventory/StockMoveServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/
> ProductDimensionServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> issuance/IssuanceServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> picklist/PicklistServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> receipt/ShipmentReceiptServices.xml
> ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> shipment/ShipmentServices.xml
> ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/
> timesheet/TimesheetServices.xml
> ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/
> FacilityServices.xml
> ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/
> ProjectServices.xml
>
> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/
> accounting/ledger/AcctgTransServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/ledger/AcctgTransServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> ledger/AcctgTransServices.xml (original)
> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> ledger/AcctgTransServices.xml Wed Dec 31 03:00:51 2008
> @@ -332,7 +332,7 @@
> <!-- we do this by first calculating a postingAmount
> (positive or negative) then adding to the postingBalance -->
> <clear-field field="postingAmount"/>
> <!-- use the parent of the GlAccountClass, which
> should either be DEBIT or CREDIT -->
> - <get-related-one relation-name="GlAccountClass"
> value-field="glAccount" to-value-field="glAccountClass"/>
> + <get-related-one relation-name="GlAccountClass"
> value-name="glAccount" to-value-field="glAccountClass"/>
> <get-related-one relation-
> name="ParentGlAccountClass" value-field="glAccountClass" to-value-
> field="parentGlAccountClass"/>
> <!-- test if the account is a DEBIT account -->
> <set field="isDebit" value="$
> {bsh:org
> .ofbiz.accounting.util.UtilAccounting.isDebitAccount(glAccount)}"/>
> @@ -402,7 +402,7 @@
>
> <!-- update GlAccountHistory's debit and credit
> totals -->
> <if-compare
> field="acctgTransEntry.debitCreditFlag" operator="equals" value="D">
> - <calculate field="postedDebits" map-
> name="glAccountHistory" type="BigDecimal">
> + <calculate field="glAccountHistory"
> type="BigDecimal.postedDebits" >
> <calcop operator="add">
> <calcop operator="get"
> field="amount" map-name="acctgTransEntry"/>
> <calcop operator="get"
> field="postedDebits" map-name="glAccountHistory"/>
> @@ -410,7 +410,7 @@
> </calculate>
> <else>
> <if-compare
> field="acctgTransEntry.debitCreditFlag" operator="equals" value="C">
> - <calculate field="postedCredits" map-
> name="glAccountHistory" type="BigDecimal">
> + <calculate field="glAccountHistory"
> type="BigDecimal.postedCredits" >
> <calcop operator="add">
> <calcop operator="get"
> field="amount" map-name="acctgTransEntry"/>
> <calcop operator="get"
> field="postedCredits" map-name="glAccountHistory"/>
>
> Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/
> accounting/payment/PaymentServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> payment/PaymentServices.xml (original)
> +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/
> payment/PaymentServices.xml Wed Dec 31 03:00:51 2008
> @@ -202,7 +202,7 @@
> <call-service service-
> name="removePaymentApplication" in-map-
> name="removePaymentApplicationMap"/>
> </iterate>
> <!-- if new status is cancelled and the
> payment is associated to an OrderPaymentPreference, update the
> status of that record too. -->
> - <get-related-one value-field="payment"
> relation-name="OrderPaymentPreference" to-value-
> field="orderPaymentPreference"/>
> + <get-related-one value-name="payment"
> relation-name="OrderPaymentPreference" to-value-
> field="orderPaymentPreference"/>
> <if-not-empty field="orderPaymentPreference">
> <set
> field="updateOrderPaymentPreferenceMap.orderPaymentPreferenceId"
> from-field="orderPaymentPreference.orderPaymentPreferenceId"/>
> <set
> field="updateOrderPaymentPreferenceMap.cancelThis" value="true"/>
> @@ -260,7 +260,7 @@
> <set field="remainingAppliedAmount" from-
> field="invoiceTotalAmountPaid" type="BigDecimal"/>
> <set field="computedTotalAmount" value="0.0"
> type="BigDecimal"/>
> <iterate list="invoiceTerms" entry="invoiceTerm">
> - <get-related-one relation-name="TermType" value-
> field="invoiceTerm" to-value-field="termType" use-cache="true"/>
> + <get-related-one relation-name="TermType" value-
> name="invoiceTerm" to-value-field="termType" use-cache="true"/>
> <if-compare field="termType.parentTypeId"
> operator="equals" value="FIN_PAYMENT_TERM">
> <clear-field field="invoicePaymentInfo"/>
> <set field="invoicePaymentInfo.invoiceId" from-
> field="invoice.invoiceId"/>
>
> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/
> ecommerce/customer/CustomerEvents.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/
> customer/CustomerEvents.xml (original)
> +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/
> customer/CustomerEvents.xml Wed Dec 31 03:00:51 2008
> @@ -412,7 +412,7 @@
> <find-by-primary-key map="storeEmailLookup" entity-
> name="ProductStoreEmailSetting" value-field="storeEmail"/>
> <if-not-empty field="storeEmail.bodyScreenLocation">
> <!-- prepare the email context -->
> - <get-related-one value-field="createdUserLogin"
> relation-name="Person" to-value-field="personObj"/>
> + <get-related-one value-name="createdUserLogin"
> relation-name="Person" to-value-field="personObj"/>
> <set from-field="createdUserLogin"
> field="emailCtx.userLogin"/>
> <set from-field="personObj" field="emailCtx.person"/>
> <!-- prepare the notification service context -->
>
> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/
> manufacturing/jobshopmgt/ProductionRunServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/
> manufacturing/jobshopmgt/ProductionRunServices.xml (original)
> +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/
> manufacturing/jobshopmgt/ProductionRunServices.xml Wed Dec 31
> 03:00:51 2008
> @@ -219,7 +219,7 @@
> <clear-field field="createDetailMap"/>
> </else>
> </if-not-empty>
> - <calculate field="quantityNotIssued" map-
> name="parameters"><number value="0"/></calculate>
> + <calculate field="parameters.quantityNotIssued"
> ><number value="0"/></calculate>
> </if-compare>
> <if-not-empty field="workEffortGoodStandard">
> <entity-and list="issuances" entity-
> name="WorkEffortAndInventoryAssign">
> @@ -253,7 +253,7 @@
> <!-- create ItemIssuance record -->
> <set from-field="parameters.workEffortId"
> field="issuanceCreateMap.workEffortId"/>
> <set from-field="inventoryItem.inventoryItemId"
> field="issuanceCreateMap.inventoryItemId"/>
> - <calculate field="quantity" map-
> name="issuanceCreateMap"><number value="1"/></calculate>
> + <calculate field="issuanceCreateMap.quantity"
> ><number value="1"/></calculate>
> <call-service service-
> name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
> <clear-field field="issuanceCreateMap"/>
>
> @@ -312,7 +312,7 @@
> <call-service service-
> name="createInventoryItemDetail" in-map-name="createDetailMap"/>
> <clear-field field="createDetailMap"/>
>
> - <calculate field="quantityNotIssued"
> map-name="parameters">
> + <calculate
> field="parameters.quantityNotIssued" >
> <calcop operator="subtract"
> field="parameters.quantityNotIssued">
> <calcop operator="get"
> field="parameters.deductAmount"/>
> </calcop>
> @@ -344,7 +344,7 @@
> <!-- create ItemIssuance record -->
> <set field="issuanceCreateMap.workEffortId" from-
> field="parameters.workEffortId"/>
> <set field="issuanceCreateMap.inventoryItemId" from-
> field="inventoryItem.inventoryItemId"/>
> - <calculate field="quantity" map-
> name="issuanceCreateMap"><number value="1"/></calculate>
> + <calculate field="issuanceCreateMap.quantity"
> ><number value="1"/></calculate>
> <call-service service-
> name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
> <field-to-result field="issuanceCreateMap.quantity"
> result-name="quantityIssued"/>
> </if-compare>
>
> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/
> marketing/tracking/TrackingCodeServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/
> tracking/TrackingCodeServices.xml (original)
> +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/
> tracking/TrackingCodeServices.xml Wed Dec 31 03:00:51 2008
> @@ -149,7 +149,7 @@
> <get-related list="returnItems" relation-
> name="ReturnItem" value-field="returnHeader"/>
> <log level="info" message="Return items lists are : $
> {returnItems}"/>
> <iterate list="returnItems" entry="returnItem">
> - <get-related-one relation-name="OrderHeader" value-
> field="returnItem" to-value-field="orderHeader"/>
> + <get-related-one relation-name="OrderHeader" value-
> name="returnItem" to-value-field="orderHeader"/>
> <set field="trackingCodeOrderFindContext.orderId"
> from-field="orderHeader.orderId"/>
> <!-- set
> field="trackingCodeOrderFindContext.trackingCodeTypeId"
> value="PARTNER_MGD"/-->
> <!-- get the siteId ,trackingCodeId from
> TrackingCodeOrder -->
>
> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/
> order/OrderReturnServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/
> OrderReturnServices.xml (original)
> +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/
> OrderReturnServices.xml Wed Dec 31 03:00:51 2008
> @@ -388,8 +388,8 @@
> <set value="1" field="newEntity.returnItemSeqId"/>
> <else>
> <first-from-list entry="newestItem" list="currentItems"/>
> - <calculate field="newEntity"
> type="Integer.returnItemSeqId" >
> - <calcop field="newestItem"
> operator="add.returnItemSeqId" >
> + <calculate field="returnItemSeqId" map-name="newEntity"
> type="Integer">
> + <calcop field="returnItemSeqId" map-
> name="newestItem" operator="add">
> <number value="1"/>
> </calcop>
> </calculate>
> @@ -539,11 +539,11 @@
> <find-by-and entity-name="ShipmentReceipt" map="lookupPKMap"
> list="shipmentReceipts"/>
> <iterate list="shipmentReceipts" entry="receipt">
> <if-empty field="totalsMap.${receipt.returnItemSeqId}">
> - <calculate field="totalsMap.$
> {receipt.returnItemSeqId}" >
> + <calculate field="${receipt.returnItemSeqId}" map-
> name="totalsMap">
> <number value="0"/>
> </calculate>
> </if-empty>
> - <calculate field="totalsMap" type="Double.$
> {receipt.returnItemSeqId}" >
> + <calculate field="${receipt.returnItemSeqId}" map-
> name="totalsMap" type="Double">
> <calcop field="${receipt.returnItemSeqId}" map-
> name="totalsMap" operator="add">
> <calcop field="quantityAccepted" map-
> name="receipt" operator="get"/>
> <calcop field="quantityRejected" map-
> name="receipt" operator="get"/>
> @@ -598,7 +598,7 @@
> This activates SECAS such as creating return
> invoices. This MUST be done before updating the return header so that
> the ReturnItemBillings are created and then whatever
> SECA binds to the return header update will have them. . -->
> <iterate list="shipmentReceipts" entry="receipt">
> - <get-related-one relation-name="Shipment" value-
> field="receipt" to-value-field="shipment"/>
> + <get-related-one relation-name="Shipment" value-
> name="receipt" to-value-field="shipment"/>
> <if-not-empty field="shipment.shipmentId">
> <if-compare field="shipment.statusId"
> operator="not-equals" value="RETURN_RECEIVED">
> <set field="serviceInput.shipmentId" from-
> field="shipment.shipmentId"/>
> @@ -675,7 +675,7 @@
> <set from-field="returnHeaderTypeId"
> field="createHeaderCtx.returnHeaderTypeId"/>
>
> <!-- get the return to party for customer return and return
> from party for vendor return from the product store -->
> - <get-related-one relation-name="ProductStore" value-
> field="orderHeader" to-value-field="productStore"/>
> + <get-related-one relation-name="ProductStore" value-
> name="orderHeader" to-value-field="productStore"/>
> <if-compare field="returnHeaderTypeId" operator="equals"
> value="CUSTOMER_RETURN">
> <set field="createHeaderCtx.fromPartyId" from-
> field="orderRole.partyId"/>
> <set field="createHeaderCtx.toPartyId" from-
> field="productStore.payToPartyId"/>
> @@ -897,7 +897,7 @@
> </condition>
> <then>
> <!-- get the returned order item -->
> - <get-related-one value-field="returnItem" relation-
> name="OrderItem" to-value-field="orderItem"/>
> + <get-related-one value-name="returnItem" relation-
> name="OrderItem" to-value-field="orderItem"/>
> <!-- get the order items of the replacement order
> associated to the returned item -->
> <set field="oiaMap.orderItemAssocTypeId"
> value="REPLACEMENT"/>
> <get-related value-field="orderItem" relation-
> name="FromOrderItemAssoc" map-name="oiaMap"
> list="replacementOrderItems"/>
>
> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/
> party/PartyServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/
> PartyServices.xml (original)
> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/
> PartyServices.xml Wed Dec 31 03:00:51 2008
> @@ -187,7 +187,7 @@
> <set field="postalAddressBoundaryLookupMap.geoId" from-
> field="parameters.geoId"/>
> <find-by-and entity-name="PostalAddressBoundary"
> map="postalAddressBoundaryLookupMap" list="postalAddressBoundaries"/>
> <iterate list="postalAddressBoundaries"
> entry="postalAddressBoundary">
> - <get-related-one value-field="postalAddressBoundary" to-
> value-field="geo" relation-name="Geo"/>
> + <get-related-one value-name="postalAddressBoundary" to-
> value-field="geo" relation-name="Geo"/>
> <field-to-list field="geo" list="geos"/>
> </iterate>
> <field-to-result field="geos"/>
> @@ -450,7 +450,7 @@
>
> <find-by-and entity-name="PartyRelationship" map="lookupMap"
> list="partyRelationships"/>
> <iterate list="partyRelationships" entry="partyRelationship">
> - <get-related-one value-field="partyRelationship"
> relation-name="ToParty" to-value-field="party"/>
> + <get-related-one value-name="partyRelationship"
> relation-name="ToParty" to-value-field="party"/>
> <field-to-list field="party" list="parties"/>
> </iterate>
> <if-not-empty field="parties">
>
> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/
> PartyTestServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyTestServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/
> PartyTestServices.xml (original)
> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/
> PartyTestServices.xml Wed Dec 31 03:00:51 2008
> @@ -166,7 +166,7 @@
> <if-compare-field field="contactMechId" to-
> field="serviceCtx.contactMechId" operator="equals"/>
> </assert>
> <clear-field field="telecomNumber"/>
> - <get-related-one value-field="contactMech" relation-
> name="TelecomNumber" to-value-field="telecomNumber"/>
> + <get-related-one value-name="contactMech" relation-
> name="TelecomNumber" to-value-field="telecomNumber"/>
> <assert>
> <not><if-empty field="telecomNumber"/></not>
> <if-compare-field field="telecomNumber.areaCode" to-
> field="serviceCtx.areaCode" operator="equals"/>
> @@ -190,7 +190,7 @@
> <not><if-empty field="contactMech"/></not>
> <if-compare-field field="newContactMechId" to-
> field="serviceCtx.contactMechId" operator="not-equals"/>
> </assert>
> - <get-related-one value-field="contactMech" relation-
> name="TelecomNumber" to-value-field="telecomNumber"/>
> + <get-related-one value-name="contactMech" relation-
> name="TelecomNumber" to-value-field="telecomNumber"/>
> <assert>
> <not><if-empty field="telecomNumber"/></not>
> <if-compare-field field="telecomNumber.contactNumber" to-
> field="serviceCtx.contactNumber" operator="equals"/>
> @@ -235,7 +235,7 @@
> <if-compare-field field="contactMechId" to-
> field="serviceCtx.contactMechId" operator="equals"/>
> </assert>
> <clear-field field="postalAddress"/>
> - <get-related-one value-field="contactMech" relation-
> name="PostalAddress" to-value-field="postalAddress"/>
> + <get-related-one value-name="contactMech" relation-
> name="PostalAddress" to-value-field="postalAddress"/>
> <assert>
> <not><if-empty field="postalAddress"/></not>
> <if-compare-field field="postalAddress.address1" to-
> field="serviceCtx.address1" operator="equals"/>
> @@ -261,7 +261,7 @@
> <not><if-empty field="contactMech"/></not>
> <if-compare-field field="newContactMechId" to-
> field="serviceCtx.contactMechId" operator="not-equals"/>
> </assert>
> - <get-related-one value-field="contactMech" relation-
> name="PostalAddress" to-value-field="postalAddress"/>
> + <get-related-one value-name="contactMech" relation-
> name="PostalAddress" to-value-field="postalAddress"/>
> <assert>
> <not><if-empty field="postalAddress"/></not>
> <if-compare-field
> field="postalAddress.stateProvinceGeoId" to-
> field="serviceCtx.stateProvinceGeoId" operator="equals"/>
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
> @@ -138,7 +138,7 @@
> </if-not-empty>
> <if-not-empty field="rollups">
> <iterate list="rollups" entry="parent">
> - <get-related-one relation-
> name="CurrentProductCategory" value-field="parent" to-value-
> field="currentProductCategory"/>
> + <get-related-one relation-
> name="CurrentProductCategory" value-name="parent" to-value-
> field="currentProductCategory"/>
> <field-to-list list="subCategories"
> field="currentProductCategory"/>
> </iterate>
> <if-not-empty field="subCategories">
> @@ -286,7 +286,7 @@
> </if-not-empty>
> <!-- Case For virtual Product -->
> <!-- get related assoc product -->
> - <get-related-one relation-name="Product" value-
> field="productCategoryMember" to-value-field="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"/>
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
> @@ -192,7 +192,7 @@
>
> <entity-one entity-name="WorkEffort" value-field="task"/>
> <if-not-empty field="task">
> - <get-related-one value-field="task" relation-
> name="FixedAsset" to-value-field="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-field="fixedAsset" relation-
> name="FixedAssetStdCost" map-name="costsAndMap" list="setupCosts"/>
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
> @@ -186,7 +186,7 @@
> </else>
> </if-not-empty>
>
> - <calculate field="quantityNotIssued" map-
> name="parameters"><number value="0"/></calculate>
> + <calculate field="parameters.quantityNotIssued"
> ><number value="0"/></calculate>
> </if-compare>
> </if-not-empty>
> </simple-method>
> @@ -204,7 +204,7 @@
> <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="quantity" map-
> name="issuanceCreateMap"><number value="1"/></calculate>
> + <calculate field="issuanceCreateMap.quantity"
> ><number value="1"/></calculate>
> <call-service service-name="createItemIssuance"
> in-map-name="issuanceCreateMap"/>
> <clear-field field="issuanceCreateMap"/>
>
> @@ -258,7 +258,7 @@
> <call-service service-
> name="createInventoryItemDetail" in-map-name="createDetailMap"/>
> <clear-field field="createDetailMap"/>
>
> - <calculate field="quantityNotIssued" map-
> name="parameters">
> + <calculate
> field="parameters.quantityNotIssued" >
> <calcop operator="subtract"
> field="parameters.quantityNotIssued">
> <calcop operator="get"
> field="parameters.deductAmount"/>
> </calcop>
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
> @@ -170,7 +170,7 @@
> <clear-field field="createDetailMap"/>
>
> <!-- get the promiseDatetime -->
> - <get-related-one value-
> field="lastNonSerInventoryItem" relation-name="ProductFacility" to-
> value-field="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">
> @@ -235,7 +235,7 @@
> <clear-field field="createDetailMap"/>
>
> <!-- get the promiseDatetime -->
> - <get-related-one value-
> field="newNonSerInventoryItem" relation-name="ProductFacility" to-
> value-field="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">
> @@ -450,8 +450,8 @@
> <call-service service-
> name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
> <clear-field field="reserveOisgirMap"/>
>
> - <calculate
> field="parameters.quantityNotReserved" >
> - <calcop operator="subtract"
> field="parameters.quantityNotReserved" >
> + <calculate field="quantityNotReserved" map-
> name="parameters">
> + <calcop operator="subtract"
> field="quantityNotReserved" map-name="parameters">
> <calcop operator="get"
> field="deductAmount" map-name="parameters"/>
> </calcop>
> </calculate>
> @@ -466,7 +466,7 @@
>
> <simple-method method-name="getPromisedDateTime" short-
> description="Get Inventory Promised Date/Time">
> <!-- get the promiseDatetime -->
> - <get-related-one value-field="inventoryItem" relation-
> name="ProductFacility" to-value-field="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 -->
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="inventoryItem" relation-
> name="Facility" to-value-field="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">
> @@ -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-field="lookedUpValue" relation-
> name="Facility" to-value-field="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="getAssoc" list="assocs"/>
> <filter-list-by-date list-name="assocs" to-list-
> name="assocsDate"/>
> <first-from-list entry="assoc" list="assocsDate"/>
> - <get-related-one value-field="assoc" relation-
> name="MainProduct" to-value-field="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>
> @@ -1259,7 +1259,7 @@
> <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-field="itemIssuance"
> relation-name="OrderHeader" to-value-field="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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 2008
> @@ -89,7 +89,7 @@
> <else>
> <!-- should generally only be one pick/primary
> location, just choose the first... -->
> <first-from-list
> entry="productFacilityLocationView"
> list="productFacilityLocationViewList"/>
> - <get-related-one value-
> field="productFacilityLocationView" relation-name="FacilityLocation"
> to-value-field="moveInfo.facilityLocationTo"/>
> + <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) -->
> @@ -251,10 +251,10 @@
> </condition>
> <then>
> <if-compare-field
> field="productFacilityLocationQuantityTest.productId" to-
> field="productSave.productId" operator="not-equals">
> - <get-related-one value-
> field="productFacilityLocationQuantityTest" relation-name="Product"
> to-value-field="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-
> field="productFacilityLocationQuantityTest" relation-
> name="FacilityLocation" to-value-field="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">
> @@ -302,7 +302,7 @@
> <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-
> field="InventoryItemAndLocation" relation-name="FacilityLocation" to-
> value-field="moveInfo.facilityLocationFrom"/>
> + <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"/>
> @@ -480,7 +480,7 @@
> -->
> <set from-field="inventoryItem.quantityOnHandTotal"
> field="remainingQuantityOnHand"/>
> <iterate
> entry="orderItemShipGrpInvResAndItemLocation"
> list="orderItemShipGrpInvResAndItemLocationList">
> - <get-related-one value-
> field="orderItemShipGrpInvResAndItemLocation" relation-
> name="OrderItemShipGrpInvRes" to-value-
> field="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
>
> 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=730373&r1=730372&r2=730373&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 Wed Dec 31 03:00:51 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-field="product" relation-
> name="ProductType" to-value-field="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/shipment/
> issuance/IssuanceServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> issuance/IssuanceServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> issuance/IssuanceServices.xml Wed Dec 31 03:00:51 2008
> @@ -38,7 +38,7 @@
> <create-value value-field="newEntity"/>
>
> <!-- if the InventoryItem issued is serialized, then change
> its status to DELIVERED -->
> - <get-related-one value-field="newEntity" relation-
> name="InventoryItem" to-value-field="inventoryItem"/>
> + <get-related-one value-name="newEntity" relation-
> name="InventoryItem" to-value-field="inventoryItem"/>
> <if-not-empty field="inventoryItem">
> <if-compare field="inventoryItem.inventoryItemTypeId"
> operator="equals" value="SERIALIZED_INV_ITEM">
> <set field="updateContext.inventoryItemId" from-
> field="inventoryItem.inventoryItemId"/>
> @@ -296,8 +296,8 @@
> <set from-field="parameters.shipmentId"
> field="shipmentItemLookupPk.shipmentId"/>
> <find-by-primary-key entity-name="ShipmentItem"
> map="shipmentItemLookupPk" value-field="shipmentItem"/>
> <else>
> - <calculate field="shipmentItem.quantity" >
> - <calcop operator="add"
> field="shipmentItem.quantity" >
> + <calculate field="quantity" map-name="shipmentItem">
> + <calcop operator="add" field="quantity" map-
> name="shipmentItem">
> <calcop operator="get" field="quantity" map-
> name="parameters"/>
> </calcop>
> </calculate>
> @@ -420,7 +420,7 @@
> <entity-one entity-name="ItemIssuance" value-
> field="itemIssuance"/>
> <get-related-one value-field="itemIssuance" relation-
> name="OrderHeader" to-value-field="orderHeader"/>
> <get-related-one value-field="itemIssuance" relation-
> name="InventoryItem" to-value-field="inventoryItem"/>
> - <get-related-one value-field="itemIssuance" relation-
> name="Shipment" to-value-field="shipment"/>
> + <get-related-one value-name="itemIssuance" relation-
> name="Shipment" to-value-field="shipment"/>
>
> <!-- issuance can be canceled only if the sales shipment is
> not packed -->
>
>
> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> picklist/PicklistServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> picklist/PicklistServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> picklist/PicklistServices.xml Wed Dec 31 03:00:51 2008
> @@ -129,13 +129,13 @@
> <set value="Y" field="allPickStarted"/>
> <set value="N" field="hasStockToPick"/>
> <iterate entry="orderItemShipGrpInvRes"
> list="orderItemShipGrpInvResList">
> - <get-related-one value-
> field="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-
> field="orderItem"/>
> + <get-related-one value-
> name="orderItemShipGrpInvRes" relation-name="OrderItem" to-value-
> field="orderItem"/>
> <if-compare field="orderItem.statusId"
> value="ITEM_APPROVED" operator="not-equals">
> <set value="N" field="pickThisOrder"/>
> </if-compare>
>
> <if-compare field="pickThisOrder"
> operator="equals" value="Y">
> - <get-related-one value-
> field="orderItemShipGrpInvRes" relation-name="InventoryItem" to-
> value-field="inventoryItem"/>
> + <get-related-one value-
> name="orderItemShipGrpInvRes" relation-name="InventoryItem" to-value-
> field="inventoryItem"/>
> <!-- Look for other picklists which
> might include this order item ship group inventory reservation. If
> it is on another picklist, then
> we should not include it again.
> We screen out picklists which are either cancelled or already picked
> or packed, so that we can re-pick items if
> (1) the previous picklist was
> cancelled, or
> @@ -199,7 +199,7 @@
> </if>
>
> <!-- check InventoryItem-
> >FacilityLocation (if exists), if it is of type FLT_BULK set needs
> stock move to true -->
> - <get-related-one value-
> field="inventoryItem" relation-name="FacilityLocation" to-value-
> field="facilityLocation"/>
> + <get-related-one value-
> name="inventoryItem" relation-name="FacilityLocation" to-value-
> field="facilityLocation"/>
> <if-not-empty
> field="facilityLocation">
> <if-compare
> field="facilityLocation.locationTypeEnumId" operator="equals"
> value="FLT_BULK">
> <set value="Y"
> field="needsStockMove"/>
> @@ -258,7 +258,7 @@
> <!-- put in pick or move lists for
> the given shipmentMethodTypeId -->
> <set from-
> field="orderItemShipGroup.shipmentMethodTypeId"
> field="shipmentMethodTypeId"/>
> <if-empty
> field="pickMoveByShipmentMethodInfoMap.${shipmentMethodTypeId}">
> - <get-related-one value-
> field="orderItemShipGroup" relation-name="ShipmentMethodType" to-
> value-field="pickMoveByShipmentMethodInfoMap.$
> {shipmentMethodTypeId}.shipmentMethodType"/>
> + <get-related-one value-
> name="orderItemShipGroup" relation-name="ShipmentMethodType" to-
> value-field="pickMoveByShipmentMethodInfoMap.$
> {shipmentMethodTypeId}.shipmentMethodType"/>
> </if-empty>
> <if-compare field="needsStockMove"
> operator="equals" value="Y">
> <field-to-list
> field="orderHeaderInfo" list="pickMoveByShipmentMethodInfoMap.$
> {shipmentMethodTypeId}.orderNeedsStockMoveInfoList"/>
> @@ -386,7 +386,7 @@
> <clear-field field="orderItemInfo"/>
> <set
> field="orderItemInfo.orderItemAndShipGroupAssoc" from-
> field="orderItemAndShipGroupAssoc"/>
> <set
> field="orderItemInfo.orderItemShipGrpInvResList" from-
> field="perItemResListValid"/>
> - <get-related-one value-
> field="orderItemAndShipGroupAssoc" relation-name="Product" to-value-
> field="orderItemInfo.product" use-cache="true"/>
> + <get-related-one value-
> name="orderItemAndShipGroupAssoc" relation-name="Product" to-value-
> field="orderItemInfo.product" use-cache="true"/>
> <set field="orderItemInfoList[]" from-
> field="orderItemInfo"/>
> </if-not-empty>
> <clear-field field="perItemResListValid"/>
> @@ -1028,7 +1028,7 @@
> <get-related value-field="picklist" relation-
> name="PicklistRole" list="picklistRoleList"/>
> <iterate entry="picklistRole" list="picklistRoleList">
> <clear-field field="picklistRoleInfo"/>
> - <get-related-one value-field="picklistRole" relation-
> name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView"
> use-cache="true"/>
> + <get-related-one value-name="picklistRole" relation-
> name="PartyNameView" to-value-field="picklistRoleInfo.partyNameView"
> use-cache="true"/>
> <get-related-one value-field="picklistRole" relation-
> name="RoleType" to-value-field="picklistRoleInfo.roleType" use-
> cache="true"/>
> <set from-field="picklistRole"
> field="picklistRoleInfo.picklistRole"/>
> <field-to-list field="picklistRoleInfo"
> list="picklistRoleInfoList"/>
> @@ -1038,7 +1038,7 @@
> <get-related value-field="picklist" relation-
> name="PicklistStatusHistory" list="picklistStatusHistoryList"/>
> <iterate entry="picklistStatusHistory"
> list="picklistStatusHistoryList">
> <clear-field field="picklistStatusHistoryInfo"/>
> - <get-related-one value-field="picklistStatusHistory"
> relation-name="StatusItem" to-value-
> field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
> + <get-related-one value-name="picklistStatusHistory"
> relation-name="StatusItem" to-value-
> field="picklistStatusHistoryInfo.statusItem" use-cache="true"/>
> <get-related-one value-field="picklistStatusHistory"
> relation-name="ToStatusItem" to-value-
> field="picklistStatusHistoryInfo.statusItemTo" use-cache="true"/>
> <set from-field="picklistStatusHistory"
> field="picklistStatusHistoryInfo.picklistStatusHistory"/>
> <field-to-list field="picklistStatusHistoryInfo"
> list="picklistStatusHistoryInfoList"/>
> @@ -1051,16 +1051,16 @@
> <get-related value-field="picklist" relation-
> name="PicklistBin" list-name="picklistBinList" order-by-
> list="picklistBinOrderList"/>
> <iterate entry="picklistBin" list="picklistBinList">
> <clear-field field="picklistBinInfo"/>
> - <get-related-one value-field="picklistBin" relation-
> name="PrimaryOrderHeader" to-value-
> field="picklistBinInfo.primaryOrderHeader"/>
> + <get-related-one value-name="picklistBin" relation-
> name="PrimaryOrderHeader" to-value-
> field="picklistBinInfo.primaryOrderHeader"/>
> <get-related-one value-field="picklistBin" relation-
> name="PrimaryOrderItemShipGroup" to-value-
> field="picklistBinInfo.primaryOrderItemShipGroup"/>
>
> <clear-field field="picklistItemInfoList"/>
> <get-related value-field="picklistBin" relation-
> name="PicklistItem" list="picklistItemList" use-cache="true"/>
> <iterate entry="picklistItem" list="picklistItemList">
> <clear-field field="picklistItemInfo"/>
> - <get-related-one value-field="picklistItem"
> relation-name="OrderItem" to-value-
> field="picklistItemInfo.orderItem"/>
> + <get-related-one value-name="picklistItem" relation-
> name="OrderItem" to-value-field="picklistItemInfo.orderItem"/>
> <get-related-one value-
> field="picklistItemInfo.orderItem" relation-name="Product" to-value-
> field="picklistItemInfo.product"/>
> - <get-related-one value-field="picklistItem"
> relation-name="InventoryItemAndLocation" to-value-
> field="picklistItemInfo.inventoryItemAndLocation"/>
> + <get-related-one value-name="picklistItem" relation-
> name="InventoryItemAndLocation" to-value-
> field="picklistItemInfo.inventoryItemAndLocation"/>
> <get-related-one value-field="picklistItem" relation-
> name="OrderItemShipGrpInvRes" to-value-
> field="picklistItemInfo.orderItemShipGrpInvRes"/>
> <get-related value-field="picklistItem" relation-
> name="ItemIssuance" list="picklistItemInfo.itemIssuanceList"/>
> <set from-field="picklistItem"
> field="picklistItemInfo.picklistItem"/>
> @@ -1079,9 +1079,9 @@
> <set from-field="picklistStatusHistoryInfoList"
> field="picklistInfo.picklistStatusHistoryInfoList"/>
> <set from-field="picklistBinInfoList"
> field="picklistInfo.picklistBinInfoList"/>
> <string-to-list string="sequenceId" list-name="orderBy"/>
> - <get-related-one value-field="picklist" relation-
> name="StatusItem" to-value-field="picklistInfo.statusItem" use-
> cache="true"/>
> + <get-related-one value-name="picklist" relation-
> name="StatusItem" to-value-field="picklistInfo.statusItem" use-
> cache="true"/>
> <get-related-one value-field="picklist" relation-
> name="Facility" to-value-field="picklistInfo.facility" use-
> cache="true"/>
> - <get-related-one value-field="picklist" relation-
> name="ShipmentMethodType" to-value-
> field="picklistInfo.shipmentMethodType" use-cache="true"/>
> + <get-related-one value-name="picklist" relation-
> name="ShipmentMethodType" to-value-
> field="picklistInfo.shipmentMethodType" use-cache="true"/>
> <get-related value-field="picklist" relation-
> name="StatusValidChangeToDetail" order-by-list="orderBy"
> list="picklistInfo.statusValidChangeToDetailList"/>
> </simple-method>
>
> @@ -1143,7 +1143,7 @@
>
> <!-- create a list of locations, then sort it, will have
> to create a reverse Map to go from location to inventory item -->
> <clear-field field="facilityLocation"/>
> - <get-related-one value-field="inventoryItem" relation-
> name="FacilityLocation" to-value-field="facilityLocation"/>
> + <get-related-one value-name="inventoryItem" relation-
> name="FacilityLocation" to-value-field="facilityLocation"/>
> <if-not-empty field="facilityLocation">
> <set from-field="facilityLocation"
> field="facilityLocationMap.${facilityLocation.locationSeqId}"/>
> <!-- support multiple invnetoryItemIds per
> facilityLocation.locationSeqId -->
> @@ -1184,7 +1184,7 @@
> <set from-field="inventoryItems.${inventoryItemId}"
> field="inventoryItemInfo.inventoryItem"/>
> <set from-field="inventoryItemOrderItems.$
> {inventoryItemId}" field="inventoryItemInfo.orderItems"/>
> <set from-field="inventoryItemQuantities.$
> {inventoryItemId}" field="inventoryItemInfo.quantity"/>
> - <get-related-one value-
> field="inventoryItemInfo.inventoryItem" relation-name="Product" to-
> value-field="inventoryItemInfo.product"/>
> + <get-related-one value-
> name="inventoryItemInfo.inventoryItem" relation-name="Product" to-
> value-field="inventoryItemInfo.product"/>
> <get-related-one value-
> field="inventoryItemInfo.inventoryItem" relation-name="StatusItem"
> to-value-field="inventoryItemInfo.statusItem"/>
>
> <field-to-list field="inventoryItemInfo"
> list="inventoryItemInfoList"/>
> @@ -1221,7 +1221,7 @@
> <set from-field="inventoryItems${inventoryItemId}"
> field="inventoryItemInfo.inventoryItem"/>
> <set from-field="inventoryItemOrderItems.$
> {inventoryItemId}" field="inventoryItemInfo.orderItems"/>
> <set from-field="inventoryItemQuantities.$
> {inventoryItemId}" field="inventoryItemInfo.quantity"/>
> - <get-related-one value-
> field="inventoryItemInfo.inventoryItem" relation-name="Product" to-
> value-field="inventoryItemInfo.product"/>
> + <get-related-one value-
> name="inventoryItemInfo.inventoryItem" relation-name="Product" to-
> value-field="inventoryItemInfo.product"/>
> <get-related-one value-
> field="inventoryItemInfo.inventoryItem" relation-name="StatusItem"
> to-value-field="inventoryItemInfo.statusItem"/>
>
> <set from-field="inventoryItemInfo"
> field="inventoryItemInfoList[]"/>
>
> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> receipt/ShipmentReceiptServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> receipt/ShipmentReceiptServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> receipt/ShipmentReceiptServices.xml Wed Dec 31 03:00:51 2008
> @@ -215,7 +215,7 @@
>
> <!-- if no inventory item type specified, get
> default from facility -->
> <if-empty field="parameters.inventoryItemTypeId">
> - <get-related-one value-field="returnHeader"
> relation-name="Facility" to-value-field="facility"/>
> + <get-related-one value-name="returnHeader"
> relation-name="Facility" to-value-field="facility"/>
> <set from-
> field="facility.defaultInventoryItemTypeId"
> field="parameters.inventoryItemTypeId"/>
> </if-empty>
>
> @@ -243,7 +243,7 @@
> <if-empty field="returnItem.expectedItemStatus">
> <set value="INV_RETURNED"
> field="returnItem.expectedItemStatus" type="String"/>
> </if-empty>
> - <get-related-one value-field="returnItem"
> relation-name="OrderItem" to-value-field="orderItem"/>
> + <get-related-one value-name="returnItem"
> relation-name="OrderItem" to-value-field="orderItem"/>
> <if-not-empty field="orderItem.productId">
> <set field="costCtx.returnItemSeqId" from-
> field="returnItem.returnItemSeqId"/>
> <set field="costCtx.returnId" from-
> field="returnItem.returnId"/>
> @@ -258,7 +258,7 @@
> <condition-expr field-
> name="inventoryItemTypeId" operator="equals"
> value="SERIALIZED_INV_ITEM"/>
> </condition-list>
> </entity-count>
> - <get-related-one value-field="returnHeader"
> relation-name="Facility" to-value-field="destinationFacility"/>
> + <get-related-one value-name="returnHeader"
> relation-name="Facility" to-value-field="destinationFacility"/>
> <set field="setNonSerial" value="false"/>
> <if-compare
> field="destinationFacility.defaultInventoryItemTypeId"
> value="NON_SERIAL_INV_ITEM" operator="equals">
> <if-compare field="serializedItemCount"
> value="0" operator="equals">
>
> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> shipment/ShipmentServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> shipment/ShipmentServices.xml (original)
> +++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/
> shipment/ShipmentServices.xml Wed Dec 31 03:00:51 2008
> @@ -1257,7 +1257,7 @@
> </or>
> </condition>
> <then>
> - <get-related-one relation-name="StatusItem" value-
> field="testShipment" to-value-field="testShipmentStatus"/>
> + <get-related-one relation-name="StatusItem" value-
> name="testShipment" to-value-field="testShipmentStatus"/>
> <string-to-list string="Cannot perform operation $
> {operationName} when the shipment is in the $
> {testShipmentStatus.description} [${testShipment.statusId}] status."
> list="error_list"/>
> </then>
> </if>
> @@ -1382,7 +1382,7 @@
> <field-map field-name="shipGroupSeqId" from-
> field="parameters.shipGroupSeqId"/>
> </entity-and>
> <iterate entry="orderItemShipGroupAssoc"
> list="orderItemShipGroupAssocs">
> - <get-related-one relation-name="OrderItem" value-
> field="orderItemShipGroupAssoc" to-value-field="orderItem"/>
> + <get-related-one relation-name="OrderItem" value-
> name="orderItemShipGroupAssoc" to-value-field="orderItem"/>
>
> <!-- Set the item status to completed -->
> <set field="itemStatusContext.orderId" from-
> field="parameters.orderId"/>
> @@ -1593,7 +1593,7 @@
>
> <!-- make sure the OrderItem is for a Product that
> has a ProductType with isPhysical=Y -->
> <if-not-empty field="itemProduct">
> - <get-related-one value-field="itemProduct"
> relation-name="ProductType" to-value-field="itemProductType" use-
> cache="true"/>
> + <get-related-one value-name="itemProduct"
> relation-name="ProductType" to-value-field="itemProductType" use-
> cache="true"/>
> <if-compare field="itemProductType.isPhysical"
> operator="equals" value="Y">
> <!-- Create shipment item -->
> <clear-field
> field="addOrderShipmentToShipmentCtx"/>
> @@ -1620,7 +1620,7 @@
> <make-value entity-name="OrderItemShipGrpInvRes" value-
> field="orderItemShipGrpInvResLookupPk"/>
> <set-pk-fields value-field="orderItemShipGrpInvResLookupPk"
> map="parameters"/>
> <find-by-primary-key entity-name="OrderItemShipGrpInvRes"
> map="orderItemShipGrpInvResLookupPk" value-
> field="orderItemShipGrpInvRes"/>
> - <get-related-one to-value-field="inventoryItem" relation-
> name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
> + <get-related-one to-value-name="inventoryItem" relation-
> name="InventoryItem" value-field="orderItemShipGrpInvRes"/>
> <if-compare-field operator="not-equals"
> field="inventoryItem.serialNumber" to-field="parameters.serialNumber">
> <!-- The inventory that we have reserved is not what we
> shipped. Lets reReserve, this time we'll get what we want -->
> <set-service-fields map="parameters" to-
> map="reserveAnInventoryItemCtx" service-
> name="reserveAnInventoryItem"/>
>
> Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/
> workeffort/timesheet/TimesheetServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/
> timesheet/TimesheetServices.xml (original)
> +++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/
> timesheet/TimesheetServices.xml Wed Dec 31 03:00:51 2008
> @@ -218,7 +218,7 @@
> <get-related value-
> field="workEffort" relation-name="CustRequestWorkEffort"
> list="custRequestWorkEfforts"/>
> <if-not-empty
> field="custRequestWorkEfforts">
> <first-from-list
> entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
> - <get-related-one value-
> field="custRequestWorkEffort" relation-name="CustRequest" to-value-
> field="custRequest"/>
> + <get-related-one value-
> name="custRequestWorkEffort" relation-name="CustRequest" to-value-
> field="custRequest"/>
> <if-not-empty
> field="custRequest">
> <set
> field="invoiceItemMap.description" value="$
> {custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/>
> </if-not-empty>
> @@ -346,7 +346,7 @@
> <set field="getRate.rateCurrencyUomId" from-
> field="parameters.currencyUomId"/>
> <set field="getRate.rateTypeId" from-
> field="timeEntry.rateTypeId"/>
> <if-empty field="timeEntry.partyId">
> - <get-related-one value-field="timeEntry" relation-
> name="Timesheet" to-value-field="timesheet"/>
> + <get-related-one value-name="timeEntry" relation-
> name="Timesheet" to-value-field="timesheet"/>
> <if-not-empty field="timesheet">
> <set field="getRate.partyId" from-
> field="timesheet.partyId"/>
> </if-not-empty>
> @@ -380,7 +380,7 @@
> </if-empty>
> <!-- check if the status is in progress... -->
> <if-compare field="timesheet.statusId"
> value="TIMESHEET_IN_PROCESS" operator="not-equals">
> - <get-related-one value-field="timesheet"
> relation-name="StatusItem" to-value-field="statusItem"/>
> + <get-related-one value-name="timesheet"
> relation-name="StatusItem" to-value-field="statusItem"/>
> <add-error><fail-message message="Can only
> update Timesheet, when status is in-process...current status: $
> {statusItem.description}"/></add-error>
> <log level="info" message="Can only update
> Timesheet, when status is in-process...is now: $
> {timesheet.statusId}"/>
> </if-compare>
>
> Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/
> hhfacility/FacilityServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/
> hhfacility/FacilityServices.xml (original)
> +++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/
> hhfacility/FacilityServices.xml Wed Dec 31 03:00:51 2008
> @@ -47,7 +47,7 @@
> <set value="hhFacility Receipt" field="receiveCtx.comments"/>
> <set from-field="nowTimestamp"
> field="receiveCtx.datetimeReceived"/>
> <set value="NON_SERIAL_INV_ITEM"
> field="receiveCtx.inventoryItemTypeId"/>
> - <calculate field="quantityRejected" map-name="receiveCtx"
> type="Double">
> + <calculate field="receiveCtx"
> type="Double.quantityRejected" >
> <number value="0"/>
> </calculate>
> <call-service service-name="receiveInventoryProduct" in-map-
> name="receiveCtx"/>
>
> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/
> project/ProjectServices.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730373&r1=730372&r2=730373&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/
> ProjectServices.xml (original)
> +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/
> ProjectServices.xml Wed Dec 31 03:00:51 2008
> @@ -484,7 +484,7 @@
> <field-map field-name="workEffortId" from-
> field="parameters.taskId"/>
> </entity-one>
> <if-not-empty field="task">
> - <get-related-one value-field="task" relation-
> name="ParentWorkEffort" to-value-field="phase"/>
> + <get-related-one value-name="task" relation-
> name="ParentWorkEffort" to-value-field="phase"/>
> <else>
> <return/>
> </else>
> @@ -495,7 +495,7 @@
> </entity-one>
> </else>
> </if-not-empty>
> - <get-related-one value-field="phase" relation-
> name="ParentWorkEffort" to-value-field="project"/>
> + <get-related-one value-name="phase" relation-
> name="ParentWorkEffort" to-value-field="project"/>
> <field-to-result field="project.workEffortId" result-
> name="projectId"/>
> <field-to-result field="project.workEffortName" result-
> name="projectName"/>
> <field-to-result field="phase.workEffortId" result-
> name="phaseId"/>
> @@ -890,7 +890,7 @@
> <!-- get the planned hours -->
> <set field="lowInfo" from-field="task"/>
> <set field="hoursPartyId" from-field="task.partyId"/>
> - <get-related-one value-field="task" relation-
> name="WorkEffort" to-value-field="lowInfo"/>
> + <get-related-one value-name="task" relation-
> name="WorkEffort" to-value-field="lowInfo"/>
> <call-simple-method method-name="getHours"/>
> <set field="taskParty.plannedHours" from-
> field="highInfo.plannedHours"/>
> <set field="taskParty.actualHours" from-
> field="highInfo.actualHours"/>
> @@ -1034,7 +1034,7 @@
> <if-not-empty field="actuals">
> <iterate entry="actual" list="actuals">
> <if-not-empty field="actual.hours">
> - <get-related-one value-field="actual" relation-
> name="Timesheet" to-value-field="timesheet"/>
> + <get-related-one value-name="actual" relation-
> name="Timesheet" to-value-field="timesheet"/>
>
> <!-- check if only a part of the registered
> hours need to be taken into account -->
> <set field="originalActualHours" from-
> field="actual.hours"/>
>
>