[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121219201719-yy51k9tlqpa5v8kj

openerp/addons/base/res/res_users.py

@@ -299,8 +299,7 @@ class res_users(osv.osv):
             for id in ids:
                 if id in self._uid_cache[db]:
                     del self._uid_cache[db][id]
-        self.context_get.clear_cache(self, cr)
-
+        self.context_get.clear_cache(self)
         return res
 
     def unlink(self, cr, uid, ids, context=None):

openerp/report/render/rml2pdf/trml2pdf.py

@@ -493,7 +493,7 @@ class _rml_canvas(object):
             img = ImageReader(s)
             (sx,sy) = img.getSize()
             _logger.debug("Image is %dx%d", sx, sy)
-            args = { 'x': 0.0, 'y': 0.0 }
+            args = { 'x': 0.0, 'y': 0.0, 'mask': 'auto'}
             for tag in ('width','height','x','y'):
                 if node.get(tag):
                     args[tag] = utils.unit_get(node.get(tag))

openerp/service/web_services.py

@@ -77,11 +77,11 @@ def _initialize_db(serv, id, db_name, demo, lang, user_password):
             mids = modobj.search(cr, SUPERUSER_ID, [('state', '=', 'installed')])
             modobj.update_translations(cr, SUPERUSER_ID, mids, lang)
 
-        cr.execute('UPDATE res_users SET password=%s, lang=%s, active=True WHERE login=%s', (
-            user_password, lang, 'admin'))
-        cr.execute('SELECT login, password ' \
-                   ' FROM res_users ' \
-                   ' ORDER BY login')
+        # update admin's password and lang
+        values = {'password': user_password, 'lang': lang}
+        pool.get('res.users').write(cr, SUPERUSER_ID, [SUPERUSER_ID], values)
+
+        cr.execute('SELECT login, password FROM res_users ORDER BY login')
         serv.actions[id].update(users=cr.dictfetchall(), clean=True)
         cr.commit()
         cr.close()