[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101104101644-aogc78783v0jg3wx
This commit is contained in:
Mustufa Rangwala 2010-11-04 15:46:44 +05:30
commit 767461aca5
1 changed files with 1 additions and 1 deletions

View File

@ -882,7 +882,7 @@ class sale_order_line(osv.osv):
\n* The \'Done\' state is set when the sale order line has been picked. \
\n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
}
_order = 'sequence, id desc'