← Back to branch summary

~credativ/credativ-openerp/addons-5.0

« back to all changes in this revision

Viewing changes to sale_damagelog/sale_comprequest.py

  • Committer: Craig Gowing (credativ)
  • Date: 2012-07-06 15:33:01 UTC
  • Revision ID: craig.gowing@credativ.co.uk-20120706153301-oyy6ey8d10qvnsnr
[IMP] Change field references

Show diffs side-by-side

added added

removed removed

Lines of Context:
sale_damagelog/sale_comprequest.py
21
21
        'product_id': fields.related('damagelog_id', 'stock_move_id', 'product_id', type='many2one', relation='product.product', string='Product', readonly=True),
22
22
        'product_sku': fields.related('product_id', 'default_code', type='char', size=16, string='Product Code', readonly=True),
23
23
        'product_value': fields.float('Product Value', readonly=True),
24
 
        'product_supplier': fields.many2one('res.partner', 'Product Supplier', readonly=True),
 
24
        'product_supplier': fields.related('damagelog_id', 'product_supplier', type='many2one', relation='res.partner', string='Product Supplier', readonly=True),
25
25
        'partner_id': fields.related('sale_order_id', 'partner_id', type='many2one', relation='res.partner', string='Partner', readonly=True),
26
26
        'refund_type': fields.selection(
27
27
            [('refund', 'Refund'), ('voucher', 'Voucher'),
31
31
        'refund_value': fields.float('Refund Value', readonly=True, states={'draft': [('readonly', False)]}),
32
32
        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('cancel', 'Cancelled')], 'Refund Status', required=True, readonly=True),
33
33
        'voucher_code': fields.char('Voucher Code', size=200, readonly=True, states={'draft': [('readonly', False)]}),
34
 
        'repl_order_ref': fields.char('Replacement / Redispatch Order Reference', size=200, readonly=True, states={'draft': [('readonly', False)]}),
 
34
        'repl_order_ref': fields.many2one('sale.order', 'Replacement / Redispatch Order Reference', readonly=True, states={'draft': [('readonly', False)]}),
35
35
        'comment_ids': fields.one2many('sale.comprequest.comment', 'comprequest_id'),
36
36
        'notes': fields.text('Notes'),
37
37
    }
71
71
                raise osv.except_osv('User Error', 'Replacement / Redispatch Order Reference is required for this refund type')
72
72
            if comp_req.refund_type == 'voucher' and not comp_req.voucher_code:
73
73
                raise osv.except_osv('User Error', 'Voucher Code is required for this refund type')
74
 
            if comp_req.refund_type == 'refund' and not comp_req.refund_value:
 
74
            if comp_req.refund_type in ('refund', 'voucher') and not comp_req.refund_value:
75
75
                raise osv.except_osv('User Error', 'Refund Value is required for this refund type')
76
76
        self.write(cr, uid, ids, {'state': 'confirmed', 'confirm_uid': uid, 'confirm_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=None)
77
77