(ofbiz-framework) branch trunk updated: Improved: Corrected the condition to fetch currency UOM id from shipment instead of shipment route segment (#801)

[de...@apache.org]

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

devanshu 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 776eacc2a4 Improved: Corrected the condition to fetch currency UOM id from shipment instead of shipment route segment (#801)
776eacc2a4 is described below

commit 776eacc2a46de3779cea1f9b9748077d701e7929
Author: Sandeep Rajput <90...@users.noreply.github.com>
AuthorDate: Sat May 18 18:26:43 2024 +0530

    Improved: Corrected the condition to fetch currency UOM id from shipment instead of shipment route segment (#801)
    
    There is a typo in the condition while fetching a currency UOM id from the shipment route segment entity instead of shipment at the time of creating a shipment on the FedEx carrier.
---
 .../java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
index 3dd00a0439..80d208bebb 100644
--- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
+++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
@@ -538,7 +538,7 @@ public class FedexServices {
             String currencyCode = null;
             if (UtilValidate.isNotEmpty(shipmentRouteSegment.getString("currencyUomId"))) {
                 currencyCode = shipmentRouteSegment.getString("currencyUomId");
-            } else if (UtilValidate.isNotEmpty(shipmentRouteSegment.getString("currencyUomId"))) {
+            } else if (UtilValidate.isNotEmpty(shipment.getString("currencyUomId"))) {
                 currencyCode = shipment.getString("currencyUomId");
             } else {
                 currencyCode = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator);