[MERGE] merge sbh branch for bug fixes on board

bzr revid: mra@mra-laptop-20100611071249-sz19l24480i6l33q

addons/procurement/board_mrp_procurement_view.xml

@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
       		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(mrp_procurement.mrp_procurement_action5)d" string="Procurement Exceptions" width="510" />
+				<action colspan="4" name="%(procurement.procurement_action5)d" string="Procurement Exceptions" width="510" />
 			</xpath>
             </field>
         </record>

addons/sale/__openerp__.py

@@ -48,7 +48,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'mrp_procurement', 'process','board'],
+    'depends': ['product', 'stock', 'procurement', 'process','board'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',

addons/stock/board_warehouse_view.xml

@@ -23,7 +23,6 @@
                 <form string="Warehouse board">
                     <hpaned position="100">
                         <child1>
-					    	<action colspan="4" name="%(procurement.procurement_action5)d" string="Procurement Exceptions" width="510" />
 					    	<action colspan="4" name="%(action_reception_picking_move_board)d" string="Products To Receive" />
                         </child1>