From d415fff15689afb1204ceebc430426502f706e6e Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 1 Jul 2011 19:08:58 +0530
Subject: [PATCH] [IMP, FIX]: res.company: - in the _{get,set}_address_data:
 name should be a plural, add a docstring.

bzr revid: rpa@tinyerp.com-20110701133858-fn8s95utbyuz1i1g
---
 openerp/addons/base/res/res_company.py | 29 +++++++++++++-------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index a49c419397d..e2c0c06254a 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -79,15 +79,16 @@ class res_company(osv.osv):
     _description = 'Companies'
     _order = 'name'
 
-    def _get_address_data(self, cr, uid, ids, name, arg, context=None):
+    def _get_address_datas(self, cr, uid, ids, name, arg, context=None):
+        "Retrieves address datas of the partner related to the company"
         result = {}
+        part_obj = self.pool.get('res.partner')
+        address_obj = self.pool.get('res.partner.address')
         for company in self.browse(cr, uid, ids, context=context):
             result[company.id] = {}
             for field in name:
                 result[company.id][field] = False
             if company.partner_id:
-                part_obj = self.pool.get('res.partner')
-                address_obj = self.pool.get('res.partner.address')
                 address_data = part_obj.address_get(cr, uid, [company.partner_id.id], adr_pref=['default'])
                 if address_data['default']:
                     address = address_obj.read(cr, uid, address_data['default'], [], context=context)
@@ -95,7 +96,8 @@ class res_company(osv.osv):
                         result[company.id][field] = address[field] or False
         return result
 
-    def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None):
+    def _set_address_datas(self, cr, uid, company_id, name, value, arg, context=None):
+        "Retrieves address datas of the partner related to the company"
         company = self.browse(cr, uid, company_id, context=context)
         if company.partner_id:
             part_obj = self.pool.get('res.partner')
@@ -124,14 +126,14 @@ class res_company(osv.osv):
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),
         'account_no':fields.char('Account No.', size=64),
-        'street' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char',  method=True, string="Street", multi='address'), 
-        'street2' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=128, type='char',  method=True, string="Street2", multi='address'), 
-        'zip' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char',  method=True, string="Zip", multi='address'), 
-        'city' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char',  method=True, string="City", multi='address'),         
-        'state_id' : fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', method=True, string="State", multi='address'), 
-        'country_id' : fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country',  method=True, string="Country", multi='address'), 
-        'email' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char',  method=True, string="Email", multi='address'), 
-        'phone' : fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char',  method=True, string="Phone", multi='address'), 
+        'street' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=128, type='char',  method=True, string="Street", multi='address'), 
+        'street2' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=128, type='char',  method=True, string="Street2", multi='address'), 
+        'zip' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=24, type='char',  method=True, string="Zip", multi='address'), 
+        'city' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=24, type='char',  method=True, string="City", multi='address'),         
+        'state_id' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', method=True, string="State", multi='address'), 
+        'country_id' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, type='many2one', relation='res.country',  method=True, string="Country", multi='address'), 
+        'email' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=64, type='char',  method=True, string="Email", multi='address'), 
+        'phone' : fields.function(_get_address_datas, fnct_inv=_set_address_datas, size=64, type='char',  method=True, string="Phone", multi='address'), 
     }
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -349,8 +351,7 @@ class res_company(osv.osv):
         fp.write(header_xml)
         fp.close()
 
-        if netsvc.Service._services.get('report.company.report'):
-            netsvc.Service._services.pop('report.company.report')
+        netsvc.Service._services.pop('report.company.report', False)
 
         myreport = report_sxw.report_sxw('report.company.report', 'res.company', tempfilename, parser=company_parser)
         return {