diff --git a/src-db/database/model/functions/M_PRICELIST_CREATE.xml b/src-db/database/model/functions/M_PRICELIST_CREATE.xml
--- a/src-db/database/model/functions/M_PRICELIST_CREATE.xml
+++ b/src-db/database/model/functions/M_PRICELIST_CREATE.xml
@@ -93,6 +93,7 @@
         DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || Cur_Parameter.ParameterName) ;
       END IF;
     END LOOP; -- Get Parameter
+
     -- Checks if instance is migrated to new cost engine
     SELECT count(1) INTO v_isCostMigrated
     FROM DUAL
@@ -522,22 +523,25 @@
           )
           ;       
         ELSE    
-         UPDATE M_ProductPrice
+          UPDATE M_ProductPrice
           SET PriceList=ROUND((
           CASE Cur_DiscountLine.List_Base WHEN 'C' THEN PriceList*(1+Cur_DiscountLine.LIST_MARGIN/100) 
                                           WHEN 'FC' THEN CASE WHEN Cur_DiscountLine.List_Fixed >= PriceList THEN Cur_DiscountLine.List_Fixed ELSE PriceList*(1+Cur_DiscountLine.LIST_MARGIN/100) END
+                                          WHEN 'FCM' THEN CASE WHEN Cur_DiscountLine.List_Fixed >= PriceList*(1+Cur_DiscountLine.LIST_MARGIN/100) THEN Cur_DiscountLine.List_Fixed ELSE PriceList*(1+Cur_DiscountLine.LIST_MARGIN/100) END
                                           ELSE PriceList
           END
           ), v_StdPrecision),
           PriceStd=ROUND((
           CASE Cur_DiscountLine.Std_Base WHEN 'C' THEN PriceStd*(1+Cur_DiscountLine.STD_MARGIN/100) 
                                          WHEN 'FC' THEN CASE WHEN Cur_DiscountLine.Std_Fixed >= PriceStd THEN Cur_DiscountLine.Std_Fixed ELSE PriceStd*(1+Cur_DiscountLine.STD_MARGIN/100) END
+                                         WHEN 'FCM' THEN CASE WHEN Cur_DiscountLine.Std_Fixed >= PriceStd*(1+Cur_DiscountLine.STD_MARGIN/100) THEN Cur_DiscountLine.Std_Fixed ELSE PriceStd*(1+Cur_DiscountLine.STD_MARGIN/100) END
                                          ELSE PriceStd 
           END
           ), v_StdPrecision),
           PriceLimit=ROUND((
           CASE Cur_DiscountLine.Limit_Base WHEN 'C' THEN PriceLimit*(1+Cur_DiscountLine.LIMIT_MARGIN/100) 
                                            WHEN 'FC' THEN CASE WHEN Cur_DiscountLine.List_Fixed >= PriceLimit THEN Cur_DiscountLine.Limit_Fixed ELSE PriceLimit*(1+Cur_DiscountLine.LIST_MARGIN/100) END
+                                           WHEN 'FCM' THEN CASE WHEN Cur_DiscountLine.List_Fixed >= PriceLimit*(1+Cur_DiscountLine.LIST_MARGIN/100) THEN Cur_DiscountLine.Limit_Fixed ELSE PriceLimit*(1+Cur_DiscountLine.LIST_MARGIN/100) END
                                            ELSE PriceLimit
           END
           ), v_StdPrecision),
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -63486,7 +63486,7 @@
 <!--5255-->  <AD_COLUMN_ID><![CDATA[6628]]></AD_COLUMN_ID>
 <!--5255-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5255-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5255-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @List_Base@!'F' & @List_Base@!'C' & @List_Base@!'FC']]></DISPLAYLOGIC>
+<!--5255-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @List_Base@!'F' & @List_Base@!'C' & @List_Base@!'FC' & @List_Base@!'FCM']]></DISPLAYLOGIC>
 <!--5255-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5255-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5255-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -63516,7 +63516,7 @@
 <!--5256-->  <AD_COLUMN_ID><![CDATA[6629]]></AD_COLUMN_ID>
 <!--5256-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5256-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5256-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @List_Base@!'F' & @List_Base@!'C' & @List_Base@!'FC']]></DISPLAYLOGIC>
+<!--5256-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @List_Base@!'F' & @List_Base@!'C' & @List_Base@!'FC' & @List_Base@!'FCM']]></DISPLAYLOGIC>
 <!--5256-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5256-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5256-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -63665,7 +63665,7 @@
 <!--5261-->  <AD_COLUMN_ID><![CDATA[6634]]></AD_COLUMN_ID>
 <!--5261-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5261-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5261-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @Std_Base@!'F' & @Std_Base@!'C' & @Std_Base@!'FC']]></DISPLAYLOGIC>
+<!--5261-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @Std_Base@!'F' & @Std_Base@!'C' & @Std_Base@!'FC' & @Std_Base@!'FCM']]></DISPLAYLOGIC>
 <!--5261-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5261-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5261-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -63695,7 +63695,7 @@
 <!--5262-->  <AD_COLUMN_ID><![CDATA[6635]]></AD_COLUMN_ID>
 <!--5262-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5262-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5262-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @Std_Base@!'F' & @Std_Base@!'C' & @Std_Base@!'FC']]></DISPLAYLOGIC>
