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

[MERGE] forward port of branch 7.0 up to 60a361c

This commit is contained in:
Denis Ledoux 2014-12-15 17:34:21 +01:00
parent 82109d9ba8 60a361cd17
commit ecd8f63d75
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_mail.py
View File

@ -150,7 +150,7 @@ class mail_mail(osv.Model):
- partner is an user and has read access to the document: direct link to document with model, res_id
"""
if partner and partner.user_ids:
base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
base_url = self.pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'web.base.url')
# the parameters to encode for the query and fragment part of url
query = {'db': cr.dbname}
fragment = {

2
addons/web_gantt/static/src/js/gantt.js
View File

@ -162,7 +162,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({
self.fields[self.fields_view.arch.attrs.date_delay]);
if (!tmp)
return;
task_stop = task_start.clone().addMilliseconds(tmp * 60 * 60 * 1000);
task_stop = task_start.clone().addMilliseconds(instance.web.parse_value(tmp, {type:"float"}) * 60 * 60 * 1000);
}
var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
var id = _.uniqueId("gantt_task_");