diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
| commit | 18e22be138f4d273ce8f63c0ff2c8a437cf6ce5d (patch) | |
| tree | 63bd658de7b6fa0e91d521ca19322dd68bdc1492 /addons/share | |
| parent | f6e5bf847b1a7107c09b009a757823b0f9514fa4 (diff) | |
| parent | 0aab81cd3ac6881b2b64ccedb901b55badd421d4 (diff) | |
[MERGE] forward port of branch 8.0 up to 0aab81c
Diffstat (limited to 'addons/share')
| -rw-r--r-- | addons/share/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/share/wizard/share_wizard.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 87daf1fa36d..0354085d873 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -52,5 +52,4 @@ synchronization with other companies. 'auto_install': True, 'web': True, 'qweb' : ['static/src/xml/*.xml'], - 'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'], } diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 161cbfba112..3d6246c5eff 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -831,7 +831,7 @@ class share_wizard(osv.TransientModel): body += '%s\n\n' % ((user.signature or '')) body += "--\n" body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" - "It is open source and can be found on http://www.openerp.com.") + "It is open source and can be found on https://www.odoo.com.") msg_id = message_obj.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='', context=context) notification_obj.create(cr, uid, {'user_id': result_line.user_id.id, 'message_id': msg_id}, context=context) @@ -865,7 +865,7 @@ class share_wizard(osv.TransientModel): body += "\n\n%s\n\n" % ( (user.signature or '') ) body += "--\n" body += _("Odoo is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n" - "It is open source and can be found on http://www.openerp.com.") + "It is open source and can be found on https://www.odoo.com.") mail_ids.append(mail_mail.create(cr, uid, { 'email_from': user.email, 'email_to': email_to, |