Mercurial Mercurial > erp > devel > main / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
[discount] Renamed "Promotions and Discounts" to "Discounts and Promotions"
authorAsier Lostalé <asier.lostale@openbravo.com>
Mon, 05 Nov 2012 13:52:39 +0100
changeset 18449 a3316cd1a783
parent 18448 06923e2b9a96
child 18450 40e9346d2964
[discount] Renamed "Promotions and Discounts" to "Discounts and Promotions"
src-db/database/sourcedata/AD_COLUMN.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_ELEMENT.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_FIELD.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_MENU.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_TAB.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_TABLE.xml file | annotate | diff | comparison | revisions
src-db/database/sourcedata/AD_WINDOW.xml file | annotate | diff | comparison | revisions 
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -224895,7 +224895,7 @@
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <NAME><![CDATA[Apply_Next]]></NAME>
-<!--283EA4C588214FF9987F6BEE7F27C9CC-->  <HELP><![CDATA[In case there are other discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
+<!--283EA4C588214FF9987F6BEE7F27C9CC-->  <HELP><![CDATA[In case there are other Promotions and Discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <COLUMNNAME><![CDATA[Apply_Next]]></COLUMNNAME>
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
 <!--283EA4C588214FF9987F6BEE7F27C9CC-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -225143,7 +225143,7 @@
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <NAME><![CDATA[Promotion Type]]></NAME>
-<!--2AA57E9B932549BCB74C9DD283840AD2-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <HELP><![CDATA[Discounts and Promotions functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
 <!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -290815,8 +290815,7 @@
 <!--C2B3550416934E0997553A95F75C543C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C2B3550416934E0997553A95F75C543C-->  <NAME><![CDATA[Discount Type]]></NAME>
-<!--C2B3550416934E0997553A95F75C543C-->  <DESCRIPTION><![CDATA[Promotion Type to determine the rules the discount is based on]]></DESCRIPTION>
-<!--C2B3550416934E0997553A95F75C543C-->  <HELP><![CDATA[Different Promotion Types define different rules to apply Promotions and Discounts. External modules can provide new types.]]></HELP>
+<!--C2B3550416934E0997553A95F75C543C-->  <HELP><![CDATA[Discounts and Promotions functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
 <!--C2B3550416934E0997553A95F75C543C-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
 <!--C2B3550416934E0997553A95F75C543C-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
 <!--C2B3550416934E0997553A95F75C543C-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
@@ -290831,7 +290830,7 @@
 <!--C2B3550416934E0997553A95F75C543C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C2B3550416934E0997553A95F75C543C-->  <AD_ELEMENT_ID><![CDATA[B02C0C3B0972423D91DA3661B369F3E7]]></AD_ELEMENT_ID>
+<!--C2B3550416934E0997553A95F75C543C-->  <AD_ELEMENT_ID><![CDATA[F1852A15D8FD45F9B9A54962B40E1E43]]></AD_ELEMENT_ID>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -21776,9 +21776,9 @@
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <COLUMNNAME><![CDATA[Apply_Next]]></COLUMNNAME>
-<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <NAME><![CDATA[Apply Next Discount]]></NAME>
-<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <PRINTNAME><![CDATA[Apply Next Discount]]></PRINTNAME>
-<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <HELP><![CDATA[In case there are other discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
+<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <NAME><![CDATA[Apply Next Discount/Promotion]]></NAME>
+<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <PRINTNAME><![CDATA[Apply Next Discount/Promotion]]></PRINTNAME>
+<!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <HELP><![CDATA[In case there are other Promotions and Discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4D1BCC68A52C4FC4A8DF1A7A37DB704F--></AD_ELEMENT>
@@ -28144,20 +28144,6 @@
 <!--AF7A8ABE9B6711DDA4130016D4C601F7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--AF7A8ABE9B6711DDA4130016D4C601F7--></AD_ELEMENT>
 
-<!--B02C0C3B0972423D91DA3661B369F3E7--><AD_ELEMENT>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_ELEMENT_ID><![CDATA[B02C0C3B0972423D91DA3661B369F3E7]]></AD_ELEMENT_ID>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <NAME><![CDATA[Promotion Type]]></NAME>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <PRINTNAME><![CDATA[Promotion Type]]></PRINTNAME>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <DESCRIPTION><![CDATA[Promotion Type to determine the rules the discount is based on]]></DESCRIPTION>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <HELP><![CDATA[Different Promotion Types define different rules to apply Promotions and Discounts. External modules can provide new types.]]></HELP>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B02C0C3B0972423D91DA3661B369F3E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--B02C0C3B0972423D91DA3661B369F3E7--></AD_ELEMENT>
-
 <!--B04AF439C0EBCC90E040007F010032CD--><AD_ELEMENT>
 <!--B04AF439C0EBCC90E040007F010032CD-->  <AD_ELEMENT_ID><![CDATA[B04AF439C0EBCC90E040007F010032CD]]></AD_ELEMENT_ID>
 <!--B04AF439C0EBCC90E040007F010032CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29733,9 +29719,9 @@
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
-<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <NAME><![CDATA[Discount/Promotion Type]]></NAME>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <PRINTNAME><![CDATA[Promotion Type]]></PRINTNAME>
-<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <HELP><![CDATA[Discounts and Promotions functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F1852A15D8FD45F9B9A54962B40E1E43-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F1852A15D8FD45F9B9A54962B40E1E43--></AD_ELEMENT>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -179559,9 +179559,8 @@
 <!--269D895C4B7F493C89D8D81D89081A95-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--269D895C4B7F493C89D8D81D89081A95-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--269D895C4B7F493C89D8D81D89081A95-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--269D895C4B7F493C89D8D81D89081A95-->  <NAME><![CDATA[Promotion Type]]></NAME>
-<!--269D895C4B7F493C89D8D81D89081A95-->  <DESCRIPTION><![CDATA[Promotion Type to determine the rules the discount is based on]]></DESCRIPTION>
-<!--269D895C4B7F493C89D8D81D89081A95-->  <HELP><![CDATA[Different Promotion Types define different rules to apply Promotions and Discounts. External modules can provide new types.]]></HELP>
+<!--269D895C4B7F493C89D8D81D89081A95-->  <NAME><![CDATA[Discount/Promotion Type]]></NAME>
+<!--269D895C4B7F493C89D8D81D89081A95-->  <HELP><![CDATA[Discounts and Promotions functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
 <!--269D895C4B7F493C89D8D81D89081A95-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--269D895C4B7F493C89D8D81D89081A95-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
 <!--269D895C4B7F493C89D8D81D89081A95-->  <AD_COLUMN_ID><![CDATA[C2B3550416934E0997553A95F75C543C]]></AD_COLUMN_ID>
@@ -201827,8 +201826,8 @@
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--79DD2F85FF0A49A4B79E076566795E54-->  <NAME><![CDATA[Apply Next Discount]]></NAME>
-<!--79DD2F85FF0A49A4B79E076566795E54-->  <HELP><![CDATA[In case there are other discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
+<!--79DD2F85FF0A49A4B79E076566795E54-->  <NAME><![CDATA[Apply Next Discount/Promotion]]></NAME>
+<!--79DD2F85FF0A49A4B79E076566795E54-->  <HELP><![CDATA[In case there are other Promotions and Discounts applicable to this same line with less priority than this one, this flag decides whether the next one should be applied or not.]]></HELP>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
 <!--79DD2F85FF0A49A4B79E076566795E54-->  <AD_COLUMN_ID><![CDATA[283EA4C588214FF9987F6BEE7F27C9CC]]></AD_COLUMN_ID>
@@ -227094,8 +227093,8 @@
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <NAME><![CDATA[Promotion Type]]></NAME>
-<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <NAME><![CDATA[Discount/Promotion Type]]></NAME>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <HELP><![CDATA[Discounts and Promotions functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
 <!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_COLUMN_ID><![CDATA[2AA57E9B932549BCB74C9DD283840AD2]]></AD_COLUMN_ID>
--- a/src-db/database/sourcedata/AD_MENU.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_MENU.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -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[Promotions and Discounts]]></NAME>
-<!--800117-->  <DESCRIPTION><![CDATA[Definition of Promotions and Discounts]]></DESCRIPTION>
+<!--800117-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800117-->  <DESCRIPTION><![CDATA[Definition of Discounts and Promotions]]></DESCRIPTION>
 <!--800117-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
 <!--800117-->  <ACTION><![CDATA[W]]></ACTION>
 <!--800117-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
@@ -4379,7 +4379,8 @@
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--31D7EC462DD7401EA90200C393B3EB9B-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <NAME><![CDATA[Discounts and Promotions Types]]></NAME>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <DESCRIPTION><![CDATA[Discounts and Promotions Types]]></DESCRIPTION>
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <ACTION><![CDATA[W]]></ACTION>
 <!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_WINDOW_ID><![CDATA[9153155013C843839F88E9940B976148]]></AD_WINDOW_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -7608,9 +7608,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[Promotions and Discounts]]></NAME>
+<!--800079-->  <NAME><![CDATA[Discounts and Promotions]]></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-->  <HELP><![CDATA[Defines the Discounts and Promotions main characteristics 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>
@@ -10126,9 +10126,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[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-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800221-->  <DESCRIPTION><![CDATA[View applied Discounts and Promotions for each line.]]></DESCRIPTION>
+<!--800221-->  <HELP><![CDATA[View applied Discounts and Promotions for each 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>
@@ -10156,9 +10156,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[Promotions and Discounts]]></NAME>
-<!--800222-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800222-->  <HELP><![CDATA[View applied Promotions and Discounts for each order line.]]></HELP>
+<!--800222-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800222-->  <DESCRIPTION><![CDATA[View applied Discounts and Promotions for each line.]]></DESCRIPTION>
+<!--800222-->  <HELP><![CDATA[View applied Discounts and Promotions for each 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>
@@ -10184,9 +10184,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[Promotions and Discounts]]></NAME>
-<!--800223-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800223-->  <HELP><![CDATA[View applied Promotions and Discounts for each order line.]]></HELP>
+<!--800223-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800223-->  <DESCRIPTION><![CDATA[View applied Discounts and Promotions for each line.]]></DESCRIPTION>
+<!--800223-->  <HELP><![CDATA[View applied Discounts and Promotions for each 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>
@@ -10212,9 +10212,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[Promotions and Discounts]]></NAME>
-<!--800224-->  <DESCRIPTION><![CDATA[View applied price adjustments for each order line.]]></DESCRIPTION>
-<!--800224-->  <HELP><![CDATA[View applied Promotions and Discounts for each invoice line.]]></HELP>
+<!--800224-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800224-->  <DESCRIPTION><![CDATA[View applied Discounts and Promotions for each line.]]></DESCRIPTION>
+<!--800224-->  <HELP><![CDATA[View applied Discounts and Promotions for each 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>
@@ -13227,7 +13227,9 @@
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--79C291C04E5C48B2BB3A4779E44C1291-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <NAME><![CDATA[Discounts and Promotions Types]]></NAME>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <DESCRIPTION><![CDATA[Discounts and Promotions Types]]></DESCRIPTION>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <HELP><![CDATA[Types define how Discounts and Promotions  behave. Modules can add new types by providing implementation for them.]]></HELP>
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_WINDOW_ID><![CDATA[9153155013C843839F88E9940B976148]]></AD_WINDOW_ID>
 <!--79C291C04E5C48B2BB3A4779E44C1291-->  <SEQNO><![CDATA[10]]></SEQNO>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -8802,7 +8802,7 @@
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <NAME><![CDATA[PromotionType]]></NAME>
-<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. Each of different possible types of these promotions is defined here.]]></HELP>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <HELP><![CDATA[Types define how Discounts and Promotions  behave. Modules can add new types by providing implementation for them.]]></HELP>
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <TABLENAME><![CDATA[M_Offer_Type]]></TABLENAME>
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <CLASSNAME><![CDATA[PromotionType]]></CLASSNAME>
 <!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISVIEW><![CDATA[N]]></ISVIEW>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Mon Nov 05 13:36:04 2012 +0100
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Mon Nov 05 13:52:39 2012 +0100
@@ -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[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-->  <NAME><![CDATA[Discounts and Promotions]]></NAME>
+<!--800028-->  <DESCRIPTION><![CDATA[Definition of Discounts and Promotions]]></DESCRIPTION>
+<!--800028-->  <HELP><![CDATA[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>
@@ -2861,7 +2861,9 @@
 <!--9153155013C843839F88E9940B976148-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--9153155013C843839F88E9940B976148-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9153155013C843839F88E9940B976148-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9153155013C843839F88E9940B976148-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--9153155013C843839F88E9940B976148-->  <NAME><![CDATA[Discounts and Promotions Types]]></NAME>
+<!--9153155013C843839F88E9940B976148-->  <DESCRIPTION><![CDATA[Discounts and Promotions Types]]></DESCRIPTION>
+<!--9153155013C843839F88E9940B976148-->  <HELP><![CDATA[Discounts and Promotions Types ]]></HELP>
 <!--9153155013C843839F88E9940B976148-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
 <!--9153155013C843839F88E9940B976148-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
 <!--9153155013C843839F88E9940B976148-->  <PROCESSING><![CDATA[N]]></PROCESSING>
devel/main