Merge lp:~numerigraphe/openobject-addons/6.0-extra-city into lp:openobject-addons/extra-6.0

[Numérigraphe]

This branch re-introduces changes I made to city in v5.0:
- usable in countries without states
- uses "related" fields
- removes duplicate "replace" from the view file

Unmerged revisions

5598. By Numerigraphe - Lionel Sausin <email address hidden> on 2011-11-23

[IMP] Adapted city to countries without states. Simplified the code

=== modified file 'city/__openerp__.py'
--- city/__openerp__.py	2011-02-18 20:19:26 +0000
+++ city/__openerp__.py	2011-11-23 17:19:25 +0000
@@ -21,13 +21,13 @@
 #
 ##############################################################################
 {
-    "name" : "City-Helps to keep Homogenous address data in the Database",
-    "version" : "1.0",
+    "name" : "City-Helps to keep Homogeneous address data in the Database",
+    "version" : "1.1",
     "author" : "Pablo Rocandio",
     "category" : "Generic Modules/Base",
     "description": """Creates a model for storing cities
 Zip code, city, state and country fields are replaced with a location field in partner and partner contact forms.
-This module helps to keep homogenous address data in the database.""",
+This module helps to keep homogeneous address data in the database.""",
     "depends" : ["base"],
     "init_xml" : [],
     "update_xml" : [

=== modified file 'city/city.py'
--- city/city.py	2011-04-14 12:37:55 +0000
+++ city/city.py	2011-11-23 17:19:25 +0000
@@ -31,10 +31,14 @@
         if not len(ids):
             return []
         res = []
-        for line in self.browse(cr, uid, ids):
-            state = line.state_id.name
-            country = line.state_id.country_id.name
-            location = "%s %s, %s, %s" %(line.zipcode, line.name, state, country)
+        for line in self.browse(cr, uid, ids, context=context):
+            location = line.name
+            if line.zipcode:
+                location = "%s %s" % (line.zipcode, location)
+            if line.state_id:
+                location = "%s, %s" % (location, line.state_id.name)
+            if line.country_id:
+                location = "%s, %s" % (location, line.country_id.name)
             res.append((line['id'], location))
         return res
 
@@ -53,9 +57,13 @@
     _name = 'city.city'
     _description = 'City'
     _columns = {
-        'state_id': fields.many2one('res.country.state', 'State', required=True, select=1),
+        'state_id': fields.many2one('res.country.state', 'State',
+            domain="[('country_id','=',country_id)]", select=1),
         'name': fields.char('City', size=64, required=True, select=1),
         'zipcode': fields.char('ZIP', size=64, required=True, select=1),
+        'country_id': fields.many2one('res.country', 'Country', select=1),
+        'code': fields.char('City Code', size=64,
+            help="The official code for the city"),
     }
 city()
 
@@ -70,117 +78,17 @@
 
 class res_partner_address(osv.osv):
     _inherit = "res.partner.address"
-
-    def _get_zip(self, cr, uid, ids, field_name, arg, context):
-        res={}
-        for obj in self.browse(cr,uid,ids):
-            if obj.location:
-                res[obj.id] = obj.location.zipcode
-            else:
-                res[obj.id] = ""
-        return res
-
-    def _zip_search(self, cr, uid, obj, name, args, context):
-        if not len(args):
-            return []
-        new_args = []
-        for argument in args:
-            operator = argument[1]
-            value = argument[2]
-            ids = self.pool.get('city.city').search(cr, uid, [('zipcode',operator,value)], context=context)
-            new_args.append( ('location','in',ids) )
-        if new_args:
-            # We need to ensure that locatio is NOT NULL. Otherwise all addresses
-            # that have no location will 'match' current search pattern.
-            new_args.append( ('location','!=',False) )
-        return new_args
-
-    def _get_city(self, cr, uid, ids, field_name, arg, context):
-        res={}
-        for obj in self.browse(cr,uid,ids):
-            if obj.location:
-                res[obj.id] = obj.location.name
-            else:
-                res[obj.id] = ""
-        return res
-
-    def _city_search(self, cr, uid, obj, name, args, context):
-        if not len(args):
-            return []
-        new_args = []
-        for argument in args:
-            operator = argument[1]
-            value = argument[2]
-            ids = self.pool.get('city.city').search(cr, uid, [('name',operator,value)], context=context)
-            new_args.append( ('location','in',ids) )
-        if new_args:
-            # We need to ensure that locatio is NOT NULL. Otherwise all addresses
-            # that have no location will 'match' current search pattern.
-            new_args.append( ('location','!=',False) )
-        return new_args
-
-    def _get_state(self, cr, uid, ids, field_name, arg, context):
-        res={}
-        for obj in self.browse(cr,uid,ids):
-            if obj.location:
-                res[obj.id] = [obj.location.state_id.id, obj.location.state_id.name]
-            else:
-                res[obj.id] = False
-        return res
-
-    def _state_id_search(self, cr, uid, obj, name, args, context):
-        if not len(args):
-            return []
-        new_args = []
-        for argument in args:
-            operator = argument[1]
-            value = argument[2]
-            ids = self.pool.get('city.city').search(cr, uid, [('state_id',operator,value)], context=context)
-            new_args.append( ('location','in',ids) )
-        if new_args:
-            # We need to ensure that locatio is NOT NULL. Otherwise all addresses
-            # that have no location will 'match' current search pattern.
-            new_args.append( ('location','!=',False) )
-        return new_args
-
-    def _get_country(self, cr, uid, ids, field_name, arg, context):
-        res={}
-        for obj in self.browse(cr,uid,ids):
-            if obj.location:
-                res[obj.id] = [obj.location.state_id.country_id.id, obj.location.state_id.country_id.name]
-            else:
-                res[obj.id] = False
-        return res
-
-    def _country_id_search(self, cr, uid, obj, name, args, context):
-        if not len(args):
-            return []
-        new_args = []
-        for argument in args:
-            operator = argument[1]
-            value = argument[2]
-            ids = self.pool.get('res.country.state').search(cr, uid, [('country_id',operator,value)], context=context)
-            address_ids = []
-            for country in self.pool.get('res.country.state').browse(cr, uid, ids, context):
-                ids += [city.id for city in country.city_ids]
-            new_args.append( ('location','in',tuple(ids)) )
-        if new_args:
-            # We need to ensure that locatio is NOT NULL. Otherwise all addresses
-            # that have no location will 'match' current search pattern.
-            new_args.append( ('location','!=',False) )
-        return new_args
-
     _columns = {
-        'location': fields.many2one('city.city', 'Location'),
-        'zip': fields.function(_get_zip, fnct_search=_zip_search, method=True, type="char", string='Zip', size=24),
-        'city': fields.function(_get_city, fnct_search=_city_search, method=True, type="char", string='City', size=128),
-        'state_id': fields.function(_get_state, fnct_search=_state_id_search, obj="res.country.state", method=True, type="many2one", string='State'),
-        'country_id': fields.function(_get_country, fnct_search=_country_id_search, obj="res.country" ,method=True, type="many2one", string='Country'),
+        'location': fields.many2one('city.city', 'Location', select=1),
+        'zip': fields.related('location', 'zipcode', type="char", string="Zip",
+                               store=False),
+        'city': fields.related('location', 'name', type="char", string="City",
+                               store=False),
+        'state_id': fields.related('location', 'state_id', type="many2one",
+                                   relation="res.country.state", string="State",
+                                   store=False),
+        'country_id': fields.related('location', 'country_id', type="many2one",
+                                     relation="res.country", string="Country",
+                                     store=False),
     }
 res_partner_address()
-
-
-
-
-
-

=== modified file 'city/city_view.xml'
--- city/city_view.xml	2011-02-18 20:19:26 +0000
+++ city/city_view.xml	2011-11-23 17:19:25 +0000
@@ -23,16 +23,6 @@
         </field>
     </record>
 
-    <!-- We need to city replaces to remove it -->
-    <record model="ir.ui.view" id="partners_form_del_citycity">
-        <field name="name">partners_form_del_citycity</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="arch" type="xml">
-            <field name="city" position="replace"/>
-        </field>
-    </record>
-
     <record model="ir.ui.view" id="partners_form_del_zip">
         <field name="name">partners_form_del_zip</field>
         <field name="model">res.partner</field>
@@ -167,6 +157,7 @@
                 <field name="zipcode"/>
                 <field name="name"/>
                 <field name="state_id"/>
+                <field name="country_id"/>
             </tree>
         </field>
     </record>
@@ -179,7 +170,9 @@
             <form string="City">
                 <field name="zipcode" select="1"/>
                 <field name="name" select="1"/>
+                <field name="country_id" />
                 <field name="state_id" select="1"/>
+                <field name="code" select="2"/>
             </form>
         </field>
     </record>