[MERGE] Forward-port of 7.0 up to 85d2b45

diff --cc addons/sale_stock/sale_stock_view.xml
index a926a16,0b7249f..3b94946
--- 1/addons/sale_stock/sale_stock_view.xml
--- 2/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@@ -21,17 -46,14 +21,17 @@@
                          <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
                      </xpath>
                      <field name="state" position="attributes">
-                         <attribute name="statusbar_colors">{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}</attribute>
+                         <attribute name="statusbar_colors" t-translate="off">{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}</attribute>
                      </field>
 -                   <field name="shop_id" position="replace">
 -                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
 -                   </field>
 +                    <field name="company_id" position="replace">
 +                        <field name="company_id" readonly="True"/>
 +                    </field>
 +                    <field name="fiscal_position" position="after">
 +                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
 +                    </field>
                     <field name="product_id" position="replace">
                         <field name="product_id"
 -                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
 +                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                         groups="base.group_user" 
                         on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,False,product_uos_qty,False,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                     </field>

diff --cc openerp/tools/translate.py
Simple merge