Merge remote-tracking branch 'odoo/8.0' into 8.0

addons/mail/mail_message.py

@@ -452,7 +452,7 @@ def _get_expandable(domain, message_nb, parent_id, max_limit):
             exp_domain = domain + [('id', '<', min(message_unload_ids + message_ids))]
         else:
             exp_domain = domain + ['!', ('id', 'child_of', message_unload_ids + parent_tree.keys())]
-        more_count = self.search_count(cr, uid, exp_domain, context=context)
+        more_count = self.search(cr, uid, exp_domain, context=context, limit=1)
         if more_count:
             # inside a thread: prepend
             if parent_id:

addons/point_of_sale/point_of_sale.py

@@ -990,14 +990,17 @@ def action_invoice(self, cr, uid, ids, context=None):
                     'invoice_id': inv_id,
                     'product_id': line.product_id.id,
                     'quantity': line.qty,
-                    'account_analytic_id': self._prepare_analytic_account(cr, uid, line, context=context),
                 }
                 inv_name = product_obj.name_get(cr, uid, [line.product_id.id], context=context)[0][1]
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
                                                                line.product_id.id,
                                                                line.product_id.uom_id.id,
                                                                line.qty, partner_id = order.partner_id.id,
                                                                fposition_id=order.partner_id.property_account_position.id)['value'])
+                if not inv_line.get('account_analytic_id', False):
+                    inv_line['account_analytic_id'] = \
+                        self._prepare_analytic_account(cr, uid, line,
+                                                       context=context)
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
                 inv_line['name'] = inv_name

addons/project/project_view.xml

@@ -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)]"/>

addons/sale/sale.py

@@ -351,7 +351,7 @@ def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
         if vals.get('name', '/') == '/':
-            vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'sale.order') or '/'
+            vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'sale.order', context=context) or '/'
         if vals.get('partner_id') and any(f not in vals for f in ['partner_invoice_id', 'partner_shipping_id', 'pricelist_id', 'fiscal_position']):
             defaults = self.onchange_partner_id(cr, uid, [], vals['partner_id'], context=context)['value']
             if not vals.get('fiscal_position') and vals.get('partner_shipping_id'):

addons/web/static/src/js/view_form.js

@@ -5742,6 +5742,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_
+            });
+        }
     }
 });
 

doc/cla/individual/endika.md

@@ -0,0 +1,11 @@
+Spain, 2015-06-24
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Endika Iglesias endika2@gmail.com https://github.com/endika

doc/cla/individual/mariuszmizgier.md

@@ -0,0 +1,12 @@
+Poland, 2015-05-13
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Mariusz Mizgier mariusz.mizgier@currenda.pl https://github.com/mariuszmizgier
+

openerp/addons/base/ir/ir_attachment.py

@@ -162,6 +162,9 @@ def _data_get(self, cr, uid, ids, name, arg, context=None):
                 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):