diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index c166f79e524..5eb32988df2 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -84,7 +84,7 @@ class procurement_order(osv.osv): _inherit = ['mail.thread'] _log_create = False _columns = { - 'name': fields.char('Reason', size=64, required=True, help='Procurement name.'), + 'name': fields.char('Description', required=True), 'origin': fields.char('Source Document', size=64, help="Reference of the document that created this Procurement.\n" "This is automatically completed by OpenERP."), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 5a12b17333a..842a183f082 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -611,7 +611,7 @@ class purchase_order(osv.osv): def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None): return { - 'name': order.name + ': ' + (order_line.name or ''), + 'name': order_line.name or '', 'product_id': order_line.product_id.id, 'product_qty': order_line.product_qty, 'product_uos_qty': order_line.product_qty, diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 49645364473..01208beeb8d 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -266,7 +266,7 @@ class sale_order(osv.osv): def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None): return { - 'name': line.name.split('\n')[0], + 'name': line.name, 'origin': order.name, 'date_planned': date_planned, 'product_id': line.product_id.id, @@ -280,14 +280,14 @@ class sale_order(osv.osv): 'procure_method': line.type, 'move_id': move_id, 'company_id': order.company_id.id, - 'note': '\n'.join(line.name.split('\n')[1:]) + 'note': line.name, } def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): location_id = order.shop_id.warehouse_id.lot_stock_id.id output_id = order.shop_id.warehouse_id.lot_output_id.id return { - 'name': line.name.split('\n')[0][:250], + 'name': line.name, 'picking_id': picking_id, 'product_id': line.product_id.id, 'date': date_planned, @@ -305,7 +305,6 @@ class sale_order(osv.osv): 'tracking_id': False, 'state': 'draft', #'state': 'waiting', - 'note': '\n'.join(line.name.split('\n')[1:]), 'company_id': order.company_id.id, 'price_unit': line.product_id.standard_price or 0.0 } diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a7733f0b5f1..ef6d0f3f8dc 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1689,7 +1689,7 @@ class stock_move(osv.osv): return True _columns = { - 'name': fields.char('Name', size=250, required=True, select=True), + 'name': fields.char('Description', required=True, select=True), 'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'), 'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),