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

[MERGE] forward port of branch saas-3 up to ea659cb

This commit is contained in:
Christophe Simonis 2015-06-24 12:37:08 +02:00
parent 859eb2511e ea659cbd87
commit b8bf1e0905
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/project/project_view.xml
View File

@ -199,7 +199,7 @@
<filter string="Pending" name="Pending" domain="[('state', '=','pending')]"/>
<filter string="Template" name="Template" domain="[('state', '=','template')]"/>
<separator/>
<filter string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]"/>
<filter string="Member" name="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]"/>
<filter string="Manager" domain="[('user_id','=',uid)]"/>
<separator/>
<filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>

11
addons/web/static/src/js/view_form.js
View File

@ -5734,6 +5734,17 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
this._super.apply(this, arguments);
this.$el.find('input').eq(0).val('');
this.set_filename('');
},
set_value: function(value_){
var changed = value_ !== this.get_value();
this._super.apply(this, arguments);
// Trigger value change if size is the same
if (!changed){
this.trigger("change:value", this, {
oldValue: value_,
newValue: value_
});
}
}
});

3
openerp/addons/base/ir/ir_attachment.py
View File

@ -162,6 +162,9 @@ class ir_attachment(osv.osv):
result[attach.id] = self._file_read(cr, uid, attach.store_fname, bin_size)
else:
result[attach.id] = attach.db_datas
if bin_size:
result[attach.id] = int(result[attach.id])
return result
def _data_set(self, cr, uid, id, name, value, arg, context=None):