Skip to content

Commit

Permalink
Merge remote-tracking branch 'odoo/heads/8.0' into OCB/8.0
Browse files Browse the repository at this point in the history
Conflicts:
	openerp/modules/loading.py: solved by using Odoo's version which is an
improved version on the one present in OCB.
  • Loading branch information
gurneyalex committed Apr 5, 2016
2 parents 228494b + cc60504 commit 0c2734a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions openerp/modules/loading.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
t0 = time.time()
t0_sql = openerp.sql_db.sql_counter
if openerp.tools.config['test_enable']:
if update_module and mods:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed' and name in %s", (tuple(mods),))
if update_module:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed' and name = ANY(%s)", (processed_modules,))
else:
cr.execute("SELECT name FROM ir_module_module WHERE state='installed'")
for module_name in cr.fetchall():
Expand Down

0 comments on commit 0c2734a

Please sign in to comment.