odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Sync with trunk, because trunk was broken at last update 

bzr revid: tde@openerp.com-20140221115207-oussz4cxss9u99vw
This commit is contained in:
Thibault Delavallée 2014-02-21 12:52:07 +01:00
parent d3ea25c0ba 6709242bb8
commit 0b21db907e
3 changed files with 2 additions and 1738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1733
addons/gamification/i18n.moved/gamification.pot
View File

File diff suppressed because it is too large Load Diff

5
addons/mail/mail_thread.py
View File

@ -1590,10 +1590,7 @@ class mail_thread(osv.AbstractModel):
if set(partner_ids) == set([user_pid]):
try:
self.check_access_rights(cr, uid, 'read')
if context.get('operation', '') == 'create':
self.check_access_rule(cr, uid, ids, 'create')
else:
self.check_access_rule(cr, uid, ids, 'read')
self.check_access_rule(cr, uid, ids, 'read')
except (osv.except_osv, orm.except_orm):
return False
else:

2
addons/website/views/website_templates.xml
View File

@ -250,7 +250,7 @@
</div>
</div>
</xpath>
<xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
<xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
<link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
<link rel='stylesheet' href='/website/static/src/css/editor.css'/>
<link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>