You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/11/23 15:07:41 UTC
svn commit: r883348 - in
/ofbiz/trunk/applications/product/script/org/ofbiz/shipment:
issuance/IssuanceServices.xml receipt/ShipmentReceiptServices.xml
Author: ashish
Date: Mon Nov 23 14:07:40 2009
New Revision: 883348
URL: http://svn.apache.org/viewvc?rev=883348&view=rev
Log:
Applied patch from jira issue OFBIZ-2619 - Issues with Receive PO functionality.
-- updated patch with use of variable name modifiers in UEL arithmetic, as suggested by Adrian.
Thanks Mridul for the contribution.
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
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=883348&r1=883347&r2=883348&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 Mon Nov 23 14:07:40 2009
@@ -323,7 +323,7 @@
</entity-and>
<if-not-empty field="itemIssuances">
<first-from-list entry="itemIssuance" list="itemIssuances"/>
- <set field="itemIssuance.quantity" value="${itemIssuance.quantity + parameters.quantity}" type="BigDecimal"/>
+ <set field="itemIssuance.quantity" value="${itemIssuance.quantity$bigDecimal + parameters.quantity$bigDecimal}" type="BigDecimal"/>
<store-value value-field="itemIssuance"/>
<set field="itemIssuanceId" from-field="itemIssuance.itemIssuanceId"/>
<field-to-result field="itemIssuanceId"/>
@@ -595,7 +595,7 @@
<field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</entity-and>
<iterate entry="itemIssuance" list="allItemIssuances">
- <set field="totalIssuedQuantity" value="${totalIssuedQuantity + itemIssuance.quantity}" type="BigDecimal"/>
+ <set field="totalIssuedQuantity" value="${totalIssuedQuantity$bigDecimal + itemIssuance.quantity$bigDecimal}" type="BigDecimal"/>
</iterate>
</simple-method>
</simple-methods>
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=883348&r1=883347&r2=883348&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 Mon Nov 23 14:07:40 2009
@@ -374,10 +374,10 @@
<else>
<call-simple-method method-name="getTotalIssuedQuantityForOrderItem" xml-resource="component://product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml"/>
<call-simple-method method-name="getReceivedQuantityForOrderItem"/>
- <set field="receivedQuantity" value="${receivedQuantity + parameters.quantity}" type="BigDecimal"/>
+ <set field="receivedQuantity" value="${receivedQuantity$bigDecimal + parameters.quantity$bigDecimal}" type="BigDecimal"/>
<if-compare-field field="totalIssuedQuantity" operator="less" to-field="receivedQuantity" type="BigDecimal">
- <set field="quantityToAdd" value="${receivedQuantity - totalIssuedQuantity}" type="BigDecimal"/>
- <set field="shipmentItem.quantity" value="${shipmentItem.quantity + quantityToAdd}" type="BigDecimal"/>
+ <set field="quantityToAdd" value="${receivedQuantity$bigDecimal - totalIssuedQuantity$bigDecimal}" type="BigDecimal"/>
+ <set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="shipmentItem"/>
<set field="shipmentItemSeqId" from-field="shipmentItem.shipmentItemSeqId"/>
@@ -390,7 +390,7 @@
<order-by field-name="-issuedDateTime"/>
</entity-and>
<first-from-list entry="itemIssuance" list="itemIssuances"/>
- <set field="itemIssuance.quantity" value="${itemIssuance.quantity + quantityToAdd}" type="BigDecimal"/>
+ <set field="itemIssuance.quantity" value="${itemIssuance.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="itemIssuance"/>
<set field="itemIssuanceId" from-field="itemIssuance.itemIssuanceId"/>
</if-compare-field>
@@ -414,7 +414,7 @@
<field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
</entity-and>
<iterate entry="shipmentReceipt" list="shipmentReceipts">
- <set field="receivedQuantity" value="${receivedQuantity + shipmentReceipt.quantityAccepted}" type="BigDecimal"/>
+ <set field="receivedQuantity" value="${receivedQuantity$bigDecimal + shipmentReceipt.quantityAccepted$bigDecimal}" type="BigDecimal"/>
</iterate>
</simple-method>
@@ -442,7 +442,7 @@
<if-not-empty field="orderItem.productId">
<call-simple-method method-name="getTotalIssuedQuantityForOrderItem" xml-resource="component://product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml"/>
<if-compare-field field="totalIssuedQuantity" operator="less" to-field="receivedQuantity" type="BigDecimal">
- <set field="quantityToAdd" value="${receivedQuantity - totalIssuedQuantity}" type="BigDecimal"/>
+ <set field="quantityToAdd" value="${receivedQuantity$bigDecimal - totalIssuedQuantity$bigDecimal}" type="BigDecimal"/>
<entity-condition entity-name="ShipmentItem" list="shipmentItems">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="orderItem.productId"/>
@@ -452,7 +452,7 @@
<order-by field-name="shipmentItemSeqId"/>
</entity-condition>
<first-from-list entry="shipmentItem" list="shipmentItems"/>
- <set field="shipmentItem.quantity" value="${shipmentItem.quantity + quantityToAdd}" type="BigDecimal"/>
+ <set field="shipmentItem.quantity" value="${shipmentItem.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="shipmentItem"/>
<entity-and list="itemIssuances" entity-name="ItemIssuance">
@@ -463,7 +463,7 @@
<order-by field-name="-issuedDateTime"/>
</entity-and>
<first-from-list entry="itemIssuance" list="itemIssuances"/>
- <set field="itemIssuance.quantity" value="${itemIssuance.quantity + quantityToAdd}" type="BigDecimal"/>
+ <set field="itemIssuance.quantity" value="${itemIssuance.quantity$bigDecimal + quantityToAdd$bigDecimal}" type="BigDecimal"/>
<store-value value-field="itemIssuance"/>
<set field="itemIssuanceId" from-field="itemIssuance.itemIssuanceId"/>