Remove sql injection problem
[odoo/odoo.git] / bin / addons / base / res / partner / partner.py
index 1145fda..82acd80 100644 (file)
@@ -1,29 +1,21 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
-# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# $Id: partner.py 1007 2005-07-25 13:18:09Z kayhman $
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
 
@@ -33,420 +25,433 @@ from osv import fields,osv
 import tools
 import ir
 import pooler
+from tools.translate import _
 
 class res_partner_function(osv.osv):
-       _name = 'res.partner.function'
-       _description = 'Function of the contact'
-       _columns = {
-               'name': fields.char('Function name', size=64, required=True),
-               'code': fields.char('Code', size=8),
-       }
-       _order = 'name'
+    _name = 'res.partner.function'
+    _description = 'Function of the contact'
+    _columns = {
+        'name': fields.char('Function Name', size=64, required=True),
+        'code': fields.char('Code', size=8, required=True),
+        'ref':fields.char('Notes', size=32,),
+    }
+    _order = 'name'
+    _sql_constraints = [
+        ('code_uniq', 'unique (code)', 'The Code of the Partner Function must be unique !')
+    ]
 res_partner_function()
 
-class res_country(osv.osv):
-       _name = 'res.country'
-       _description = 'Country'
-       _columns = {
-               'name': fields.char('Country Name', size=64, help='The full name of the country.'),
-               'code': fields.char('Country Code', size=2, help='The ISO country code in two chars. You can use this field for quick search.'),
-       }
-       _sql_constraints = [
-               ('name_uniq', 'unique (name)', 'The name of the country must be unique !'),
-               ('code_uniq', 'unique (code)', 'The code of the country must be unique !')
-       ]
-       def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
-               if not args:
-                       args=[]
-               if not context:
-                       context={}
-               ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context)
-               if not ids:
-                       ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
-               return self.name_get(cr, user, ids, context)
-       _order='code'
-res_country()
-
-class res_country_state(osv.osv):
-       _description="Country state"
-       _name = 'res.country.state'
-       _columns = {
-               'country_id': fields.many2one('res.country', 'Country'),
-               'name': fields.char('State Name', size=64),
-               'code': fields.char('State Code', size=3),
-       }
-
-       def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=80):
-               if not args:
-                       args = []
-               if not context:
-                       context = {}
-               ids = self.search(cr, user, [('code', '=', name)] + args, limit=limit, context=context)
-               if not ids:
-                       ids = self.search(cr, user, [('name', operator, name)] + args, limit=limit, context=context)
-               return self.name_get(cr, user, ids, context)
-       _order = 'code'
-res_country_state()
 
 class res_payterm(osv.osv):
-       _description = 'Payment term'
-       _name = 'res.payterm'
-       _columns = {
-               'name': fields.char('Payment term (short name)', size=64),
-       }
+    _description = 'Payment term'
+    _name = 'res.payterm'
+    _columns = {
+        'name': fields.char('Payment Term (short name)', size=64),
+    }
 res_payterm()
 
-class res_partner_category_type(osv.osv):
-       _description='Partner category types'
-       _name = 'res.partner.category.type'
-       _columns = {
-               'name': fields.char('Category Name', required=True, size=64),
-       }
-       _order = 'name'
-res_partner_category_type()
-
-def _cat_type_get(self, cr, uid, context={}):
-       obj = self.pool.get('res.partner.category.type')
-       ids = obj.search(cr, uid, [])
-       res = obj.read(cr, uid, ids, ['name'], context)
-       return [(r['name'], r['name']) for r in res]
-
 class res_partner_category(osv.osv):
