Merge lp:~openerp-dev/openobject-addons/trunk-bug-854303-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have fixed the issue, now in Invoice Report and notes in the Invoice contains the Sale Description.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Please fix problem in pos module.

review: Needs Fixing

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Sir,

The description problem is fixed in invoice report and in notes of customer invoice in point_of_sale module.

Thanks & Regards,
Devnani Bharat R.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2011-09-17 13:11:20 +0000
+++ point_of_sale/point_of_sale.py	2011-09-21 06:08:26 +0000
@@ -675,12 +675,13 @@
                     'quantity': line.qty,
                 }
                 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 line.product_id.description_sale:
+                    inv_line['note'] = line.product_id.description_sale
                 inv_line['price_unit'] = line.price_unit
                 inv_line['discount'] = line.discount
                 inv_line['name'] = inv_name
@@ -1179,7 +1180,7 @@
         if 'product_id' in values and not values['product_id']:
             return False
         return super(pos_order_line, self).write(cr, user, ids, values, context=context)
-    
+
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}