[MERGE]merge with addons trunk

bzr revid: sgo@tinyerp.com-20120704052224-0rv2gtt2rejuev3z

diff --cc addons/procurement/procurement_view.xml
Simple merge

diff --cc addons/purchase/stock_view.xml
Simple merge

diff --cc addons/stock/stock_view.xml
index 1e597b6,55be1fd..0e6e95a
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -804,10 -790,10 +804,10 @@@
                                          <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                          <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                                          <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                         <field name="state" widget="statusbar" status_visible="draft,assigned,done" />
+                                         <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" />
                                      </header>
                                      <group>
 -                                        <group string="Move Information">
 +                                        <group>
                                              <field name="name" invisible="1"/>
                                              <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
                                              <label for="product_qty"/>
@@@ -1450,19 -1439,10 +1454,13 @@@
                      </group>
                      <group>
                          <field name="picking_id"/>
-                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                         <field name="location_id" groups="stock.group_locations"/>
-                         <field name="location_dest_id" groups="stock.group_locations"/>
                          <field name="create_date" groups="base.group_no_one" />
-                         <field name="date" groups="base.group_no_one" />
+                         <field name="date" groups="base.group_no_one" string="Move Date"/>
 +                    </group>
 +                    <group>
 +                        <field name="partner_id" groups="stock.group_locations"/>
                          <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                     </group>
- 
-                     <group>
-                         <label name="tracking_id"/>
+                         <label for="tracking_id"/>
                          <div>
                              <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                              <button name="%(split_into)d" string="New Pack" type="action"

diff --cc addons/stock_planning/stock_planning_view.xml
Simple merge