-       def name_get(self, cr, uid, ids, context={}):
-               if not len(ids):
-                       return []
-               reads = self.read(cr, uid, ids, ['name','parent_id'], context)
-               res = []
-               for record in reads:
-                       name = record['name']
-                       if record['parent_id']:
-                               name = record['parent_id'][1]+' / '+name
-                       res.append((record['id'], name))
-               return res
-
-       def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-               res = self.name_get(cr, uid, ids)
-               return dict(res)
-       def _check_recursion(self, cr, uid, ids):
-               level = 100
-               while len(ids):
-                       cr.execute('select distinct parent_id from res_partner_category where id in ('+','.join(map(str,ids))+')')
-                       ids = filter(None, map(lambda x:x[0], cr.fetchall()))
-                       if not level:
-                               return False
-                       level -= 1
-               return True
-
-       _description='Partner Categories'
-       _name = 'res.partner.category'
-       _columns = {
-               'name': fields.char('Category Name', required=True, size=64),
-               'type_id': fields.many2one('res.partner.category.type', 'Category Type'),
-               'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True),
-               'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
-               'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Childs Category'),
-               'active' : fields.boolean('Active'),
-       }
-       _constraints = [
-               (_check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
-       ]
-       _defaults = {
-               'active' : lambda *a: 1,
-       }
-       _order = 'parent_id,name'
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
+    def _check_recursion(self, cr, uid, ids):
+        level = 100
+        while len(ids):
+            cr.execute('select distinct parent_id from res_partner_category where id in ('+','.join(map(str, ids))+')')
+            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+        return True
+
+    _description='Partner Categories'
+    _name = 'res.partner.category'
+    _columns = {
+        'name': fields.char('Category Name', required=True, size=64, translate=True),
+        'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True),
+        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Full Name'),
+        'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),
+        'active' : fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
+    }
+    _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+    ]
+    _defaults = {
+        'active' : lambda *a: 1,
+    }
+    _order = 'parent_id,name'
 res_partner_category()
 
 class res_partner_title(osv.osv):
-       _name = 'res.partner.title'
-       _columns = {
-               'name': fields.char('Title', required=True, size=46, translate=True),
-               'shortcut': fields.char('Shortcut', required=True, size=16),
-               'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
-       }
-       _order = 'name'
+    _name = 'res.partner.title'
+    _columns = {
+        'name': fields.char('Title', required=True, size=46, translate=True),
+        'shortcut': fields.char('Shortcut', required=True, size=16),
+        'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
+    }
+    _order = 'name'
 res_partner_title()
 
 def _contact_title_get(self, cr, uid, context={}):
-       obj = self.pool.get('res.partner.title')
-       ids = obj.search(cr, uid, [('domain', '=', 'contact')])
-       res = obj.read(cr, uid, ids, ['shortcut','name'], context)
-       return [(r['shortcut'], r['name']) for r in res]
+    obj = self.pool.get('res.partner.title')
+    ids = obj.search(cr, uid, [('domain', '=', 'contact')])
+    res = obj.read(cr, uid, ids, ['shortcut','name'], context)
+    return [(r['shortcut'], r['name']) for r in res] + [('','')]
 
 def _partner_title_get(self, cr, uid, context={}):
-       obj = self.pool.get('res.partner.title')
-       ids = obj.search(cr, uid, [('domain', '=', 'partner')])
-       res = obj.read(cr, uid, ids, ['shortcut','name'], context)
-       return [(r['shortcut'], r['name']) for r in res]
+    obj = self.pool.get('res.partner.title')
+    ids = obj.search(cr, uid, [('domain', '=', 'partner')])
+    res = obj.read(cr, uid, ids, ['shortcut','name'], context)
+    return [(r['shortcut'], r['name']) for r in res]
 
 def _lang_get(self, cr, uid, context={}):
-       obj = self.pool.get('res.lang')
-       ids = obj.search(cr, uid, [])
-       res = obj.read(cr, uid, ids, ['code', 'name'], context)
-       res = [(r['code'], r['name']) for r in res]
-       return res + [(False, '')]
+    obj = self.pool.get('res.lang')
+    ids = obj.search(cr, uid, [], context=context)
+    res = obj.read(cr, uid, ids, ['code', 'name'], context)
+    return [(r['code'], r['name']) for r in res] + [('','')]
+
+
+
 
 class res_partner(osv.osv):
