[MERGE] master

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

diff --cc addons/stock/product_view.xml
index aaecf4e,103133d..b482f2a
--- 1/addons/stock/product_view.xml
--- 2/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@@ -135,9 -187,25 +187,30 @@@
              </field>
          </record>
  
+         <record model="ir.ui.view" id="product_form_view_procurement_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">
+                 <group name="status" position="before" version="7.0">
+                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
+                         <field name="track_all" groups="stock.group_production_lot"/>
+                         <field name="track_incoming" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                         <field name="track_outgoing" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                     </group>
+                 </group>
+                 <xpath expr="//div[@name='buttons']" position="inside">
 -                   <button class="oe_inline oe_stat_button" string="Current Stock" name="%(product_open_quants)d" type="action"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations" icon="fa-bank"/>
 -                   <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-h"/>
++                   <button class="oe_stat_button"
++                           name="%(product_open_quants)d"
++                           icon="fa-bank"
++                           type="action"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations">
++                    <div><field name="qty_in_stock"/></div>
++                    </button>
++                   <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-pinterest" string="Reordering Rules"/>
+                 </xpath>
+             </field>
+         </record>
      </data>
 -</openerp>
 +</openerp>

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