Merge lp:~openerp-dev/openobject-addons/trunk-bug-1110399-fka into lp:openobject-addons

[Foram Katharotiya (OpenERP)]

Hello,

 Fix the issue of description shows 2 times when create task from sale order.

Thanks,
FKA

Unmerged revisions

8531. By Foram Katharotiya (OpenERP) on 2013-02-04

[FIX] from sale order display 2 times value of description in task

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2012-12-20 11:47:30 +0000
+++ procurement/procurement.py	2013-02-04 11:42:26 +0000
@@ -115,7 +115,6 @@
             ('waiting','Waiting')], 'Status', required=True, track_visibility='onchange',
             help='When a procurement is created the status is set to \'Draft\'.\n If the procurement is confirmed, the status is set to \'Confirmed\'.\
             \nAfter confirming the status is set to \'Running\'.\n If any exception arises in the order then the status is set to \'Exception\'.\n Once the exception is removed the status becomes \'Ready\'.\n It is in \'Waiting\'. status when the procurement is waiting for another one to finish.'),
-        'note': fields.text('Note'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {

=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2012-12-21 16:48:08 +0000
+++ sale_stock/sale_stock.py	2013-02-04 11:42:26 +0000
@@ -280,7 +280,6 @@
             'procure_method': line.type,
             'move_id': move_id,
             'company_id': order.company_id.id,
-            'note': line.name,
         }
 
     def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):