This is an automated email from the ASF dual-hosted git repository.

deepak 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 aabd04b04e Improved: Fixed missing receiptId and facilityId when 
canceling a par… (#905)
aabd04b04e is described below

commit aabd04b04e2a8bdd7d4149dd5b3226d605e9709e
Author: Yashwant Dhakad <[email protected]>
AuthorDate: Mon Sep 1 12:54:28 2025 +0530

    Improved: Fixed missing receiptId and facilityId when canceling a par… 
(#905)
    
    Improved: Fixed missing receiptId and facilityId when canceling a
    partially received PO receipt causing error messages (OFBIZ-13283).
    
    Co-authored-by: Yashwant Dhakad <[email protected]>
---
 .../product/template/inventory/ReceiveInventory.ftl       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/applications/product/template/inventory/ReceiveInventory.ftl 
b/applications/product/template/inventory/ReceiveInventory.ftl
index 28b4dd35a0..a020c1218f 100644
--- a/applications/product/template/inventory/ReceiveInventory.ftl
+++ b/applications/product/template/inventory/ReceiveInventory.ftl
@@ -42,10 +42,6 @@ under the License.
               <td></td>
             </tr>
             <#list receivedItems as item>
-              <form name="cancelReceivedItemsForm_${item_index}" method="post" 
action="<@ofbizUrl>cancelReceivedItems</@ofbizUrl>">
-                <input type="hidden" name="receiptId" value 
="${(item.receiptId)!}"/>
-                <input type="hidden" name="purchaseOrderId" value 
="${(item.orderId)!}"/>
-                <input type="hidden" name="facilityId" value 
="${facilityId!}"/>
                 <tr>
                   <td><a 
href="<@ofbizUrl>ViewShipment?shipmentId=${item.shipmentId!}</@ofbizUrl>" 
class="buttontext">${item.shipmentId!} ${item.shipmentItemSeqId!}</a></td>
                   <td>${item.receiptId}</td>
@@ -59,11 +55,16 @@ under the License.
                   <td>${item.quantityAccepted?string.number}</td>
                   <td>
                     <#if (item.quantityAccepted?int > 0 || 
item.quantityRejected?int > 0)>
+                      <form name="cancelReceivedItemsForm_${item_index}" 
method="post" action="<@ofbizUrl>cancelReceivedItems</@ofbizUrl>">
+                        <input type="hidden" name="receiptId" value 
="${(item.receiptId)!}"/>
+                        <input type="hidden" name="purchaseOrderId" value 
="${(item.orderId)!}"/>
+                        <input type="hidden" name="facilityId" value 
="${facilityId!}"/>
                       <a 
href="javascript:document.cancelReceivedItemsForm_${item_index}.submit();" 
class="buttontext">${uiLabelMap.CommonCancel}</a>
+                      </form>
                     </#if>
                   </td>
                 </tr>
-              </form>
+
             </#list>
             <tr><td colspan="10"><hr /></td></tr>
           </table>
@@ -198,8 +199,8 @@ under the License.
                   <input type="text" name="datetimeReceived" size="24" 
value="${nowTimestamp}" />
                 </td>
               </tr>
-              
-              
+
+
               <tr>
                 <td width="14%">&nbsp;</td>
                 <td width="6%" align="right" nowrap="nowrap" 
class="label">${uiLabelMap.lotId}</td>

Reply via email to