[MERGE] res.partner: ondelete=restrict on the state and country many2one.

bzr revid: vmt@openerp.com-20130603133555-2oz1bxotnkdh7tu4
This commit is contained in:
Vo Minh Thu
2013-06-03 15:35:55 +02:00
+2 -2
View File
@@ -259,8 +259,8 @@ class res_partner(osv.osv, format_address):
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'State'),
'country_id': fields.many2one('res.country', 'Country'),
'state_id': fields.many2one("res.country.state", 'State', ondelete='restrict'),
'country_id': fields.many2one('res.country', 'Country', ondelete='restrict'),
'country': fields.related('country_id', type='many2one', relation='res.country', string='Country',
deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"),
'email': fields.char('Email', size=240),