[discount] Renamed Price Adjustments to Promotions and Discounts
authorAsier Lostalé <asier.lostale@openbravo.com>
Wed, 03 Oct 2012 16:22:42 +0200
changeset 18313 b7aacb57f4a1
parent 18312 1ea1eeec6915
child 18314 bc2b1d9f2f6d
[discount] Renamed Price Adjustments to Promotions and Discounts
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_WINDOW.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -146397,7 +146397,7 @@
 <!--801104-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801104-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801104-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801104-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801104-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801104-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801104-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
 <!--801104-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -147365,7 +147365,7 @@
 <!--801131-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801131-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801131-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801131-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801131-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801131-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801131-->  <AD_TABLE_ID><![CDATA[800063]]></AD_TABLE_ID>
 <!--801131-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -147721,7 +147721,7 @@
 <!--801141-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801141-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801141-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801141-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801141-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801141-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801141-->  <AD_TABLE_ID><![CDATA[800064]]></AD_TABLE_ID>
 <!--801141-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -148077,7 +148077,7 @@
 <!--801151-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801151-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801151-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801151-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801151-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801151-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801151-->  <AD_TABLE_ID><![CDATA[800065]]></AD_TABLE_ID>
 <!--801151-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -148434,7 +148434,7 @@
 <!--801161-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801161-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801161-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801161-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801161-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801161-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801161-->  <AD_TABLE_ID><![CDATA[800066]]></AD_TABLE_ID>
 <!--801161-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -148504,7 +148504,7 @@
 <!--801163-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801163-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801163-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801163-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801163-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801163-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801163-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
 <!--801163-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -148573,7 +148573,7 @@
 <!--801165-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801165-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801165-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801165-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801165-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801165-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--801165-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
 <!--801165-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -184952,7 +184952,7 @@
 <!--803118-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--803118-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--803118-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803118-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803118-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803118-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--803118-->  <AD_TABLE_ID><![CDATA[800185]]></AD_TABLE_ID>
 <!--803118-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -185415,7 +185415,7 @@
 <!--803131-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--803131-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--803131-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803131-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803131-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803131-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--803131-->  <AD_TABLE_ID><![CDATA[800186]]></AD_TABLE_ID>
 <!--803131-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -189573,7 +189573,7 @@
 <!--803261-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--803261-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--803261-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803261-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803261-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803261-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--803261-->  <AD_TABLE_ID><![CDATA[800194]]></AD_TABLE_ID>
 <!--803261-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -282688,7 +282688,7 @@
 <!--B059926E49A94F68963E064C270F5C33-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B059926E49A94F68963E064C270F5C33-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--B059926E49A94F68963E064C270F5C33-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--B059926E49A94F68963E064C270F5C33-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--B059926E49A94F68963E064C270F5C33-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--B059926E49A94F68963E064C270F5C33-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
 <!--B059926E49A94F68963E064C270F5C33-->  <AD_TABLE_ID><![CDATA[CBF045D2539A4249B091CCE4B1F5EEDB]]></AD_TABLE_ID>
 <!--B059926E49A94F68963E064C270F5C33-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -14382,10 +14382,10 @@
 <!--800273-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800273-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800273-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
-<!--800273-->  <NAME><![CDATA[Price Adjustment]]></NAME>
-<!--800273-->  <PRINTNAME><![CDATA[Price Adjustment]]></PRINTNAME>
+<!--800273-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
+<!--800273-->  <PRINTNAME><![CDATA[Promotion/Discount]]></PRINTNAME>
 <!--800273-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--800273-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--800273-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--800273-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800273-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--800273--></AD_ELEMENT>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -120179,9 +120179,9 @@
 <!--801463-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801463-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801463-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801463-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801463-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801463-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801463-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801463-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801463-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801463-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
 <!--801463-->  <AD_COLUMN_ID><![CDATA[801104]]></AD_COLUMN_ID>
@@ -120727,9 +120727,9 @@
 <!--801482-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801482-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801482-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801482-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801482-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801482-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801482-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801482-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801482-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801482-->  <AD_TAB_ID><![CDATA[800080]]></AD_TAB_ID>
 <!--801482-->  <AD_COLUMN_ID><![CDATA[801131]]></AD_COLUMN_ID>
