[MERGE] Resolve conflicts 8.0

diff --cc addons/mrp/mrp_view.xml
index 5a1c3bd,0d0c1b3..17cba90
--- 1/addons/mrp/mrp_view.xml
--- 2/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@@ -1036,33 -1052,28 +1044,48 @@@
              <field name="res_model">mrp.production</field>
              <field name="view_id" ref="mrp_production_tree_view"/>
          </record>
++
          <record model="ir.ui.view" id="product_template_form_view_bom_button">
              <field name="name">product.template.procurement</field>
              <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_form_view_only"/>
+             <field name="inherit_id" ref="product.product_template_only_form_view"/>
+             <field name="arch" type="xml">
+                 <div name="buttons" position="inside">
+                     <button class="oe_inline oe_stat_button" name="%(template_open_bom)d" type="action"
+                         groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
+                         <field string="Bill of Materials" name="bom_count" widget="statinfo" />
+                     </button>
+                 </div>
+             </field>
+         </record>
++
+         <record model="ir.ui.view" id="product_product_form_view_bom_button">
+             <field name="name">product.product.procurement</field>
+             <field name="model">product.product</field>
+             <field name="inherit_id" ref="product.product_normal_form_view"/>
              <field name="arch" type="xml">
                  <div name="buttons" position="inside">
-                     <button class="oe_inline oe_stat_button" name="%(product_open_bom)d" type="action" 
+                     <button class="oe_inline oe_stat_button" name="%(product_open_bom)d" type="action"
                          groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
                          <field string="Bill of Materials" name="bom_count" widget="statinfo" />
 +                    </button>
 +                    <button class="oe_inline oe_stat_button" name="action_view_mos" type="object" 
 +                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt">
 +                        <field string="Manufacturing" name="mo_count" widget="statinfo" />
 +                    </button>
 +                </div>
 +            </field>
 +        </record>
 +        
 +        <record model="ir.ui.view" id="product_normal_form_view_bom_button">
 +            <field name="name">product.product.mrp.button</field>
 +            <field name="model">product.product</field>
 +            <field name="inherit_id" ref="product.product_normal_form_view"/>
 +            <field name="arch" type="xml">
 +                <div name="buttons" position="inside">
 +                    <button class="oe_inline oe_stat_button" name="action_view_bom" type="object" 
 +                        groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-flask">
 +                        <field string="Bill of Materials" name="bom_count" widget="statinfo" />
                      </button>
                      <button class="oe_inline oe_stat_button" name="%(act_product_mrp_production)d" type="action" 
                          groups="mrp.group_mrp_user" attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-list-alt">

diff --cc addons/product/product_view.xml
index 70e1838,6f282a6..106cc04
--- 1/addons/product/product_view.xml
--- 2/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@@ -40,10 -40,10 +40,11 @@@
              </field>
          </record>
  
+         <!-- base structure of product.template, common with product.product -->
          <record id="product_template_form_view" model="ir.ui.view">
-             <field name="name">product.template.product.form</field>
+             <field name="name">product.template.common.form</field>
              <field name="model">product.template</field>
 +            <field name="mode">primary</field>
              <field name="arch" type="xml">
                  <form string="Product">
                      <field name="is_product_variant" invisible="1"/>

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

diff --cc addons/purchase/purchase_view.xml
index 445afa2,a1c4212..33e3228
--- 1/addons/purchase/purchase_view.xml
--- 2/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@@ -628,33 -634,5 +628,33 @@@
                  </field>
              </field>
          </record>
 +        
 +        <record id="view_product_template_purchase_buttons_from" model="ir.ui.view">
 +            <field name="name">product.template.purchase.button.inherit</field>
 +            <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_form_view_only"/>
++            <field name="inherit_id" ref="product.product_template_only_form_view"/>
 +            <field name="arch" type="xml">
 +                <xpath expr="//div[@name='buttons']" position="inside">
 +                   <button class="oe_inline oe_stat_button" name="action_view_purchases" type="object" 
 +                       groups="purchase.group_purchase_user" icon="fa-shopping-cart">
 +                       <field string="Purchases" name="purchase_count" widget="statinfo"/>
 +                   </button>
 +                </xpath>
 +            </field>
 +        </record>
 +        
 +        <record id="view_product_normal_purchase_buttons_from" model="ir.ui.view">
 +            <field name="name">product.product.purchase.button.inherit</field>
 +            <field name="model">product.product</field>
 +            <field name="inherit_id" ref="product.product_normal_form_view"/>
 +            <field name="arch" type="xml">
 +                <xpath expr="//div[@name='buttons']" position="inside">
 +                   <button class="oe_inline oe_stat_button" name="%(action_purchase_line_product_tree)d" type="action" 
 +                       groups="purchase.group_purchase_user" icon="fa-shopping-cart">
 +                       <field string="Purchases" name="purchase_count" widget="statinfo"/>
 +                   </button>
 +                </xpath>
 +            </field>
 +        </record>
      </data>
  </openerp>

