Merge lp:~openerp-dev/openobject-addons/7.0-opw-603905-dhs into lp:openobject-addons/7.0

[Dhruti Shastri(OpenERP)]

Only Invoice line brings Description of the product.

[Naresh(OpenERP) (nch-openerp)]

Cool one along with this one https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1205717-msh/+merge/206481

adding description on invoices.

review: Approve

Unmerged revisions

9840. By Dhruti Shastri(OpenERP) on 2014-02-14

[sale,purchase] : product's description On SOL, POL (case Ref : 603905)

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-01-29 16:32:38 +0000
+++ purchase/purchase.py	2014-02-14 07:16:15 +0000
@@ -982,6 +982,8 @@
         product = product_product.browse(cr, uid, product_id, context=context_partner)
         #call name_get() with partner in the context to eventually match name and description in the seller_ids field
         dummy, name = product_product.name_get(cr, uid, product_id, context=context_partner)[0]
+        if product.description:
+            name += "," + product.description
         if product.description_purchase:
             name += '\n' + product.description_purchase
         res['value'].update({'name': name})

=== modified file 'sale/sale.py'
--- sale/sale.py	2014-01-15 14:05:27 +0000
+++ sale/sale.py	2014-02-14 07:16:15 +0000
@@ -903,6 +903,8 @@
 
         if not flag:
             result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context_partner)[0][1]
+            if product_obj.description:
+                result['name'] += "," + product_obj.description
             if product_obj.description_sale:
                 result['name'] += '\n'+product_obj.description_sale
         domain = {}