odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] fixed the TypeError and improved the code 

bzr revid: bde@tinyerp.com-20120118101848-w8gu81v0zsz9gijq
This commit is contained in:
Bharat Devnani (OpenERP) 2012-01-18 15:48:48 +05:30
parent 2c845a30f5
commit 3b7fef4217
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/l10n_be/company.py
View File

@ -25,7 +25,7 @@ class res_company(osv.osv):
_description = 'Company'
def _get_default_ad(self, addresses):
city = post_code = address = country_code = ""
name = email = phone = city = post_code = address = country_code = ""
for ads in addresses:
if ads.type == 'default':
city = ads.city or ""
@ -36,7 +36,10 @@ class res_company(osv.osv):
address += " " + ads.street2
if ads.country_id:
country_code = ads.country_id and ads.country_id.code or ""
return city, post_code, address, country_code
name = ads.name or ""
email = ads.email or ""
phone = ads.phone or ""
return name, email, phone, city, post_code, address, country_code
res_company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

7
addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
View File

@ -81,12 +81,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
ctx['period_id'] = data['period_id'][0] #added context here
tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
address = post_code = city = country_code = ''
city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
name = email = phone = address = post_code = city = country_code = ''
name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
name = obj_company.partner_id.address[0].name
email = obj_company.partner_id.address[0].email
phone = obj_company.partner_id.address[0].phone
account_period = obj_acc_period.browse(cr, uid, data['period_id'][0], context=context)
send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])