[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121001085510-49lb2zuhf2i41mkk

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/stock/stock_view.xml
index d03a83d,d991e81..b905974
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -778,7 -777,8 +777,8 @@@
                      </group>
                      <notebook>
                          <page string="Products">
 -                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
 +                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'picking_type': 'internal'}"/>
+                             <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                          </page>
                          <page string="Additional Info">
                              <group>