diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
| commit | 5bb4fa2b4347a99b5c1a5722d5591c06f7032d4c (patch) | |
| tree | ba5127daf27cc553ebc8683a39b68ebec379f4e9 /addons/google_spreadsheet | |
| parent | 0db0f20bda410bd6601c266026363fc95b21c9c4 (diff) | |
| parent | a7ff75f94a168e26b9e9a208167b07d45dc751cb (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
Diffstat (limited to 'addons/google_spreadsheet')
| -rw-r--r-- | addons/google_spreadsheet/google_spreadsheet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py index 693300904d0..a724e3c425e 100644 --- a/addons/google_spreadsheet/google_spreadsheet.py +++ b/addons/google_spreadsheet/google_spreadsheet.py @@ -60,7 +60,7 @@ class config(osv.osv): user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context) username = user['login'] password = user['password'] - if self.pool['ir.module.module'].search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_crypt'), ('state', '=', 'installed')]) == 1: + if not password: config_formula = '=oe_settings("%s";"%s")' % (url, dbname) else: config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password) |