merge

bzr revid: nel@silver-20081030082445-g6i7zs68eolw35ih
bzr revid: nel@silver-20081030082551-bc3j7nhaum9a2oqd

diff --cc addons/profile_manufacturing/profile_manufacturing.py
index 80b263e,0b65346..19098a6
--- 1/addons/profile_manufacturing/profile_manufacturing.py
--- 2/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@@ -70,10 -73,8 +73,10 @@@ class profile_manufacturing_config_inst
              "materials and payment processing hardware."),
          'portal': fields.boolean('Portal',
              help="This module allows you to manage a Portal system."),
-          'mrp_subproduct': fields.boolean('Mrp Sub Product',
+         'mrp_subproduct': fields.boolean('Mrp Sub Product',
              help="This module allows you to add sub poducts in mrp bom."),
 +         'warning': fields.boolean('Warning',
 +            help="Able you to set warnings on products and partners."),
          'board_document':fields.boolean('Document Management', 
              help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),