-       _description='Partner'
-       _name = "res.partner"
-       _order = "name"
-       _columns = {
-               'name': fields.char('Name', size=128, required=True, select=True),
-               'date': fields.date('Date'),
-               'title': fields.selection(_partner_title_get, 'Title', size=32),
-               'parent_id': fields.many2one('res.partner','Main Company', select=True),
-               'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
-               'ref': fields.char('Code', size=64),
-               'lang': fields.selection(_lang_get, 'Language', size=5),
-               'user_id': fields.many2one('res.users', 'Salesman'),
-               'responsible': fields.many2one('res.users', 'Users'),
-               'vat': fields.char('VAT',size=32 ,help="Value Added Tax number"),
-               'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
-               'website': fields.char('Website',size=64),
-               'comment': fields.text('Notes'),
-               'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
-               'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
-               'events': fields.one2many('res.partner.event', 'partner_id', 'events'),
-               'credit_limit': fields.float(string='Credit Limit'),
-               'ean13': fields.char('EAN13', size=13),
-               'active': fields.boolean('Active'),
-       }
-       _defaults = {
-               'active': lambda *a: 1,
-       }
-       _sql_constraints = [
-               ('name_uniq', 'unique (name)', 'The name of the partner must be unique !')
-       ]
-
-       def copy(self, cr, uid, id, default=None, context={}):
-               name = self.read(cr, uid, [id], ['name'])[0]['name']
-               default.update({'name': name+' (copy)'})
-               return super(res_partner, self).copy(cr, uid, id, default, context)
-       
-       def _check_ean_key(self, cr, uid, ids):
-               for partner_o in pooler.get_pool(cr.dbname).get('res.partner').read(cr, uid, ids, ['ean13',]):
-                       thisean=partner_o['ean13']
-                       if thisean and thisean!='':
-                               if len(thisean)!=13:
-                                       return False
-                               sum=0
-                               for i in range(12):
-                                       if not (i % 2):
-                                               sum+=int(thisean[i])
-                                       else:
-                                               sum+=3*int(thisean[i])
-                               if math.ceil(sum/10.0)*10-sum!=int(thisean[12]):
-                                       return False
-               return True
-
-#      _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
-
-       def name_get(self, cr, uid, ids, context={}):
-               if not len(ids):
-                       return []
-               if context.get('show_ref', False):
-                       rec_name = 'ref'
-               else:
-                       rec_name = 'name'
-                       
-               res = [(r['id'], r[rec_name]) for r in self.read(cr, uid, ids, [rec_name], context)]
-               return res
-               
-       def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
-               if not args:
-                       args=[]
-               if not context:
-                       context={}
-               if name:
-                       ids = self.search(cr, uid, [('ref', '=', name)] + args, limit=limit, context=context)
-                       if not ids:
-                               ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
-               else:
-                       ids = self.search(cr, uid, args, limit=limit, context=context)
-               return self.name_get(cr, uid, ids, context)
-
-       def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):
-               partners = self.browse(cr, uid, ids)
-               for partner in partners:
-                       if len(partner.address):
-                               if partner.address[0].email:
-                                       tools.email_send(email_from, [partner.address[0].email], subject, body, on_error)
-               return True
-
-       def email_send(self, cr, uid, ids, email_from, subject, body, on_error=''):
-               while len(ids):
-                       self.pool.get('ir.cron').create(cr, uid, {
-                               'name': 'Send Partner Emails',
-                               'user_id': uid,
-#                              'nextcall': False,
-                               'model': 'res.partner',
-                               'function': '_email_send',
-                               'args': repr([ids[:16], email_from, subject, body, on_error])
-                       })
-                       ids = ids[16:]
-               return True
-               
-       def address_get(self, cr, uid, ids, adr_pref=['default']):
-               cr.execute('select type,id from res_partner_address where partner_id in ('+','.join(map(str,ids))+')')
-               res = cr.fetchall()
-               adr = dict(res)
-               # get the id of the (first) default address if there is one, 
-               # otherwise get the id of the first address in the list
-               if res:
-                       default_address = adr.get('default', res[0][1])
-               else:
-                       default_address = False
-               result = {}
-               for a in adr_pref:
-                       result[a] = adr.get(a, default_address)
-               return result
-       
-       def gen_next_ref(self, cr, uid, ids):
-               if len(ids) != 1:
-                       return True
-                       
-               # compute the next number ref
-               cr.execute("select ref from res_partner where ref is not null order by char_length(ref) desc, ref desc limit 1")
-               res = cr.dictfetchall()
-               ref = res and res[0]['ref'] or '0'
-               try:
-                       nextref = int(ref)+1
-               except e:
-                       raise osv.except_osv('Warning', "Couldn't generate the next id because some partners have an alphabetic id !")
-
-               # update the current partner
-               cr.execute("update res_partner set ref=%d where id=%d", (nextref, ids[0]))
-               return True
+    _description='Partner'
+    _name = "res.partner"
+    _order = "name"
+    _columns = {
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'date': fields.date('Date', select=1),
+        'title': fields.selection(_partner_title_get, 'Title', size=32),
+        'parent_id': fields.many2one('res.partner','Main Company', select=2),
+        'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
+        'ref': fields.char('Code', size=64),
+        'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
+        'user_id': fields.many2one('res.users', 'Dedicated Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
+        'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
+        'website': fields.char('Website',size=64),
+        'comment': fields.text('Notes'),
+        'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'),
+        'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'),
+        'events': fields.one2many('res.partner.event', 'partner_id', 'Events'),
+        'credit_limit': fields.float(string='Credit Limit'),
+        'ean13': fields.char('EAN13', size=13),
+        'active': fields.boolean('Active'),
+        'customer': fields.boolean('Customer', help="Check this box if the partner is a customer."),
+        'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
+        'city':fields.related('address','city',type='char', string='City'),
+        'country':fields.related('address','country_id',type='many2one', relation='res.country', string='Country'),
+    }
+
+    def _default_category(self, cr, uid, context={}):
+        if 'category_id' in context and context['category_id']:
+            return [context['category_id']]
+        return []
+
+    _defaults = {
+        'active': lambda *a: 1,
+        'customer': lambda *a: 1,
+        'category_id': _default_category,
+    }
+    def copy(self, cr, uid, id, default=None, context={}):
+        name = self.read(cr, uid, [id], ['name'])[0]['name']
+        default.update({'name': name+' (copy)', 'events':[]})
+        return super(res_partner, self).copy(cr, uid, id, default, context)
+
+    def _check_ean_key(self, cr, uid, ids):
+        for partner_o in pooler.get_pool(cr.dbname).get('res.partner').read(cr, uid, ids, ['ean13',]):
+            thisean=partner_o['ean13']
+            if thisean and thisean!='':
+                if len(thisean)!=13:
+                    return False
+                sum=0
+                for i in range(12):
+                    if not (i % 2):
+                        sum+=int(thisean[i])
+                    else:
+                        sum+=3*int(thisean[i])
+                if math.ceil(sum/10.0)*10-sum!=int(thisean[12]):
+                    return False
+        return True
+
+#   _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
+
+    def name_get(self, cr, uid, ids, context={}):
+        if not len(ids):
+            return []
+        if context.get('show_ref', False):
+            rec_name = 'ref'
+        else:
+            rec_name = 'name'
+
+        res = [(r['id'], r[rec_name]) for r in self.read(cr, uid, ids, [rec_name], context)]
+        return res
+
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        if name:
+            ids = self.search(cr, uid, [('ref', '=', name)] + args, limit=limit, context=context)
+            if not ids:
+                ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, uid, args, limit=limit, context=context)
+        return self.name_get(cr, uid, ids, context)
+
+    def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):
+        partners = self.browse(cr, uid, ids)
+        for partner in partners:
+            if len(partner.address):
+                if partner.address[0].email:
+                    tools.email_send(email_from, [partner.address[0].email], subject, body, on_error)
+        return True
+
+    def email_send(self, cr, uid, ids, email_from, subject, body, on_error=''):
+        while len(ids):
+            self.pool.get('ir.cron').create(cr, uid, {
+                'name': 'Send Partner Emails',
+                'user_id': uid,
+#               'nextcall': False,
+                'model': 'res.partner',
+                'function': '_email_send',
+                'args': repr([ids[:16], email_from, subject, body, on_error])
+            })
+            ids = ids[16:]
+        return True
+
+    def address_get(self, cr, uid, ids, adr_pref=['default']):
+        cr.execute('select type,id from res_partner_address where partner_id in ('+','.join(map(str,map(int, ids)))+')')
+        res = cr.fetchall()
+        adr = dict(res)
+        # get the id of the (first) default address if there is one,
+        # otherwise get the id of the first address in the list
+        if res:
+            default_address = adr.get('default', res[0][1])
+        else:
+            default_address = False
+        result = {}
+        for a in adr_pref:
+            result[a] = adr.get(a, default_address)
+        return result
+
+    def gen_next_ref(self, cr, uid, ids):
+        if len(ids) != 1:
+            return True
+
+        # compute the next number ref
+        cr.execute("select ref from res_partner where ref is not null order by char_length(ref) desc, ref desc limit 1")
+        res = cr.dictfetchall()
+        ref = res and res[0]['ref'] or '0'
+        try:
+            nextref = int(ref)+1
+        except:
+            raise osv.except_osv(_('Warning'), _("Couldn't generate the next id because some partners have an alphabetic id !"))
+
+        # update the current partner
+        cr.execute("update res_partner set ref=%s where id=%s", (nextref, ids[0]))
+        return True
+
+    def view_header_get(self, cr, uid, view_id, view_type, context):
+        res = super(res_partner, self).view_header_get(cr, uid, view_id, view_type, context)
+        if res: return res
+        if (not context.get('category_id', False)):
+            return False
+        return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name
+
 res_partner()
 
 class res_partner_address(osv.osv):
