diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py index 71506be615e..68b84a9834c 100644 --- a/addons/l10n_be/wizard/partner_vat_listing.py +++ b/addons/l10n_be/wizard/partner_vat_listing.py @@ -25,6 +25,7 @@ import datetime import pooler import base64 from tools.translate import _ +import tools form = """
@@ -32,7 +33,7 @@ form = """ - + @@ -73,7 +74,7 @@ class wizard_vat(wizard.interface): cref = company_vat + seq_controlref dnum = cref + seq_declarantnum - p_id_list=pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)]) + p_id_list = pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)]) if not p_id_list: raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.')) @@ -81,7 +82,7 @@ class wizard_vat(wizard.interface): period_ids = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fyear'])]) period = "("+','.join(map(lambda x: str(x), period_ids)) +")" - street=zip_city=country='' + street = zip_city = country = '' addr = pooler.get_pool(cr.dbname).get('res.partner').address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice']) if addr.get('invoice',False): ads=pooler.get_pool(cr.dbname).get('res.partner.address').browse(cr,uid,[addr['invoice']])[0] @@ -90,24 +91,24 @@ class wizard_vat(wizard.interface): if not zip_city: zip_city = '' if ads.street: - street=ads.street + street = ads.street if ads.street2: - street +=ads.street2 + street += ads.street2 if ads.country_id: - country=ads.country_id.code + country = ads.country_id.code - - sender_date=time.strftime('%Y-%m-%d') - data_file='\n\n\t\t'+str(obj_cmpny.name)+'\n\t\t'+ str(street) +'\n\t\t'+ str(zip_city) +'' - data_file +='\n\t\t'+ str(country) +'\n\t\n' - data_comp ='\n\n\t'+str(company_vat)+'\n\t'+str(obj_cmpny.name)+'\n\t'+ str(street) +'\n\t'+ str(zip_city) +'\n\t'+ str(country) +'\n' - data_period ='\n'+ str(obj_year.date_stop[:4]) +'' - error_message=[] + data_file += '\n\n\t\n\t\t'+str(company_vat)+'\n\t\t'+tools.ustr(obj_cmpny.name)+'\n\t\t'+ tools.ustr(street) +'\n\t\t'+ tools.ustr(zip_city) +'' + data_file += '\n\t\t'+ tools.ustr(country) +'\n\t\n' + data_comp = '\n\n\t'+str(company_vat)+'\n\t'+tools.ustr(obj_cmpny.name)+'\n\t'+ tools.ustr(street) +'\n\t'+ tools.ustr(zip_city) +'\n\t'+ tools.ustr(country) +'\n' + data_period = '\n'+ tools.ustr(obj_year.date_stop[:4]) +'' + error_message = [] for p_id in p_id_list: record = {} # this holds record per partner @@ -125,7 +126,7 @@ class wizard_vat(wizard.interface): continue query = 'select b.code,sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code in ('"'produit'"','"'tax'"') and l.partner_id='+str(p_id)+' and l.period_id in '+period+' group by b.code' cr.execute(query) - line_info=cr.fetchall() + line_info = cr.fetchall() if not line_info: continue @@ -172,13 +173,13 @@ class wizard_vat(wizard.interface): seq +=1 sum_tax +=line['amount'] sum_turnover +=line['turnover'] - data_clientinfo +='\n\n\t\n\t\t'+line['vat'] +'\n\t\t'+line['country'] +'\n\t\n\t'+str(int(line['amount'] * 100)) +'\n\t'+str(int(line['turnover'] * 100)) +'\n' + data_clientinfo +='\n\n\t\n\t\t'+line['vat'] +'\n\t\t'+tools.ustr(line['country']) +'\n\t\n\t'+str(int(line['amount'] * 100)) +'\n\t'+str(int(line['turnover'] * 100)) +'\n' data_decl ='\n' - data_file += str(data_decl) + str(data_comp) + str(data_period) + str(data_clientinfo) + '\n' + data_file += tools.ustr(data_decl) + tools.ustr(data_comp) + tools.ustr(data_period) + tools.ustr(data_clientinfo) + '\n' - data['form']['msg']='Save the File with '".xml"' extension.' - data['form']['file_save']=base64.encodestring(data_file) + data['form']['msg'] = 'Save the File with '".xml"' extension.' + data['form']['file_save'] = base64.encodestring(data_file.encode('utf8')) return data['form'] states = {