diff options
| author | DHS (OpenERP) <dhs@tinyerp.com> | 2010-10-26 15:04:36 +0530 |
|---|---|---|
| committer | DHS (OpenERP) <dhs@tinyerp.com> | 2010-10-26 15:04:36 +0530 |
| commit | 6d3ed5f3dfd6833cda05d0bfa9f8a40457ecc36b (patch) | |
| tree | f42d4462c6c1c60846f95eaec81d9557d384ee85 /addons/share | |
| parent | 1a1197101fe74b49129818e5bd3cda42e80cad7f (diff) | |
| parent | 8b1ef6ba2b0ac67cc4e63cab7f35a165dabf8e3a (diff) | |
[MERGE] Merged main branch
bzr revid: dhs@tinyerp.com-20101026093436-lxntznhfikv09akv
Diffstat (limited to 'addons/share')
| -rw-r--r-- | addons/share/wizard/share_wizard.py | 4 | ||||
| -rw-r--r-- | addons/share/wizard/share_wizard_view.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 2d1fd252ecf..9349980933f 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -290,7 +290,7 @@ class share_create(osv.osv_memory): user_obj = self.pool.get('res.users') result_obj = self.pool.get('share.wizard.result.line') share_root_url = wizard_data.share_root_url - format_url = '%(login)' in share_root_url and '%(password)' in share_root_url + format_url = '%(login)s' in share_root_url and '%(password)s' in share_root_url existing_passwd_str = _('*usual password*') if wizard_data.user_type == 'new': for email in wizard_data.new_users.split('\n'): @@ -430,7 +430,7 @@ class share_create(osv.osv_memory): else: body += _("This additional data has been automatically added to your current access.\n") body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login - + if not tools.email_send( user.user_email, email_to, diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index e6cade91c84..95fbc983c84 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -90,7 +90,7 @@ - 'action_id' (id of action) - 'domain' (string expression for full domain to apply as sent to server, with dynamic data like 'uid' replaced by actual value (i.e. after eval)!) - - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders) + - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders) --> <record id="action_share_wizard" model="ir.actions.act_window"> <field name="name">Share Wizard</field> @@ -106,7 +106,7 @@ - 'action_id' (id of action) - 'domain' (string expression for full domain to apply as sent to server, with dynamic data like 'uid' replaced by actual value (i.e. after eval)!) - - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders) + - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders) --> <record id="action_share_wizard_step1" model="ir.actions.act_window"> <field name="name">Share Wizard</field> |