Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
authorGéry Debongnie <ged@odoo.com>
Fri, 30 May 2014 08:29:30 +0000 (10:29 +0200)
committerGéry Debongnie <ged@odoo.com>
Fri, 30 May 2014 08:29:30 +0000 (10:29 +0200)
commit514203743d3f8fbdaf2f976972aa0a20e202cc07
treeeade58a00234937bdffd0ad717153fb962f70490
parent1a7101d94edb533eb319ae8a0ed600f84ce5b987
parentfb650ee92eb2e8885737a63bc8db702c964926ae
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

Conflicts:
addons/mrp/mrp_view.xml
addons/hr_expense/hr_expense_view.xml
addons/membership/membership_view.xml
addons/mrp/mrp_view.xml
addons/point_of_sale/point_of_sale_view.xml
addons/purchase/purchase_view.xml
addons/purchase_requisition/purchase_requisition_view.xml
addons/stock/stock_view.xml
addons/stock_landed_costs/stock_landed_costs_view.xml