diff --git a/addons/product/product.py b/addons/product/product.py
index c1e62e86689..b7ae4ea566e 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -404,7 +404,7 @@ class product_product(osv.osv):
         for p in self.browse(cr, uid, ids, context):
             data = self._get_partner_code_name(cr, uid, [], p.id, context.get('partner_id', None), context)
             if not data['code']:
-                data['name'] = p.code
+                data['code'] = p.code
             if not data['name']:
                 data['name'] = p.name
             res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + \
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 0b339908a0a..68bec40c4bc 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -432,7 +432,7 @@ class purchase_order_line(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Description', size=64, required=True),
+        'name': fields.char('Description', size=256, required=True),
         'product_qty': fields.float('Quantity', required=True, digits=(16,2)),
         'date_planned': fields.datetime('Scheduled date', required=True),
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),