[MERGE] Merged from the main trunk addons

bzr revid: jma@tinyerp.com-20101012124220-6x6xskt7rkny505c

diff --cc addons/sale/stock_view.xml
index 73a289a,dddcad0..2739c8d
--- 1/addons/sale/stock_view.xml
--- 2/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@@ -13,6 -13,18 +13,21 @@@
              </field>
          </record>
          
++<<<<<<< TREE
++=======
+         <record id="stock_move_sale" model="ir.ui.view">
+             <field name="name">stock.move.form</field>
+             <field name="model">stock.move</field>
+             <field name="type">form</field>
+             <field name="inherit_id" ref="stock.view_move_form"/>
+             <field name="arch" type="xml">
+                  <xpath expr="/form/group/field[@name='tracking_id']"  position="before">
+                     <field name="sale_line_id" colspan="2"/>
+                 </xpath>
+             </field>
+         </record>
+         
++>>>>>>> MERGE-SOURCE
          <act_window
              domain="[('sale_id', '=', active_id)]"
              id="act_sale_order_2_stock_picking"
@@@ -21,21 -33,20 +36,41 @@@
              src_model="sale.order"
              context="{'contact_display': 'partner'}" />
         
++<<<<<<< TREE
 +       <record id="action_sale_picking_in_tree_view" model="ir.actions.act_window.view">
++=======
+        <record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
++>>>>>>> MERGE-SOURCE
              <field eval="1" name="sequence"/>
              <field name="view_mode">tree</field>
++<<<<<<< TREE
 +            <field name="view_id" ref="stock.view_picking_in_tree"/>
++=======
+             <field name="view_id" ref="stock.view_picking_out_tree"/>
++>>>>>>> MERGE-SOURCE
              <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
          </record>
++<<<<<<< TREE
 +        <record id="action_sale_picking_in_form_view" model="ir.actions.act_window.view">
++=======
+         
+         <record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
++>>>>>>> MERGE-SOURCE
              <field eval="2" name="sequence"/>
              <field name="view_mode">form</field>
++<<<<<<< TREE
 +            <field name="view_id" ref="stock.view_picking_in_form"/>
++=======
+             <field name="view_id" ref="stock.view_picking_out_form"/>
++>>>>>>> MERGE-SOURCE
              <field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
          </record>
          
++<<<<<<< TREE
 +        
 +        
++=======
++>>>>>>> MERGE-SOURCE
          <!-- Adding Sale Order Reference to outgoing picking -->
          
          <record id="stock_picking_out_inherit_sale" model="ir.ui.view">