OLD 8.0 2016 12 25

Conflict between https://github.com/OCA/OCB/pull/512 and https://github.com/odoo/odoo/commit/23ed2805b89ba47657f50c689a97bf913e72f656:

diff --cc addons/event_sale/event_sale.py
index 0ff79f2,c89459f..0000000
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@@ -205,7 -205,8 +205,12 @@@ class event_ticket(osv.osv)
      _columns = {
          'name': fields.char('Name', required=True, translate=True),
          'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'),
++<<<<<<< HEAD
 +        'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_ok", "=", True)]),
++=======
+         'product_id': fields.many2one('product.product', 'Product', required=True,
+             domain=["|", ("event_type_id", "!=", False), ("event_ok", "=", True)]),
++>>>>>>> odoo/8.0
          'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'),
          'deadline': fields.date("Sales End"),
          'is_expired': fields.function(_is_expired, type='boolean', string='Is Expired'),

Fixed with git merge -X theirs odoo/8.0 by @hbrunn in https://github.com/OCA/OCB/commit/41b4b3760c41a9b04f8963a39203a26f45c52af2