Merge lp:~openerp-dev/openobject-server/trunk-bug-1083400-tpa into lp:openobject-server

Proposed by Turkesh Patel (openERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-1083400-tpa
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/res/res_partner.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-1083400-tpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+139839@code.launchpad.net

Description of the change

[FIX] apply domain on state field in res.partner to restrict selection on country.

To post a comment you must log in.

Unmerged revisions

4685. By Turkesh Patel (openERP)

[FIX] apply domain on state field in res.partner.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-11-30 17:48:19 +0000
+++ openerp/addons/base/res/res_partner.py 2012-12-14 06:42:29 +0000
@@ -228,7 +228,7 @@
228 'street2': fields.char('Street2', size=128),228 'street2': fields.char('Street2', size=128),
229 'zip': fields.char('Zip', change_default=True, size=24),229 'zip': fields.char('Zip', change_default=True, size=24),
230 'city': fields.char('City', size=128),230 'city': fields.char('City', size=128),
231 'state_id': fields.many2one("res.country.state", 'State'),231 'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id', '=', country_id)]"),
232 'country_id': fields.many2one('res.country', 'Country'),232 'country_id': fields.many2one('res.country', 'Country'),
233 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country',233 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country',
234 deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"),234 deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"),