[MERGE] merge with addons branch

bzr revid: al@openerp.com-20100914161341-0j99swcy2gfa2lls

diff --cc addons/account/report/invoice.rml
Simple merge

diff --cc addons/mrp/mrp_view.xml
index 402d352,ba7ebef..924cf6f
--- 1/addons/mrp/mrp_view.xml
--- 2/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@@ -2,11 -2,12 +2,12 @@@
  <openerp>
      <data>
  
-         <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
+         <menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
              groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
-             <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
+ 
+         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
          <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/>
 -        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
 +        <menuitem id="menu_mrp_manufacturing" name="Manufacturing" sequence="1"/> <!-- FIXME parent="base.menu_mrp_root" sequence="1"/>-->
  
          <menuitem name="Master Data"
                    id="menu_mrp_bom"