This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 66917d4504 Fixed: Prevent receiving items from 'Receive Inventory
Against Purchase Order' screen when shipment is in 'Received' status
(OFBIZ-13343) (#943)
66917d4504 is described below
commit 66917d45046743f4f798dc019ab2ab73f5810bc0
Author: Anahita Goljahani <[email protected]>
AuthorDate: Tue Jan 27 14:19:11 2026 +0100
Fixed: Prevent receiving items from 'Receive Inventory Against Purchase
Order' screen when shipment is in 'Received' status (OFBIZ-13343) (#943)
Even when a shipment has already been marked as 'Received', by clicking
on 'Receive Against PO', further items can be received and added to the
shipment because the 'Receive Item(s)' button is not disabled.
Considering that the event that marks the shipment as received triggers
the creation of the corresponding Purchase Invoice, this behavior is
problematic.
The steps to reproduce the issue are reported in ticket OFBIZ-13343.
---
.../ReceiveInventoryAgainstPurchaseOrder.groovy | 2 ++
.../ReceiveInventoryAgainstPurchaseOrder.ftl | 28 ++++++++++++----------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
index f0fb56dfd0..c8f0d16722 100644
---
a/applications/product/src/main/groovy/org/apache/ofbiz/product/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy
@@ -54,6 +54,8 @@ context.isPurchaseShipment = isPurchaseShipment
if (!isPurchaseShipment) {
return
}
+isShipmentReceived = shipment.statusId == 'PURCH_SHIP_RECEIVED'
+context.isShipmentReceived = isShipmentReceived
facility = shipment.getRelatedOne('DestinationFacility', false)
context.facility = facility
diff --git
a/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
b/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
index ca14ff7339..848511afca 100644
---
a/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
+++
b/applications/product/template/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
@@ -109,7 +109,7 @@ under the License.
<td>${uiLabelMap.CommonReceived}</td>
<td>${uiLabelMap.ProductOpenQuantity}</td>
<td>${uiLabelMap.ProductBackOrders}</td>
- <#if itemsAvailableToReceive>
+ <#if itemsAvailableToReceive && !isShipmentReceived>
<td>${uiLabelMap.CommonReceive}</td>
<td>${uiLabelMap.ProductInventoryItemType}</td>
<td colspan="2" align="right">
@@ -127,7 +127,7 @@ under the License.
<#assign backOrderedQuantity =
orderItemData.backOrderedQuantity?default(0)>
<#assign fulfilledReservations =
orderItemData.fulfilledReservations>
<tr id="orderItemData_tableRow_${rowCount}"
valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td>${(product.internalName)!}
[${orderItem.productId?default("N/A")}]</div></td>
+ <td>${(product.internalName)!}
[${orderItem.productId?default("N/A")}]</td>
<td>
<div>
<#assign upcaLookup =
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productId",
product.productId, "goodIdentificationTypeId", "UPCA")/>
@@ -140,7 +140,7 @@ under the License.
<td>${orderItemData.ordered}</td>
<td>${orderItemData.cancelled?default(0)}</td>
<td>
- <div ${(backOrderedQuantity > 0)?string("
errorMessage","")}">
+ <div class="${(backOrderedQuantity >
0)?string("errorMessage","")}">
${backOrderedQuantity}
</div>
</td>
@@ -155,7 +155,7 @@ under the License.
</#if>
</div>
</td>
- <#if availableToReceive > 0 >
+ <#if availableToReceive > 0 &&
!isShipmentReceived>
<td>
<input type="hidden"
name="productId_o_${rowCount}" value="${(product.productId)!}"/>
<input type="hidden"
name="facilityId_o_${rowCount}" value="${facilityId}"/>
@@ -202,14 +202,16 @@ under the License.
<#assign alt_row = !alt_row>
</#list>
<#if itemsAvailableToReceive>
- <tr>
- <td colspan="11" align="right">
- <a
href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId}&purchaseOrderId=${orderId}&clearAll=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonClearAll}</a>
- </td>
- <td align="right">
- <a class="smallSubmit"
href="javascript:populateQuantities(${rowCount -
1});document.selectAllForm.submit();">${uiLabelMap.ProductReceiveItem}</a>
- </td>
- </tr>
+ <#if !isShipmentReceived>
+ <tr>
+ <td colspan="11" align="right">
+ <a
href="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder?shipmentId=${shipmentId}&purchaseOrderId=${orderId}&clearAll=Y</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonClearAll}</a>
+ </td>
+ <td align="right">
+ <a class="smallSubmit"
href="javascript:populateQuantities(${rowCount -
1});document.selectAllForm.submit();">${uiLabelMap.ProductReceiveItem}</a>
+ </td>
+ </tr>
+ </#if>
<tr>
<td colspan="12" align="right">
<input form="orderForceCompletePurchaseOrder"
type="submit" value="${uiLabelMap.OrderForceCompletePurchaseOrder}"
class="smallSubmit"/>
@@ -226,7 +228,7 @@ under the License.
<input type="hidden" name="clearAll" value="Y"/>
</form>
</#if>
- <#if itemsAvailableToReceive && totalReadyToReceive <
totalAvailableToReceive>
+ <#if itemsAvailableToReceive && totalReadyToReceive <
totalAvailableToReceive && !isShipmentReceived>
<h3>${uiLabelMap.ProductReceiveInventoryAddProductToReceive}</h3>
<form name="addProductToReceive" method="post"
action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>">
<input type="hidden" name="shipmentId" value="${shipmentId}"/>
