[MERGE]merge with latest wms-trunk

bzr revid: csn@openerp.com-20140124094419-monnhyomr8721nbx

diff --cc addons/product/product.py
index 20346d0,f22fcdb..e093cd0
--- 1/addons/product/product.py
--- 2/addons/product/product.py
+++ b/addons/product/product.py
@@@ -612,11 -622,15 +612,11 @@@ class product_product(osv.osv)
      _inherit = ['mail.thread']
      _order = 'default_code,name_template'
      _columns = {
 -        'qty_available': fields.function(_product_qty_available, type='float', string='Quantity On Hand'),
 -        'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
 -        'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
 -        'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
          'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
-         'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
+         'lst_price': fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
          'code': fields.function(_product_code, type='char', string='Internal Reference'),
-         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
-         'default_code' : fields.char('Internal Reference', size=64, select=True),
+         'partner_ref': fields.function(_product_partner_ref, type='char', string='Customer ref'),
+         'default_code': fields.char('Internal Reference', size=64, select=True),
          'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
          'variants': fields.char('Variants', size=64),
          'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),

diff --cc addons/product/product_view.xml
Simple merge