QPR-12130 fix wrong error msg and clean up

Author: mgroncki

Docs/UserGuide/tradecomponents/underlying.tex

@@ -244,7 +244,7 @@ \subsubsection{Underlying}
 Allowable values: See Table \ref{tab:calendar}. Defaults to the null calendar if left blank or omitted, and \lstinline!Type!: is  \emph{Commodity}.
 
 \item \lstinline!FutureContractMonth! [Optional]:
-Only valid when  \lstinline!Type! is  \emph{Commodity}, \lstinline!PriceType! is FutureSettlement and there is no \lstinline!FutureExpiryDate! node. It specifies the underlying future contract month  in the format \emph{Mon-YYYY}, for example Nov-2023. 
+Only valid when  \lstinline!Type! is  \emph{Commodity}, \lstinline!PriceType! is FutureSettlement and there is no \lstinline!FutureExpiryDate! node. It specifies the underlying future contract month  in the format \emph{MonYYYY}, for example Nov2023. 
 
 \item \lstinline!FutureExpiryDate! [Optional]:
 Only valid when  \lstinline!Type! is  \emph{Commodity}, \lstinline!PriceType! is FutureSettlement and there is no \lstinline!FutureContractMonth! node. This gives the expiration date of the underlying commodity future contract. 

OREData/ored/portfolio/commodityposition.cpp

@@ -65,24 +65,23 @@ void CommodityPosition::build(const boost::shared_ptr<ore::data::EngineFactory>&
             ConventionsBasedFutureExpiry feCalc(*convention);
             Date expiry = Settings::instance().evaluationDate();
             Size nOffset = u.futureMonthOffset() == Null<Size>() ? 0 : u.futureMonthOffset();
+            if (u.deliveryRollDays() != Null<Size>()) {
+                auto cal =
+                    u.deliveryRollCalendar().empty() ? convention->calendar() : parseCalendar(u.deliveryRollCalendar());
+                expiry = cal.advance(expiry, u.deliveryRollDays() * Days, convention->businessDayConvention());
+            }
+            expiry = feCalc.nextExpiry(true, expiry, nOffset);
             if (!u.futureContractMonth().empty()) {
                 QL_REQUIRE(u.futureContractMonth().size() == 7,
-                           "FutureContractMonth has invalid format, please use Mon-YYYY, where 'Mon' is a 3 letter "
+                           "FutureContractMonth has invalid format, please use MonYYYY, where 'Mon' is a 3 letter "
                            "month abbreviation.");
                 auto month = parseMonth(u.futureContractMonth().substr(0, 3));
                 auto year = parseInteger(u.futureContractMonth().substr(3, 4));
                 Date contractDate(1, month, year);
                 expiry = feCalc.expiryDate(contractDate, nOffset, false);
             } else if (!u.futureExpiryDate().empty()) {
                 expiry = parseDate(u.futureExpiryDate());
-                expiry = feCalc.nextExpiry(true,expiry, nOffset, false);
-            } else {
-                if (u.deliveryRollDays() != Null<Size>()) {
-                    auto cal = u.deliveryRollCalendar().empty() ? convention->calendar()
-                                                                : parseCalendar(u.deliveryRollCalendar());
-                    expiry = cal.advance(expiry, u.deliveryRollDays() * Days, convention->businessDayConvention());
-                }
-                expiry = feCalc.nextExpiry(true, expiry, nOffset);
+                expiry = feCalc.nextExpiry(true, expiry, nOffset, false);
             }
             index = index->clone(expiry, pts);
         }