IOrderBL.getTimeZone: shall return system timezone in case org has no…

… timezone metasfresh/metasfresh-webui-api-legacy#1252
metasfresh · Sep 18, 2019 · afc640d · afc640d
1 parent 6a18d11
commit afc640d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/de.metas.business/src/main/java/de/metas/order/IOrderBL.java b/de.metas.business/src/main/java/de/metas/order/IOrderBL.java
@@ -228,5 +228,6 @@ public interface IOrderBL extends ISingletonService
 
 	ProjectId getProjectIdOrNull(OrderLineId orderLineId);
 
+	/** @return organization's timezone or system timezone; never returns null */
 	ZoneId getTimeZone(I_C_Order order);
 }
diff --git a/de.metas.business/src/main/java/de/metas/order/impl/OrderBL.java b/de.metas.business/src/main/java/de/metas/order/impl/OrderBL.java
@@ -91,6 +91,7 @@
 import de.metas.util.Services;
 import de.metas.util.collections.CollectionUtils;
 import de.metas.util.lang.CoalesceUtil;
+import de.metas.util.time.SystemTime;
 import lombok.NonNull;
 
 public class OrderBL implements IOrderBL
@@ -1067,6 +1068,7 @@ public ZoneId getTimeZone(@NonNull final I_C_Order order)
 		final IOrgDAO ordersRepo = Services.get(IOrgDAO.class);
 
 		final OrgId orgId = OrgId.ofRepoIdOrAny(order.getAD_Org_ID());
-		return ordersRepo.getOrgInfoById(orgId).getTimeZone();
+		final ZoneId timeZone = ordersRepo.getOrgInfoById(orgId).getTimeZone();
+		return timeZone != null ? timeZone : SystemTime.zoneId();
 	}
 }