@@ -120893,9 +120893,9 @@
 <!--801488-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801488-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801488-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801488-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801488-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801488-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801488-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801488-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801488-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801488-->  <AD_TAB_ID><![CDATA[800081]]></AD_TAB_ID>
 <!--801488-->  <AD_COLUMN_ID><![CDATA[801141]]></AD_COLUMN_ID>
@@ -121060,9 +121060,9 @@
 <!--801494-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801494-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801494-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801494-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801494-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801494-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801494-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801494-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801494-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801494-->  <AD_TAB_ID><![CDATA[800082]]></AD_TAB_ID>
 <!--801494-->  <AD_COLUMN_ID><![CDATA[801151]]></AD_COLUMN_ID>
@@ -121227,9 +121227,9 @@
 <!--801500-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801500-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801500-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801500-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801500-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801500-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801500-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801500-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801500-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801500-->  <AD_TAB_ID><![CDATA[800083]]></AD_TAB_ID>
 <!--801500-->  <AD_COLUMN_ID><![CDATA[801161]]></AD_COLUMN_ID>
@@ -121487,9 +121487,9 @@
 <!--801509-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801509-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801509-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801509-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801509-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801509-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801509-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801509-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801509-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801509-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
 <!--801509-->  <AD_COLUMN_ID><![CDATA[801165]]></AD_COLUMN_ID>
@@ -121542,7 +121542,7 @@
 <!--801512-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801512-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801512-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801512-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801512-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801512-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801512-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
 <!--801512-->  <AD_COLUMN_ID><![CDATA[801165]]></AD_COLUMN_ID>
@@ -121593,9 +121593,9 @@
 <!--801517-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801517-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801517-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801517-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--801517-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--801517-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801517-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801517-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801517-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801517-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
 <!--801517-->  <AD_COLUMN_ID><![CDATA[801163]]></AD_COLUMN_ID>
@@ -121649,7 +121649,7 @@
 <!--801519-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801519-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--801519-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--801519-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--801519-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--801519-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801519-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
 <!--801519-->  <AD_COLUMN_ID><![CDATA[801163]]></AD_COLUMN_ID>
@@ -149301,9 +149301,9 @@
 <!--803465-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803465-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803465-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803465-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--803465-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--803465-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803465-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803465-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803465-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--803465-->  <AD_TAB_ID><![CDATA[800221]]></AD_TAB_ID>
 <!--803465-->  <AD_COLUMN_ID><![CDATA[803118]]></AD_COLUMN_ID>
@@ -149553,9 +149553,9 @@
 <!--803474-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803474-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803474-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803474-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--803474-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--803474-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803474-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803474-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803474-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--803474-->  <AD_TAB_ID><![CDATA[800222]]></AD_TAB_ID>
 <!--803474-->  <AD_COLUMN_ID><![CDATA[803118]]></AD_COLUMN_ID>
@@ -149831,9 +149831,9 @@
 <!--803484-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803484-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803484-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803484-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--803484-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--803484-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803484-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803484-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803484-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--803484-->  <AD_TAB_ID><![CDATA[800223]]></AD_TAB_ID>
 <!--803484-->  <AD_COLUMN_ID><![CDATA[803131]]></AD_COLUMN_ID>
@@ -150084,9 +150084,9 @@
 <!--803493-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803493-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803493-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803493-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--803493-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--803493-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803493-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803493-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803493-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--803493-->  <AD_TAB_ID><![CDATA[800224]]></AD_TAB_ID>
 <!--803493-->  <AD_COLUMN_ID><![CDATA[803131]]></AD_COLUMN_ID>
@@ -152522,9 +152522,9 @@
 <!--803599-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803599-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803599-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803599-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--803599-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--803599-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--803599-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--803599-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--803599-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--803599-->  <AD_TAB_ID><![CDATA[800232]]></AD_TAB_ID>
 <!--803599-->  <AD_COLUMN_ID><![CDATA[803261]]></AD_COLUMN_ID>
@@ -176797,7 +176797,7 @@
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--135FC46615D24675A3D3F986CFA0D1D6-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--135FC46615D24675A3D3F986CFA0D1D6-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID>
 <!--135FC46615D24675A3D3F986CFA0D1D6-->  <AD_COLUMN_ID><![CDATA[801165]]></AD_COLUMN_ID>
