diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index e07fdd07bbc..e3550cd7018 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -591,6 +591,43 @@ class MigrationManager(object):
 
 
 def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
+    
+    def process_sql_file(cr, file):
+        queries = fp.read().split(';')
+        for query in queries:
+            new_query = ' '.join(query.split())
+            if new_query:
+                cr.execute(new_query)
+   
+    def load_init_update_xml(cr, m, idref, mode, kind):
+        for filename in package.data.get('%s_xml' % kind, []):
+            logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
+            _, ext = os.path.splitext(filename)
+            fp = tools.file_open(opj(m, filename))
+            if ext == '.csv':
+                noupdate = (kind == 'init')
+                tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
+            elif ext == '.sql':
+                process_sql_file(cr, fp)
+            elif ext == '.yml':
+                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
+            else:
+                tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
+            fp.close()
+
+    def load_demo_xml(cr, m, idref, mode):
+        for xml in package.data.get('demo_xml', []):
+            name, ext = os.path.splitext(xml)
+            logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml))
+            fp = tools.file_open(opj(m, xml))
+            if ext == '.csv':
+                tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
+            elif ext == '.yml':
+                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+            else:
+                tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+            fp.close()
+    
     # **kwargs is passed directly to convert_xml_import
     if not status:
         status = {}
@@ -647,39 +684,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                     'license': package.data.get('license', 'GPL-2'),
                     'certificate': package.data.get('certificate') or None,
                     })
-                for filename in package.data.get('%s_xml' % kind, []):
-                    logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
-                    name, ext = os.path.splitext(filename)
-                    fp = tools.file_open(opj(m, filename))
-                    if ext == '.csv':
-                        noupdate=False
-                        if kind == 'init':
-                            noupdate=True
-                        tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
-                    elif ext == '.sql':
-                        queries = fp.read().split(';')
-                        for query in queries:
-                            new_query = ' '.join(query.split())
-                            if new_query:
-                                cr.execute(new_query)
-                    elif ext == '.yml':
-                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    else:
-                        tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    fp.close()
+                load_init_update_xml(cr, m, idref, mode, kind)
             if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
                 status['progress'] = (float(statusi)+0.75) / len(graph)
-                for xml in package.data.get('demo_xml', []):
-                    name, ext = os.path.splitext(xml)
-                    logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml))
-                    fp = tools.file_open(opj(m, xml))
-                    if ext == '.csv':
-                        tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
-                    elif ext == '.yml':
-                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    else:
-                        tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
-                    fp.close()
+                load_demo_xml(cr, m, idref, mode)
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid))
             package_todo.append(package.name)