+<!--5262-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & @Std_Base@!'F' & @Std_Base@!'C' & @Std_Base@!'FC' & @Std_Base@!'FCM']]></DISPLAYLOGIC>
 <!--5262-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5262-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5262-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -65183,7 +65183,7 @@
 <!--5349-->  <AD_COLUMN_ID><![CDATA[6715]]></AD_COLUMN_ID>
 <!--5349-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5349-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5349-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@List_Base@='F' | @List_Base@='FC')]]></DISPLAYLOGIC>
+<!--5349-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@List_Base@='F' | @List_Base@='FC' | @List_Base@='FCM')]]></DISPLAYLOGIC>
 <!--5349-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5349-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5349-->  <SEQNO><![CDATA[110]]></SEQNO>
@@ -65213,7 +65213,7 @@
 <!--5350-->  <AD_COLUMN_ID><![CDATA[6716]]></AD_COLUMN_ID>
 <!--5350-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5350-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--5350-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@Std_Base@='F' | @Std_Base@='FC')]]></DISPLAYLOGIC>
+<!--5350-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@Std_Base@='F' | @Std_Base@='FC' | @Std_Base@='FCM')]]></DISPLAYLOGIC>
 <!--5350-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--5350-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5350-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -275697,7 +275697,7 @@
 <!--C3DA0880F565707CE040007F01003707-->  <AD_COLUMN_ID><![CDATA[C3DA0880F54C707CE040007F01003707]]></AD_COLUMN_ID>
 <!--C3DA0880F565707CE040007F01003707-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--C3DA0880F565707CE040007F01003707-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--C3DA0880F565707CE040007F01003707-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@List_Base@='C' | @List_Base@='FC')]]></DISPLAYLOGIC>
+<!--C3DA0880F565707CE040007F01003707-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@List_Base@='C' | @List_Base@='FC' | @List_Base@='FCM')]]></DISPLAYLOGIC>
 <!--C3DA0880F565707CE040007F01003707-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--C3DA0880F565707CE040007F01003707-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--C3DA0880F565707CE040007F01003707-->  <SEQNO><![CDATA[150]]></SEQNO>
@@ -275724,7 +275724,7 @@
 <!--C3DA0880F566707CE040007F01003707-->  <AD_COLUMN_ID><![CDATA[C3DA0880F54D707CE040007F01003707]]></AD_COLUMN_ID>
 <!--C3DA0880F566707CE040007F01003707-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--C3DA0880F566707CE040007F01003707-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--C3DA0880F566707CE040007F01003707-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@Std_Base@='C' | @Std_Base@='FC')]]></DISPLAYLOGIC>
+<!--C3DA0880F566707CE040007F01003707-->  <DISPLAYLOGIC><![CDATA[@DiscountType@='P' & (@Std_Base@='C' | @Std_Base@='FC' | @Std_Base@='FCM')]]></DISPLAYLOGIC>
 <!--C3DA0880F566707CE040007F01003707-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--C3DA0880F566707CE040007F01003707-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--C3DA0880F566707CE040007F01003707-->  <SEQNO><![CDATA[230]]></SEQNO>
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -8252,6 +8252,17 @@
 <!--137FAE2E0B2E41CB901067BC77E37EE7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--137FAE2E0B2E41CB901067BC77E37EE7--></AD_REF_LIST>
 
+<!--13BE42BFDE6448F1A8B1A179E17D3018--><AD_REF_LIST>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <AD_REF_LIST_ID><![CDATA[13BE42BFDE6448F1A8B1A179E17D3018]]></AD_REF_LIST_ID>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <VALUE><![CDATA[FCM]]></VALUE>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <NAME><![CDATA[Fixed Price or Cost plus Margin Based]]></NAME>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <AD_REFERENCE_ID><![CDATA[194]]></AD_REFERENCE_ID>
+<!--13BE42BFDE6448F1A8B1A179E17D3018-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--13BE42BFDE6448F1A8B1A179E17D3018--></AD_REF_LIST>
+
 <!--146E194904144669A27BEDDB0D79C47B--><AD_REF_LIST>
 <!--146E194904144669A27BEDDB0D79C47B-->  <AD_REF_LIST_ID><![CDATA[146E194904144669A27BEDDB0D79C47B]]></AD_REF_LIST_ID>
 <!--146E194904144669A27BEDDB0D79C47B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/M_OFFER_TYPE.xml b/src-db/database/sourcedata/M_OFFER_TYPE.xml
--- a/src-db/database/sourcedata/M_OFFER_TYPE.xml
+++ b/src-db/database/sourcedata/M_OFFER_TYPE.xml
@@ -8,6 +8,7 @@
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <PL_ORDER_IMPLEMENTOR><![CDATA[M_Promotion_Adjustment]]></PL_ORDER_IMPLEMENTOR>
+<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <EM_OBPOS_ISCATEGORY><![CDATA[N]]></EM_OBPOS_ISCATEGORY>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--></M_OFFER_TYPE>
 
 </data>