Merge lp:~openerp-dev/openobject-server/trunk-bug-1119228-jir into lp:openobject-server

[Jignesh Rathod(OpenERP)]

Hello ,

Fixes the problem of change country, State must be related country, if state does not releted to country then
it must be changed.

Thanks.

Unmerged revisions

4792. By Jignesh Rathod(OpenERP) on 2013-02-14

[FIX] Problem of state not related to country

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-01-14 17:43:55 +0000
+++ openerp/addons/base/res/res_partner.py	2013-02-14 09:20:30 +0000
@@ -340,6 +340,16 @@
             return {'value':{'country_id':country_id}}
         return {}
 
+    def onchange_country(self, cr, uid, ids, country_id, state_id, context=None):
+        result = {}
+        search_domain = [('country_id','=',country_id)]
+        state_ids = self.pool.get('res.country.state').search(cr, uid,search_domain, context)
+        if state_id in state_ids:
+            return {'value': result}
+        else:
+            result['state_id'] = False
+        return {'value': result}
+
     def _check_ean_key(self, cr, uid, ids, context=None):
         for partner_o in pooler.get_pool(cr.dbname).get('res.partner').read(cr, uid, ids, ['ean13',]):
             thisean=partner_o['ean13']

=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml	2013-01-25 21:40:27 +0000
+++ openerp/addons/base/res/res_partner_view.xml	2013-02-14 09:20:30 +0000
@@ -165,7 +165,7 @@
                                     <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
                                     <field name="zip" placeholder="ZIP" style="width: 20%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}' on_change="onchange_country(country_id,state_id)"/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>