-       _description ='Partner Contact'
-       _name = 'res.partner.address'
-       _order = 'id'
-       _columns = {
-               'partner_id': fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', select=True),
-               'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type'),
-               'function': fields.many2one('res.partner.function', 'Function'),
-               'title': fields.selection(_contact_title_get, 'Title', size=32),
-               'name': fields.char('Contact Name', size=64),
-               'street': fields.char('Street', size=128),
-               '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', change_default=True, domain="[('country_id','=',country_id)]"),
-               'country_id': fields.many2one('res.country', 'Country', change_default=True),
-               'email': fields.char('E-Mail', size=64),
-               'phone': fields.char('Phone', size=64),
-               'fax': fields.char('Fax', size=64),
-               'mobile': fields.char('Mobile', size=64),
-               'birthdate': fields.char('Birthdate', size=64),
-               'active': fields.boolean('Active'),
-       }
-       _defaults = {
-               'active': lambda *a: 1,
-       }
-
-       def name_get(self, cr, user, ids, context={}):
-               if not len(ids):
-                       return []
-               res = []
-               for r in self.read(cr, user, ids, ['name','zip','city','partner_id', 'street']):
-                       if context.get('contact_display', 'contact')=='partner':
-                               res.append((r['id'], r['partner_id'][1]))
-                       else:
-                               addr = str(r['name'] or '')
-                               if r['name'] and (r['zip'] or r['city']):
-                                       addr += ', '
-                               addr += str(r['street']) + ' ' + str(r['zip'] or '') + ' ' + str(r['city'] or '')
-                               res.append((r['id'], addr.strip() or '/'))
-               return res
-
-       def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
-               if not args:
-                       args=[]
-               if not context:
-                       context={}
-               if context.get('contact_display', 'contact')=='partner':
-                       ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
-               else:
-                       ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit, context=context)
-                       if not ids: 
-                               ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit, context=context)
-                       if name:
-                               ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
-                               ids += self.search(cr, user, [('partner_id',operator,name)] + args, limit=limit, context=context)
-               return self.name_get(cr, user, ids, context=context)
+    _description ='Partner Addresses'
+    _name = 'res.partner.address'
+    _order = 'id'
+    _columns = {
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."),
+        'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
+        'function': fields.many2one('res.partner.function', 'Function'),
+        'title': fields.selection(_contact_title_get, 'Title', size=32),
+        'name': fields.char('Contact Name', size=64),
+        'street': fields.char('Street', size=128),
+        '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", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'country_id': fields.many2one('res.country', 'Country'),
+        'email': fields.char('E-Mail', size=240),
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'mobile': fields.char('Mobile', size=64),
+        'birthdate': fields.char('Birthdate', size=64),
+        'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+    }
+
+    def name_get(self, cr, user, ids, context={}):
+        if not len(ids):
+            return []
+        res = []
+        for r in self.read(cr, user, ids, ['name','zip','city','partner_id', 'street']):
+            if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
+                res.append((r['id'], r['partner_id'][1]))
+            else:
+                addr = r['name'] or ''
+                if r['name'] and (r['zip'] or r['city']):
+                    addr += ', '
+                addr += (r['street'] or '') + ' ' + (r['zip'] or '') + ' ' + (r['city'] or '')
+                res.append((r['id'], addr.strip() or '/'))
+        return res
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        if context.get('contact_display', 'contact')=='partner':
+            ids = self.search(cr, user, [('partner_id',operator,name)], limit=limit, context=context)
+        else:
+            if not name:
+                ids = self.search(cr, user, args, limit=limit, context=context)
+            else:
+                ids = self.search(cr, user, [('zip','=',name)] + args, limit=limit, context=context)
+            if not ids:
+                ids = self.search(cr, user, [('city',operator,name)] + args, limit=limit, context=context)
+            if name:
+                ids += self.search(cr, user, [('name',operator,name)] + args, limit=limit, context=context)
+                ids += self.search(cr, user, [('partner_id',operator,name)] + args, limit=limit, context=context)
+        return self.name_get(cr, user, ids, context=context)
+
+    def get_city(self, cr, uid, id):
+        return self.browse(cr, uid, id).city
+
 res_partner_address()
 
 class res_partner_bank_type(osv.osv):
-       _description='Bank Account Type'
-       _name = 'res.partner.bank.type'
-       _columns = {
-               'name': fields.char('Name', size=64, required=True),
-               'code': fields.char('Code', size=64, required=True),
-               'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
-       }
+    _description='Bank Account Type'
+    _name = 'res.partner.bank.type'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'code': fields.char('Code', size=64, required=True),
+        'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
+    }
 res_partner_bank_type()
 
 class res_partner_bank_type_fields(osv.osv):
