details: https://code.openbravo.com/erp/devel/pi/rev/a3316cd1a783 changeset: 18449:a3316cd1a783 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Nov 05 13:52:39 2012 +0100 summary: [discount] Renamed "Promotions and Discounts" to "Discounts and Promotions"
details: https://code.openbravo.com/erp/devel/pi/rev/40e9346d2964 changeset: 18450:40e9346d2964 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Nov 05 13:53:33 2012 +0100 summary: [discount] Renamed "Discount" to "Basic Discount" diffstat: src-db/database/sourcedata/AD_COLUMN.xml | 9 ++-- src-db/database/sourcedata/AD_ELEMENT.xml | 26 +++----------- src-db/database/sourcedata/AD_FIELD.xml | 21 +++++------ src-db/database/sourcedata/AD_MENU.xml | 11 +++-- src-db/database/sourcedata/AD_TAB.xml | 52 ++++++++++++++++-------------- src-db/database/sourcedata/AD_TABLE.xml | 2 +- src-db/database/sourcedata/AD_WINDOW.xml | 16 +++++---- 7 files changed, 63 insertions(+), 74 deletions(-) diffs (truncated from 412 to 300 lines): diff -r 06923e2b9a96 -r 40e9346d2964 src-db/database/sourcedata/AD_COLUMN.xml --- 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:53:33 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> diff -r 06923e2b9a96 -r 40e9346d2964 src-db/database/sourcedata/AD_ELEMENT.xml --- 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:53:33 2012 +0100 @@ -13624,7 +13624,7 @@ <!--800169--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800169--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--800169--> <COLUMNNAME><![CDATA[C_Discount_ID]]></COLUMNNAME> -<!--800169--> <NAME><![CDATA[Discount]]></NAME> +<!--800169--> <NAME><![CDATA[Basic Discount]]></NAME> <!--800169--> <PRINTNAME><![CDATA[C_Discount_ID]]></PRINTNAME> <!--800169--> <DESCRIPTION><![CDATA[The percentage price reduction based on the list price.]]></DESCRIPTION> <!--800169--> <HELP><![CDATA[Discount applicable to prices.]]></HELP> @@ -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> diff -r 06923e2b9a96 -r 40e9346d2964 src-db/database/sourcedata/AD_FIELD.xml --- 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:53:33 2012 +0100 @@ -115418,7 +115418,7 @@ <!--801045--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--801045--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--801045--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--801045--> <NAME><![CDATA[Discount]]></NAME> +<!--801045--> <NAME><![CDATA[Basic Discount]]></NAME> <!--801045--> <DESCRIPTION><![CDATA[The percentage price reduction based on the list price.]]></DESCRIPTION> <!--801045--> <HELP><![CDATA[Discount applicable to prices.]]></HELP> <!--801045--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -115672,7 +115672,7 @@ <!--801054--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--801054--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--801054--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--801054--> <NAME><![CDATA[Discount]]></NAME> +<!--801054--> <NAME><![CDATA[Basic Discount]]></NAME> <!--801054--> <DESCRIPTION><![CDATA[The percentage price reduction based on the list price.]]></DESCRIPTION> <!--801054--> <HELP><![CDATA[Discount applicable to prices.]]></HELP> <!--801054--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -174213,7 +174213,7 @@ <!--1011100002--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--1011100002--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--1011100002--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--1011100002--> <NAME><![CDATA[Discount]]></NAME> +<!--1011100002--> <NAME><![CDATA[Basic Discount]]></NAME> <!--1011100002--> <DESCRIPTION><![CDATA[The percentage price reduction based on the list price.]]></DESCRIPTION> <!--1011100002--> <HELP><![CDATA[Discount applicable to prices.]]></HELP> <!--1011100002--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -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> @@ -222839,7 +222838,7 @@ <!--AF4090093DA91431E040007F010048A5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--AF4090093DA91431E040007F010048A5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--AF4090093DA91431E040007F010048A5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--AF4090093DA91431E040007F010048A5--> <NAME><![CDATA[Discount]]></NAME> +<!--AF4090093DA91431E040007F010048A5--> <NAME><![CDATA[Basic Discount]]></NAME> <!--AF4090093DA91431E040007F010048A5--> <DESCRIPTION><![CDATA[The percentage price reduction based on the list price.]]></DESCRIPTION> <!--AF4090093DA91431E040007F010048A5--> <HELP><![CDATA[Discount applicable to prices.]]></HELP> <!--AF4090093DA91431E040007F010048A5--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -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> diff -r 06923e2b9a96 -r 40e9346d2964 src-db/database/sourcedata/AD_MENU.xml --- 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:53:33 2012 +0100 @@ -2580,8 +2580,8 @@ <!--800096--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800096--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800096--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800096--> <NAME><![CDATA[Discount]]></NAME> -<!--800096--> <DESCRIPTION><![CDATA[Create and edit product price percentage discounts.]]></DESCRIPTION> +<!--800096--> <NAME><![CDATA[Basic Discount]]></NAME> +<!--800096--> <DESCRIPTION><![CDATA[Create and edit product price percentage Basic Discounts.]]></DESCRIPTION> <!--800096--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> <!--800096--> <ACTION><![CDATA[W]]></ACTION> <!--800096--> <AD_WINDOW_ID><![CDATA[800017]]></AD_WINDOW_ID> @@ -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> diff -r 06923e2b9a96 -r 40e9346d2964 src-db/database/sourcedata/AD_TAB.xml --- 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:53:33 2012 +0100 @@ -7270,7 +7270,7 @@ <!--800058--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800058--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800058--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800058--> <NAME><![CDATA[Discount]]></NAME> +<!--800058--> <NAME><![CDATA[Basic Discount]]></NAME> <!--800058--> <DESCRIPTION><![CDATA[Create a discount.]]></DESCRIPTION> <!--800058--> <HELP><![CDATA[A total discount can be created and configured by entering a discount name, a discount product and a discount %.]]></HELP> <!--800058--> <AD_TABLE_ID><![CDATA[800044]]></AD_TABLE_ID> @@ -7299,7 +7299,7 @@ <!--800059--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800059--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800059--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800059--> <NAME><![CDATA[Discounts]]></NAME> +<!--800059--> <NAME><![CDATA[Basic Discounts]]></NAME> <!--800059--> <AD_TABLE_ID><![CDATA[800045]]></AD_TABLE_ID> <!--800059--> <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID> <!--800059--> <SEQNO><![CDATA[40]]></SEQNO> @@ -7325,9 +7325,9 @@ <!--800060--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800060--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800060--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800060--> <NAME><![CDATA[Discount]]></NAME> -<!--800060--> <DESCRIPTION><![CDATA[Add discounts which may be made available to this business partner.]]></DESCRIPTION> -<!--800060--> <HELP><![CDATA[Discount tab allows you to add and configure business partner discounts.]]></HELP> +<!--800060--> <NAME><![CDATA[Basic Discount]]></NAME> +<!--800060--> <DESCRIPTION><![CDATA[Add Basic Discounts which may be made available to this business partner.]]></DESCRIPTION> +<!--800060--> <HELP><![CDATA[Basic Discount tab allows you to add and configure business partner Basic Discounts.]]></HELP> <!--800060--> <AD_TABLE_ID><![CDATA[800046]]></AD_TABLE_ID> <!--800060--> <AD_WINDOW_ID><![CDATA[123]]></AD_WINDOW_ID> <!--800060--> <SEQNO><![CDATA[110]]></SEQNO> @@ -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> @@ -9837,7 +9837,7 @@ <!--800211--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800211--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800211--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800211--> <NAME><![CDATA[Discounts]]></NAME> +<!--800211--> <NAME><![CDATA[Basic Discounts]]></NAME> <!--800211--> <DESCRIPTION><![CDATA[Vendor discounts]]></DESCRIPTION> <!--800211--> <HELP><![CDATA[Lists information about discounts automatically applied based on the supplier configuration and / or manually entered for the purchase invoice.]]></HELP> <!--800211--> <AD_TABLE_ID><![CDATA[800045]]></AD_TABLE_ID> @@ -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> ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