@@ -183566,9 +183566,9 @@
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--47BB5EF4BF7B4591B7CFA713627D692D-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--47BB5EF4BF7B4591B7CFA713627D692D-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--47BB5EF4BF7B4591B7CFA713627D692D-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--47BB5EF4BF7B4591B7CFA713627D692D-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <AD_TAB_ID><![CDATA[1EB39A39CFDB402FBDA86AB8BAF2EDB4]]></AD_TAB_ID>
 <!--47BB5EF4BF7B4591B7CFA713627D692D-->  <AD_COLUMN_ID><![CDATA[B059926E49A94F68963E064C270F5C33]]></AD_COLUMN_ID>
@@ -220726,9 +220726,9 @@
 <!--AF4090093D6E1431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093D6E1431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093D6E1431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093D6E1431E040007F010048A5-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--AF4090093D6E1431E040007F010048A5-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--AF4090093D6E1431E040007F010048A5-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--AF4090093D6E1431E040007F010048A5-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--AF4090093D6E1431E040007F010048A5-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--AF4090093D6E1431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093D6E1431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093D471431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093D6E1431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[801165]]></AD_COLUMN_ID>
@@ -221284,9 +221284,9 @@
 <!--AF4090093DA21431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DA21431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DA21431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DA21431E040007F010048A5-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--AF4090093DA21431E040007F010048A5-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
 <!--AF4090093DA21431E040007F010048A5-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--AF4090093DA21431E040007F010048A5-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--AF4090093DA21431E040007F010048A5-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--AF4090093DA21431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DA21431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093D9C1431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DA21431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[803118]]></AD_COLUMN_ID>
@@ -232525,7 +232525,7 @@
 <!--DC46B1240A274702AB400BD545BA0568-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC46B1240A274702AB400BD545BA0568-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--DC46B1240A274702AB400BD545BA0568-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
-<!--DC46B1240A274702AB400BD545BA0568-->  <HELP><![CDATA[Price Adjustment applied to a particular line (product) automatically by the system.]]></HELP>
+<!--DC46B1240A274702AB400BD545BA0568-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
 <!--DC46B1240A274702AB400BD545BA0568-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--DC46B1240A274702AB400BD545BA0568-->  <AD_TAB_ID><![CDATA[B703EDAB4FC5495AA1624CB0333A5D58]]></AD_TAB_ID>
 <!--DC46B1240A274702AB400BD545BA0568-->  <AD_COLUMN_ID><![CDATA[803118]]></AD_COLUMN_ID>
--- a/src-db/database/sourcedata/AD_MENU.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_MENU.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -2734,8 +2734,8 @@
 <!--800117-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800117-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800117-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800117-->  <NAME><![CDATA[Price Adjustments]]></NAME>
-<!--800117-->  <DESCRIPTION><![CDATA[Create and edit price adjustments to be applied to business partners, products, or price lists.]]></DESCRIPTION>
+<!--800117-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
+<!--800117-->  <DESCRIPTION><![CDATA[Definition of Promotions and Discounts]]></DESCRIPTION>
 <!--800117-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
 <!--800117-->  <ACTION><![CDATA[W]]></ACTION>
 <!--800117-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -7605,9 +7605,9 @@
 <!--800079-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800079-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800079-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800079-->  <NAME><![CDATA[Adjustments]]></NAME>
-<!--800079-->  <DESCRIPTION><![CDATA[Define price adjustments to be applied to business partners, products, and price lists.]]></DESCRIPTION>
-<!--800079-->  <HELP><![CDATA[Define price adjustments to be applied to business partners, products, and price lists.]]></HELP>
+<!--800079-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
+<!--800079-->  <DESCRIPTION><![CDATA[Definition of Discounts and Promotions]]></DESCRIPTION>
+<!--800079-->  <HELP><![CDATA[Defines the Promotion/Discount main caracteristiques such as Discount Type, how it is filtered and actual discount information based on type.]]></HELP>
 <!--800079-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
 <!--800079-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800079-->  <SEQNO><![CDATA[0]]></SEQNO>
@@ -7634,8 +7634,8 @@
 <!--800080-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800080-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800080-->  <NAME><![CDATA[Business Partner]]></NAME>
