diff --git a/src-db/database/model/tables/M_OFFER_TYPE.xml b/src-db/database/model/tables/M_OFFER_TYPE.xml
index 6c048ee459..d605ad70a1 100644
--- a/src-db/database/model/tables/M_OFFER_TYPE.xml
+++ b/src-db/database/model/tables/M_OFFER_TYPE.xml
@@ -49,6 +49,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISDISCRETIONARY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_OFFERTYPE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
index 5afff484c1..e0bce48dba 100644
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
@@ -684,6 +684,17 @@ WHERE ((IsAcctLegalEntity<>'N' or IsLegalEntity<>'Y') or (o.C_ACCTSCHEMA_ID is n
 <!--02E05081036040C282E16EC828378E87-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--02E05081036040C282E16EC828378E87--></AD_AUXILIARINPUT>
 
+<!--03809B6D75374A778EB460FFB6423823--><AD_AUXILIARINPUT>
+<!--03809B6D75374A778EB460FFB6423823-->  <AD_AUXILIARINPUT_ID><![CDATA[03809B6D75374A778EB460FFB6423823]]></AD_AUXILIARINPUT_ID>
+<!--03809B6D75374A778EB460FFB6423823-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--03809B6D75374A778EB460FFB6423823-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--03809B6D75374A778EB460FFB6423823-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--03809B6D75374A778EB460FFB6423823-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
+<!--03809B6D75374A778EB460FFB6423823-->  <NAME><![CDATA[isDiscretionary]]></NAME>
+<!--03809B6D75374A778EB460FFB6423823-->  <CODE><![CDATA[@SQL=SELECT isdiscretionary from m_offer_type where m_offer_type_id = @M_Offer_Type_ID@]]></CODE>
+<!--03809B6D75374A778EB460FFB6423823-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--03809B6D75374A778EB460FFB6423823--></AD_AUXILIARINPUT>
+
 <!--0389829094184BC4A99B307868F278EE--><AD_AUXILIARINPUT>
 <!--0389829094184BC4A99B307868F278EE-->  <AD_AUXILIARINPUT_ID><![CDATA[0389829094184BC4A99B307868F278EE]]></AD_AUXILIARINPUT_ID>
 <!--0389829094184BC4A99B307868F278EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
index 1599df1006..cbf070fe53 100644
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -272624,6 +272624,44 @@ In case they are not "Check On Save", this verification is skipped. The purpose
 <!--3D052CA5B23E477B9B2D635E85326719-->  <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
 <!--3D052CA5B23E477B9B2D635E85326719--></AD_COLUMN>
 
+<!--3D0B0F8B933A423DA3B9210C82BCFD36--><AD_COLUMN>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_COLUMN_ID><![CDATA[3D0B0F8B933A423DA3B9210C82BCFD36]]></AD_COLUMN_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <NAME><![CDATA[Isdiscretionary]]></NAME>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <COLUMNNAME><![CDATA[Isdiscretionary]]></COLUMNNAME>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_ELEMENT_ID><![CDATA[F3FCC33DCDE14084B03B468624F877E9]]></AD_ELEMENT_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <POSITION><![CDATA[17]]></POSITION>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36-->  <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[N]]></IS_CHILD_PROPERTY_IN_PARENT>
+<!--3D0B0F8B933A423DA3B9210C82BCFD36--></AD_COLUMN>
+
 <!--3D172FE6AC324F2E94EB5CC371745EF6--><AD_COLUMN>
 <!--3D172FE6AC324F2E94EB5CC371745EF6-->  <AD_COLUMN_ID><![CDATA[3D172FE6AC324F2E94EB5CC371745EF6]]></AD_COLUMN_ID>
 <!--3D172FE6AC324F2E94EB5CC371745EF6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -366225,7 +366263,7 @@ The distribution algorithm will be driven by this priority. The pending payments
 <!--B0718076FC0140809F31330F12ED1A49-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B0718076FC0140809F31330F12ED1A49-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B0718076FC0140809F31330F12ED1A49-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B0718076FC0140809F31330F12ED1A49-->  <POSITION><![CDATA[12]]></POSITION>
+<!--B0718076FC0140809F31330F12ED1A49-->  <POSITION><![CDATA[11]]></POSITION>
 <!--B0718076FC0140809F31330F12ED1A49-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B0718076FC0140809F31330F12ED1A49-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B0718076FC0140809F31330F12ED1A49-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -395079,7 +395117,7 @@ Usually, company's internal identifiers for various records (products, customers
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <POSITION><![CDATA[13]]></POSITION>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <POSITION><![CDATA[12]]></POSITION>
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--D78D221F30EF470BAC7C194A2CA6FA59-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -409382,7 +409420,7 @@ This field is populated in case the used price list includes taxes.]]></HELP>
 <!--F755E1C257E040D3880FA7398612B26D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--F755E1C257E040D3880FA7398612B26D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--F755E1C257E040D3880FA7398612B26D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F755E1C257E040D3880FA7398612B26D-->  <POSITION><![CDATA[11]]></POSITION>
+<!--F755E1C257E040D3880FA7398612B26D-->  <POSITION><![CDATA[10]]></POSITION>
 <!--F755E1C257E040D3880FA7398612B26D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--F755E1C257E040D3880FA7398612B26D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--F755E1C257E040D3880FA7398612B26D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
