Merge lp:~openerp-dev/openobject-addons/6.0-opw-579903-ado into lp:openobject-addons/6.0

[Amit Dodiya (OpenERP)]

Hello,

[FIX]: text of description field not passing to invoice from delivery order / incoming shipment

Steps:
1). Add sale description in any product
2). Create new delivery order and add the above product in delivery order and set Invoice control=To be invoiced
3). Now process the delivery order and create invoice from it
You will see the sale description of selected product is not in invoice line.

Regards,
Amit Dodiya

Unmerged revisions

5351. By Amit Dodiya<email address hidden> on 2012-10-04

[FIX]: text of description field not passing to invoice from delivery order / incoming shipment

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-08-17 07:46:56 +0000
+++ stock/stock.py	2012-10-10 05:16:21 +0000
@@ -1185,6 +1185,12 @@
             prodlot_ids = {}
             product_avail = {}
             for move in pick.move_lines:
+                if pick.type == 'in':
+                    move_note =  move.product_id.description_purchase
+                else:
+                    move_note =  move.product_id.description_sale
+                if not move.note:
+                    move_obj.write(cr, uid, move.id, {'note': move_note}, context)
                 if move.state in ('done', 'cancel'):
                     continue
                 partial_data = partial_datas.get('move%s'%(move.id), {})