diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-10-30 09:20:46 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-10-30 09:20:46 +0100 |
| commit | 12801a8cbcb57dfd77dd7b6bb1bb60ed90162409 (patch) | |
| tree | 946e19d097371371ccf012aa2b2c6a942c4ff55a /addons/google_spreadsheet | |
| parent | 4ae5425fb84b6ce99876da83e7138df650bac70b (diff) | |
| parent | 4a3f51bb4ee8926d143d59959a1bd8dd2de8e2cf (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
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) |