diff --cc addons/sale/sale_view.xml
index 922ab8b,13e5d95..3946ff7
--- 1/addons/sale/sale_view.xml
--- 2/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@@ -508,21 -508,6 +508,21 @@@
              </field>
          </record>
  
 +        <record model="ir.ui.view" id="product_template_form_view_sale_order_button">
 +            <field name="name">product.template.sale.order.button</field>
 +            <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_form_view_only"/>
++            <field name="inherit_id" ref="product.product_template_only_form_view"/>
 +            <field name="arch" type="xml">
 +                <xpath expr="//div[@name='buttons']" position="inside">
 +                    <button class="oe_inline oe_stat_button" name="action_view_sales" 
 +                        type="object" groups="base.group_sale_salesman" icon="fa-strikethrough">
 +                        <field string="Sales" name="sales_count" widget="statinfo" />
 +                    </button>
 +                </xpath>
 +            </field>
 +        </record>
 +
 +
          <record model="ir.ui.view" id="view_company_inherit_form2">
              <field name="name">res.company.form.inherit</field>
              <field name="inherit_id" ref="base.view_company_form"/>

diff --cc addons/stock/product_view.xml
index 100e66c,c3941eb..715186e
--- 1/addons/stock/product_view.xml
--- 2/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@@ -223,27 -209,6 +223,27 @@@
                     <button class="oe_inline oe_stat_button" string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user" icon="fa-arrows-v"/>
                     <button class="oe_inline oe_stat_button" name="%(product_open_orderpoint)d" type="action" 
                          attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-refresh" string="Reordering Rules"/>
 +                   <button class="oe_inline oe_stat_button" name="action_view_routes" string="Routes" type="object" icon="fa-cogs" attrs="{'invisible':[('type', '=', 'service')]}" />
 +                </xpath>
 +            </field>
 +        </record>
 +        
 +        <record model="ir.ui.view" id="product_template_form_view_procurement_button">
 +            <field name="name">product.template_procurement</field>
 +            <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_form_view_only"/>
++            <field name="inherit_id" ref="product.product_template_only_form_view"/>
 +            <field name="arch" type="xml">
 +                <xpath expr="//div[@name='buttons']" position="inside">
 +                   <button class="oe_stat_button"
 +                           name="action_open_quants"
 +                           icon="fa-building-o"
 +                           type="object"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations">
 +                   <div><field name="qty_available_text"/></div>
 +                   </button>
 +                   <button class="oe_inline oe_stat_button" string="Moves" name= "action_view_stock_moves" type="object" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user" icon="fa-arrows-v"/>
 +                   <button class="oe_inline oe_stat_button" name="action_view_orderpoints" type="object" 
 +                        attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-refresh" string="Reordering Rules"/>
 +                   <button class="oe_inline oe_stat_button" name="action_view_routes" string="Routes" type="object" icon="fa-cogs" attrs="{'invisible':[('type', '=', 'service')]}" />
                  </xpath>
              </field>
          </record>

diff --cc addons/stock/wizard/stock_change_product_qty.py
index 3263161,62290e1..47fc792
--- 1/addons/stock/wizard/stock_change_product_qty.py
--- 2/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@@ -97,9 -103,9 +103,9 @@@ class stock_change_product_qty(osv.osv_
                  'inventory_id': inventory_id,
                  'product_qty': data.new_quantity,
                  'location_id': data.location_id.id,
-                 'product_id': rec_id,
-                 'product_uom_id': res_original.uom_id.id,
+                 'product_id': data.product_id.id,
+                 'product_uom_id': data.product_id.uom_id.id,
 -                'th_qty': th_qty,
 +                'theoretical_qty': th_qty,
                  'prod_lot_id': data.lot_id.id
              }
              inventory_line_obj.create(cr , uid, line_data, context=context)