OLD 9.0 2017 05 31

Conflict in merging back https://github.com/odoo/odoo/commit/qeb15920499bb6f294025e92db2

--- a/addons/purchase/tests/test_purchase_order.py
+++ b/addons/purchase/tests/test_purchase_order.py
@@@ -81,6 -81,6 +81,10 @@@ class TestPurchaseOrder(AccountingTestC
                  'partner_id': self.partner_id.id,
                  'purchase_id': self.po.id,
                  'account_id': self.partner_id.property_account_payable_id.id,
++<<<<<<< HEAD
 +        })
++=======
+             })
++>>>>>>> 82fbe03... [FIX] purchase: update tests to effectively create invoices of type purchase, not
          self.invoice.purchase_order_change()
          self.assertEqual(self.po.order_line.mapped('qty_invoiced'), [5.0, 5.0], 'Purchase: all products should be invoiced"')

Resolved by taking the HEAD version. Committed as https://github.com/OCA/OCB/commit/f04db360 (empty) by @stefanrijnhart