Merge lp:~openerp-dev/openobject-addons/trunk-bug-1156106-mansi into lp:openobject-addons

[Mansi Kariya(OpenERP)]

Hello,
     I have fixed the usability issue of Terminology: Product/Partner warnings vs alerts.

Thanks.

-Mansi

Unmerged revisions

8811. By Mansi Kariya(OpenERP) on 2013-07-11

[FIX] fixed the usablity issue of Terminology: Product/Partner warnings vs alerts

=== modified file 'sale/res_config.py'
--- sale/res_config.py	2013-04-17 05:00:45 +0000
+++ sale/res_config.py	2013-07-11 10:09:28 +0000
@@ -57,7 +57,7 @@
         'group_product_variant': fields.boolean("Support multiple variants per products  ",
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
-        'module_warning': fields.boolean("Allow configuring alerts by customer or products",
+        'module_warning': fields.boolean("Allow configuring warnings by customer or products",
             help="""Allow to configure notification on products and trigger them when a user wants to sell a given product or a given customer.
 Example: Product: this product is deprecated, do not purchase more than 5.
                 Supplier: don't forget to ask for an express delivery."""),