index 8c675712ca..f4fa20209b 100644
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -37498,6 +37498,18 @@ This field is populated in case the used price list includes taxes.]]></HELP>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F3BF680089754BAC858ECFF2D5D0F232--></AD_ELEMENT>
 
+<!--F3FCC33DCDE14084B03B468624F877E9--><AD_ELEMENT>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <AD_ELEMENT_ID><![CDATA[F3FCC33DCDE14084B03B468624F877E9]]></AD_ELEMENT_ID>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <COLUMNNAME><![CDATA[Isdiscretionary]]></COLUMNNAME>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <NAME><![CDATA[Is Discretionary]]></NAME>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <PRINTNAME><![CDATA[Is Discretionary]]></PRINTNAME>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F3FCC33DCDE14084B03B468624F877E9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F3FCC33DCDE14084B03B468624F877E9--></AD_ELEMENT>
+
 <!--F46C4D32ECF94BE7A979F857D5A261AE--><AD_ELEMENT>
 <!--F46C4D32ECF94BE7A979F857D5A261AE-->  <AD_ELEMENT_ID><![CDATA[F46C4D32ECF94BE7A979F857D5A261AE]]></AD_ELEMENT_ID>
 <!--F46C4D32ECF94BE7A979F857D5A261AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
index f5ad187c05..37b3a1e593 100644
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -120140,6 +120140,7 @@ Usually, company's internal identifiers for various records (products, customers
 <!--801475-->  <AD_COLUMN_ID><![CDATA[801120]]></AD_COLUMN_ID>
 <!--801475-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--801475-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--801475-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--801475-->  <DISPLAYLENGTH><![CDATA[21]]></DISPLAYLENGTH>
 <!--801475-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--801475-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -234152,6 +234153,32 @@ Advanced features are only granted to the automatic roles defined as advanced.]]
 <!--65310BC53DCB4A7E9A6C91EA30426B49-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--65310BC53DCB4A7E9A6C91EA30426B49--></AD_FIELD>
 
+<!--65426CE5F5E64157A3F7366ED5F2F1DC--><AD_FIELD>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_FIELD_ID><![CDATA[65426CE5F5E64157A3F7366ED5F2F1DC]]></AD_FIELD_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <NAME><![CDATA[Is Discretionary]]></NAME>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_COLUMN_ID><![CDATA[3D0B0F8B933A423DA3B9210C82BCFD36]]></AD_COLUMN_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--65426CE5F5E64157A3F7366ED5F2F1DC--></AD_FIELD>
+
 <!--654AB3071D5247C694983CD4BC269F3E--><AD_FIELD>
 <!--654AB3071D5247C694983CD4BC269F3E-->  <AD_FIELD_ID><![CDATA[654AB3071D5247C694983CD4BC269F3E]]></AD_FIELD_ID>
 <!--654AB3071D5247C694983CD4BC269F3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml
index 6955b21634..91757c2c76 100644
--- a/src-db/database/sourcedata/AD_TAB.xml
+++ b/src-db/database/sourcedata/AD_TAB.xml
@@ -8478,6 +8478,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--800080-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800080-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--800080-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--800080-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--800080-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--800080-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--800080-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -8509,6 +8510,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--800081-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800081-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--800081-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--800081-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--800081-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--800081-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--800081-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -8540,6 +8542,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--800082-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800082-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--800082-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--800082-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--800082-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--800082-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--800082-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -8571,6 +8574,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--800083-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800083-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--800083-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--800083-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--800083-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--800083-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--800083-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -11577,6 +11581,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--800232-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800232-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--800232-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--800232-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--800232-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--800232-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--800232-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -13843,6 +13848,7 @@ WARNING: This window is not supported anymore and it is only kept for backward c
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -14954,6 +14960,7 @@ The corresponding tables have then the following setting:
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--3B75742CD54D4103981CAF0C4905CF56-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--3B75742CD54D4103981CAF0C4905CF56-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -17390,6 +17397,7 @@ You can also select if transactions are allowed or not for this organization typ
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--7CC730A494D24CD8B8D50B24D114819F-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--7CC730A494D24CD8B8D50B24D114819F-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
@@ -21411,6 +21419,7 @@ AND (e.storageBin is null OR ad_org_isinnaturaltree(@MaterialMgmtShipmentInOut.o
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <HQLWHERECLAUSE><![CDATA[e.isincludecharacteristics=false]]></HQLWHERECLAUSE>
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <DISPLAYLOGIC><![CDATA[@isDiscretionary@!'Y']]></DISPLAYLOGIC>
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--FCD9F93ADD924AA2AF0846651C3CC4ED-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
diff --git a/src-db/database/sourcedata/M_OFFER_TYPE.xml b/src-db/database/sourcedata/M_OFFER_TYPE.xml
index c00b950cf3..e67520c067 100644
--- a/src-db/database/sourcedata/M_OFFER_TYPE.xml
+++ b/src-db/database/sourcedata/M_OFFER_TYPE.xml
@@ -8,6 +8,8 @@
 <!--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-->  <ISDISCRETIONARY><![CDATA[N]]></ISDISCRETIONARY>
+<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <EM_OBPOS_ISCATEGORY><![CDATA[N]]></EM_OBPOS_ISCATEGORY>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--></M_OFFER_TYPE>
 
 </data>