-<!--800080-->  <DESCRIPTION><![CDATA[Add business partners in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
-<!--800080-->  <HELP><![CDATA[Add business partners in order to include or exclude them from a selected price adjustment.]]></HELP>
+<!--800080-->  <DESCRIPTION><![CDATA[Add business partners in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--800080-->  <HELP><![CDATA[Add business partners in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
 <!--800080-->  <AD_TABLE_ID><![CDATA[800063]]></AD_TABLE_ID>
 <!--800080-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800080-->  <SEQNO><![CDATA[20]]></SEQNO>
@@ -7662,8 +7662,8 @@
 <!--800081-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800081-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800081-->  <NAME><![CDATA[Business Partner Category]]></NAME>
-<!--800081-->  <DESCRIPTION><![CDATA[Add business partner categories in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
-<!--800081-->  <HELP><![CDATA[Add business partner categories in order to include or exclude them from a selected price adjustment.]]></HELP>
+<!--800081-->  <DESCRIPTION><![CDATA[Add business partner categories in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--800081-->  <HELP><![CDATA[Add business partner categories in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
 <!--800081-->  <AD_TABLE_ID><![CDATA[800064]]></AD_TABLE_ID>
 <!--800081-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800081-->  <SEQNO><![CDATA[10]]></SEQNO>
@@ -7690,8 +7690,8 @@
 <!--800082-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800082-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800082-->  <NAME><![CDATA[Products]]></NAME>
-<!--800082-->  <DESCRIPTION><![CDATA[Add products in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
-<!--800082-->  <HELP><![CDATA[Add products in order to include or exclude them from a selected price adjustment.]]></HELP>
+<!--800082-->  <DESCRIPTION><![CDATA[Add products in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--800082-->  <HELP><![CDATA[Add products in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
 <!--800082-->  <AD_TABLE_ID><![CDATA[800065]]></AD_TABLE_ID>
 <!--800082-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800082-->  <SEQNO><![CDATA[30]]></SEQNO>
@@ -7718,8 +7718,8 @@
 <!--800083-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800083-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800083-->  <NAME><![CDATA[Product Category]]></NAME>
-<!--800083-->  <DESCRIPTION><![CDATA[Add product categories in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
-<!--800083-->  <HELP><![CDATA[Add product categories in order to include or exclude them from a selected price adjustment.]]></HELP>
+<!--800083-->  <DESCRIPTION><![CDATA[Add product categories in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--800083-->  <HELP><![CDATA[Add product categories in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
 <!--800083-->  <AD_TABLE_ID><![CDATA[800066]]></AD_TABLE_ID>
 <!--800083-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800083-->  <SEQNO><![CDATA[25]]></SEQNO>
@@ -10123,9 +10123,9 @@
 <!--800221-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800221-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800221-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800221-->  <NAME><![CDATA[Price Adjustment]]></NAME>
-<!--800221-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800221-->  <HELP><![CDATA[View applied price adjustments for each order line.]]></HELP>
+<!--800221-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
+<!--800221-->  <DESCRIPTION><![CDATA[View applied Promotions and Discounts for each order line.]]></DESCRIPTION>
+<!--800221-->  <HELP><![CDATA[View applied Promotions and Discounts for each order line.]]></HELP>
 <!--800221-->  <AD_TABLE_ID><![CDATA[800185]]></AD_TABLE_ID>
 <!--800221-->  <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID>
 <!--800221-->  <SEQNO><![CDATA[25]]></SEQNO>
@@ -10153,9 +10153,9 @@
 <!--800222-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800222-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800222-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800222-->  <NAME><![CDATA[Price Adjustments]]></NAME>
+<!--800222-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
 <!--800222-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800222-->  <HELP><![CDATA[View applied price adjustments for each order line.]]></HELP>
+<!--800222-->  <HELP><![CDATA[View applied Promotions and Discounts for each order line.]]></HELP>
 <!--800222-->  <AD_TABLE_ID><![CDATA[800185]]></AD_TABLE_ID>
 <!--800222-->  <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID>
 <!--800222-->  <SEQNO><![CDATA[25]]></SEQNO>
@@ -10181,9 +10181,9 @@
 <!--800223-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800223-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800223-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800223-->  <NAME><![CDATA[Price Adjustments]]></NAME>
+<!--800223-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
 <!--800223-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800223-->  <HELP><![CDATA[View applied price adjustments for each order line.]]></HELP>
+<!--800223-->  <HELP><![CDATA[View applied Promotions and Discounts for each order line.]]></HELP>
 <!--800223-->  <AD_TABLE_ID><![CDATA[800186]]></AD_TABLE_ID>
 <!--800223-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
 <!--800223-->  <SEQNO><![CDATA[25]]></SEQNO>
@@ -10209,9 +10209,9 @@
 <!--800224-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800224-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800224-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800224-->  <NAME><![CDATA[Price Adjustment]]></NAME>
+<!--800224-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
 <!--800224-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800224-->  <HELP><![CDATA[View applied price adjustments for each order line.]]></HELP>
+<!--800224-->  <HELP><![CDATA[View applied Promotions and Discounts for each invoice line.]]></HELP>
 <!--800224-->  <AD_TABLE_ID><![CDATA[800186]]></AD_TABLE_ID>
 <!--800224-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
 <!--800224-->  <SEQNO><![CDATA[25]]></SEQNO>
@@ -10436,8 +10436,8 @@
 <!--800232-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800232-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800232-->  <NAME><![CDATA[Price List]]></NAME>
-<!--800232-->  <DESCRIPTION><![CDATA[Add price lists in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
-<!--800232-->  <HELP><![CDATA[Add price lists in order to include or exclude them from a selected price adjustment.]]></HELP>
+<!--800232-->  <DESCRIPTION><![CDATA[Add price lists in order to include or exclude them from a selected Promotion/Discount.]]></DESCRIPTION>
+<!--800232-->  <HELP><![CDATA[Add price lists in order to include or exclude them from a selected Promotion/Discount.]]></HELP>
 <!--800232-->  <AD_TABLE_ID><![CDATA[800194]]></AD_TABLE_ID>
 <!--800232-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--800232-->  <SEQNO><![CDATA[40]]></SEQNO>
@@ -12098,6 +12098,8 @@
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <NAME><![CDATA[Organization]]></NAME>
+<!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <DESCRIPTION><![CDATA[Add price lists in order to include or exclude them from a selected price adjustment.]]></DESCRIPTION>
+<!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <HELP><![CDATA[Add organizations in order to include or exclude them from a selected Promotion/Discount.]]></HELP>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <AD_TABLE_ID><![CDATA[CBF045D2539A4249B091CCE4B1F5EEDB]]></AD_TABLE_ID>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
 <!--1EB39A39CFDB402FBDA86AB8BAF2EDB4-->  <SEQNO><![CDATA[50]]></SEQNO>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -5257,8 +5257,8 @@
 <!--800062-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800062-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800062-->  <NAME><![CDATA[PricingAdjustment]]></NAME>
-<!--800062-->  <DESCRIPTION><![CDATA[Price Adjustments configuration]]></DESCRIPTION>
-<!--800062-->  <HELP><![CDATA[The Price Adjustments have a valid period and are applied to the configured business partners, products, product categories and business partner groups. The offer can be based upon percentage or fixed price.]]></HELP>
+<!--800062-->  <DESCRIPTION><![CDATA[Promotions and Discounts configuration]]></DESCRIPTION>
+<!--800062-->  <HELP><![CDATA[Defines the Promotion/Discount main caracteristiques such as Discount Type, how it is filtered and actual discount information based on type.]]></HELP>
 <!--800062-->  <TABLENAME><![CDATA[M_Offer]]></TABLENAME>
 <!--800062-->  <CLASSNAME><![CDATA[PriceAdjustment]]></CLASSNAME>
 <!--800062-->  <ISVIEW><![CDATA[N]]></ISVIEW>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Wed Oct 03 15:56:44 2012 +0200
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Wed Oct 03 16:22:42 2012 +0200
@@ -1813,9 +1813,9 @@
 <!--800028-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800028-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800028-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800028-->  <NAME><![CDATA[Price Adjustments]]></NAME>
-<!--800028-->  <DESCRIPTION><![CDATA[Create and edit price adjustments to be applied to business partners, products, or price lists.]]></DESCRIPTION>
-<!--800028-->  <HELP><![CDATA[Create and edit price adjustments to be applied to business partners, products, or price lists.]]></HELP>
+<!--800028-->  <NAME><![CDATA[Promotions and Discounts]]></NAME>
+<!--800028-->  <DESCRIPTION><![CDATA[Definition of Promotions and Discounts]]></DESCRIPTION>
+<!--800028-->  <HELP><![CDATA[Definition of Promotions and Discounts. Discounts and Promotions is a mechanism that allows to adjust prices based on different rules. External modules can extend this definition by providing additional rules (Discount Types) implementations.]]></HELP>
 <!--800028-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
 <!--800028-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
 <!--800028-->  <PROCESSING><![CDATA[N]]></PROCESSING>