Merge lp:~vauxoo/openobject-server/customization_address_field-dev-julio-v7 into lp:openobject-server/7.0

[Julio Serna-http://www.vauxoo.com]

add function to customize field address by code that return function _display_address()

[lp:~vauxoo/openobject-server/customization_address_field-dev-julio-v7]

4829. By Julio Serna-http://www.vauxoo.com on 2013-02-19

[IMP] replace variables of addresses by functions

Unmerged revisions

4829. By Julio Serna-http://www.vauxoo.com on 2013-02-19

[IMP] replace variables of addresses by functions

4828. By Julio Serna-http://www.vauxoo.com on 2013-02-08

[IMP] added function _get_address_field to get fields of address

=== 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-19 23:10:32 +0000
@@ -159,9 +159,6 @@
     res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
     return [(r['code'], r['name']) for r in res]
 
-POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
-ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
-
 class res_partner(osv.osv, format_address):
     _description = 'Partner'
     _name = "res.partner"
@@ -331,7 +328,7 @@
 
         if use_parent_address and parent_id:
             parent = self.browse(cr, uid, parent_id, context=context)
-            return {'value': dict((key, value_or_id(parent[key])) for key in ADDRESS_FIELDS)}
+            return {'value': dict((key, value_or_id(parent[key])) for key in self._get_address_field())}
         return {}
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
@@ -390,7 +387,7 @@
         return super(res_partner,self).create(cr, uid, vals, context=context)
 
     def update_address(self, cr, uid, ids, vals, context=None):
-        addr_vals = dict((key, vals[key]) for key in POSTAL_ADDRESS_FIELDS if vals.get(key))
+        addr_vals = dict((key, vals[key]) for key in self._get_postal_address_field() if vals.get(key))
         if addr_vals:
             return super(res_partner, self).write(cr, uid, ids, addr_vals, context)
 
@@ -539,7 +536,19 @@
                             model_data.search(cr, uid, [('module','=','base'),
                                                 ('name','=','main_partner')])[0],
                 ).res_id
-
+                
+    def _get_display_address_field(self):
+        address_display_field = ['title', 'street', 'street2', 'zip', 'city']
+        return address_display_field
+    
+    def _get_postal_address_field(self):
+        postal_address_fields = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
+        return postal_address_fields
+    
+    def _get_address_field(self):
+        address_fields = self._get_postal_address_field() + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
+        return address_fields 
+        
     def _display_address(self, cr, uid, address, without_company=False, context=None):
 
         '''
@@ -563,8 +572,7 @@
             'country_name': address.country_id and address.country_id.name or '',
             'company_name': address.parent_id and address.parent_id.name or '',
         }
-        address_field = ['title', 'street', 'street2', 'zip', 'city']
-        for field in address_field :
+        for field in self._get_display_address_field():
             args[field] = getattr(address, field) or ''
         if without_company:
             args['company_name'] = ''