[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com...

diff --cc addons/marketing_campaign/marketing_campaign.py
Simple merge

diff --cc addons/point_of_sale/static/src/js/db.js
index 077a239,516637a..0c7ba8f
--- 1/addons/point_of_sale/static/src/js/db.js
--- 2/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@@ -145,7 -168,10 +145,10 @@@ function openerp_pos_db(instance, modul
              for(var i = 0, len = products.length; i < len; i++){
                  var product = products[i];
                  var search_string = this._product_search_string(product);
 -                var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id;
 +                var categ_id = product.public_categ_id ? product.public_categ_id[0] : this.root_category_id;
+                 if (product.variants){
+                     product.name = product.name+" ("+product.variants+")";
+                 }
                  if(!stored_categories[categ_id]){
                      stored_categories[categ_id] = [];
                  }

diff --cc addons/point_of_sale/static/src/js/models.js
index 6c65b0b,b7b36d0..4c39c82
--- 1/addons/point_of_sale/static/src/js/models.js
--- 2/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@@ -219,10 -175,10 +219,10 @@@ function openerp_pos_models(instance, m
  
                      return self.fetch(
                          'product.product', 
-                         ['name', 'list_price','price','public_categ_id', 'taxes_id', 'ean13', 'default_code',
 -                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants',
++                        ['name', 'list_price','price','public_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants',
                           'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                          [['sale_ok','=',true],['available_in_pos','=',true]],
 -                        {pricelist: self.get('shop').pricelist_id[0]} // context for price
 +                        {pricelist: self.pricelist.id} // context for price
                      );
                  }).then(function(products){
                      self.db.add_products(products);