-       _description='Bank type fields'
-       _name = 'res.partner.bank.type.field'
-       _columns = {
-               'name': fields.char('Field name', size=64, required=True),
-               'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank type', required=True, ondelete='cascade'),
-               'required': fields.boolean('Required'),
-               'readonly': fields.boolean('Readonly'),
-               'size': fields.integer('Max. Size'),
-       }
+    _description='Bank type fields'
+    _name = 'res.partner.bank.type.field'
+    _columns = {
+        'name': fields.char('Field Name', size=64, required=True, translate=True),
+        'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank Type', required=True, ondelete='cascade'),
+        'required': fields.boolean('Required'),
+        'readonly': fields.boolean('Readonly'),
+        'size': fields.integer('Max. Size'),
+    }
 res_partner_bank_type_fields()
 
 
 class res_partner_bank(osv.osv):
-       _description='Bank Details'
-       _name = "res.partner.bank"
-       _rec_name = "state"
-       def _bank_type_get(self, cr, uid, *args):
-               result = []
-               type_ids = self.pool.get('res.partner.bank.type').search(cr, uid, [])
-               res = self.pool.get('res.partner.bank.type').read(cr, uid, type_ids, ['code','name'])
-               for r in res:
-                       result.append((r['code'], r['name']))
-               return result
-
-       _columns = {
-               'name': fields.char('Description', size=128),
-               'acc_number': fields.char('Account number', size=64, required=False),
-               'bank_id': fields.many2one('res.partner', 'Bank'),
-               'bank_address_id': fields.many2one('res.partner.address', 'Bank address'),
-
-               'owner_name': fields.char('Account owner', size=64),
-               'street': fields.char('Street', size=128),
-               'zip': fields.char('Zip', change_default=True, size=24),
-               'city': fields.char('City', size=128),
-               'country_id': fields.many2one('res.country', 'Country', change_default=True),
-               'state_id': fields.many2one("res.country.state", 'State', change_default=True, domain="[('country_id','=',country_id)]"),
-               'partner_id': fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', select=True),
-               'state': fields.selection(_bank_type_get, 'Bank type', required=True, change_default=True),
-       }
-       def fields_get(self, cr, uid, fields=None, context=None):
-               res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
-               type_ids = self.pool.get('res.partner.bank.type').search(cr, uid, [])
-               types = self.pool.get('res.partner.bank.type').browse(cr, uid, type_ids)
-               for t in types:
-                       for f in t.field_ids:
-                               if f.name in res:
-                                       res[f.name].setdefault('states',{})
-                                       res[f.name]['states'][t.code] = [('readonly',f.readonly),('required',f.required)]
-               return res
-
-       def name_get(self, cr, uid, ids, context={}):
-               if not len(ids):
-                       return []
-               return [(r['id'], (r[self._rec_name] or '') + (r['owner_name'] and \
-                               (' ' + r['owner_name']) or '')) for r in self.read(cr, uid, ids,
-                                       [self._rec_name, 'owner_name'], context,
-                                       load='_classic_write')]
+    '''Bank Accounts'''
+    _name = "res.partner.bank"
+    _rec_name = "acc_number"
+    _description = __doc__
+    _order = 'sequence'
+
+    def _bank_type_get(self, cr, uid, context=None):
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+
+        result = []
+        type_ids = bank_type_obj.search(cr, uid, [])
+        bank_types = bank_type_obj.browse(cr, uid, type_ids, context=context)
+        for bank_type in bank_types:
+            result.append((bank_type.code, bank_type.name))
+        return result
+
+    def _default_value(self, cursor, user, field, context=None):
+        if field in ('country_id', 'state_id'):
+            value = False
+        else:
+            value = ''
+        if not context.get('address', False):
+            return value
+        for ham, spam, address in context['address']:
+            if address.get('type', False) == 'default':
+                return address.get(field, value)
+            elif not address.get('type', False):
+                value = address.get(field, value)
+        return value
+
+    _columns = {
+        'name': fields.char('Description', size=128),
+        'acc_number': fields.char('Account Number', size=64, required=False),
+        'bank': fields.many2one('res.bank', 'Bank'),
+        'owner_name': fields.char('Account Owner', size=64),
+        'street': fields.char('Street', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'country_id': fields.many2one('res.country', 'Country',
+            change_default=True),
+        'state_id': fields.many2one("res.country.state", 'State',
+            change_default=True, domain="[('country_id','=',country_id)]"),
+        'partner_id': fields.many2one('res.partner', 'Partner', required=True,
+            ondelete='cascade', select=True),
+        'state': fields.selection(_bank_type_get, 'Bank Type', required=True,
+            change_default=True),
+        'sequence': fields.integer('Sequence'),
+    }
+    _defaults = {
+        'owner_name': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'name', context=context),
+        'street': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'street', context=context),
+        'city': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'city', context=context),
+        'zip': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'zip', context=context),
+        'country_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'country_id', context=context),
+        'state_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'state_id', context=context),
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+        type_ids = bank_type_obj.search(cr, uid, [])
+        types = bank_type_obj.browse(cr, uid, type_ids)
+        for type in types:
+            for field in type.field_ids:
+                if field.name in res:
+                    res[field.name].setdefault('states', {})
+                    res[field.name]['states'][type.code] = [
+                            ('readonly', field.readonly),
+                            ('required', field.required)]
+        return res
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        res = []
+        for id in self.browse(cr, uid, ids):
+            res.append((id.id,id.acc_number))
+        return res
 
 res_partner_bank()
 
 
-# vim:noexpandtab:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+