Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

Conflicts:
	addons/mrp/mrp_view.xml

diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge

diff --cc addons/membership/membership_view.xml
Simple merge

diff --cc addons/mrp/mrp_view.xml
index 26b8871,464a703..e956de8
--- 1/addons/mrp/mrp_view.xml
--- 2/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@@ -422,11 -421,11 +422,11 @@@
              <field name="arch" type="xml">
                  <search string="Search Bill Of Material">
                      <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
 -                    <field name="bom_line_ids" string="Components"/>
 -                    <field name="product_tmpl_id"/>
 +                    <field name="bom_lines" string="Components"/>
 +                    <field name="product_id"/>
                      <field name="company_id" groups="base.group_multi_company"/>
-                     <group expand="0" string="Group By">
+                     <group expand="0" string="Group By...">
 -                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_tmpl_id'}"/>
 +                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                          <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}"/>
                          <filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
                          <filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}"/>

diff --cc addons/point_of_sale/point_of_sale_view.xml
Simple merge

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

diff --cc addons/purchase_requisition/purchase_requisition_view.xml
Simple merge

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

diff --cc addons/stock_landed_costs/stock_landed_costs_view.xml
Simple merge