OLD 8.0 2015 07 30

Conflict:

diff --cc openerp/addons/base/module/module.py
index d67f559,162b109..0000000
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@@ -456,9 -456,8 +456,14 @@@ class module(osv.osv)
          ir_model_data = self.pool.get('ir.model.data')
          modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)]
          ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context)
++<<<<<<< HEAD
 +        return self.write(
 +            cr, uid, ids, {'state': 'uninstalled', 'latest_version': False},
 +            context=context)
++=======
+         self.write(cr, uid, ids, {'state': 'uninstalled', 'latest_version': False})
+         return True
++>>>>>>> odoo/8.0
  
      def downstream_dependencies(self, cr, uid, ids, known_dep_ids=None,
                                  exclude_states=['uninstalled', 'uninstallable', 'to remove'],

Resolved as:

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index d67f559..162b109 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -456,9 +456,8 @@ class module(osv.osv):
         ir_model_data = self.pool.get('ir.model.data')
         modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)]
         ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context)
-        return self.write(
-            cr, uid, ids, {'state': 'uninstalled', 'latest_version': False},
-            context=context)
+        self.write(cr, uid, ids, {'state': 'uninstalled', 'latest_version': False})
+        return True
 
     def downstream_dependencies(self, cr, uid, ids, known_dep_ids=None,
                                 exclude_states=['uninstalled', 'uninstallable', 'to remove'],

Which is reverting https://github.com/OCA/OCB/commit/392d0e2b and doing it the way odoo does it.

Committed as https://github.com/OCA/OCB/commit/d8f77d7 by @hbrunn