From ecc8cce7975db1b3d3e6536a904d42792ec6f66d Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Tue, 24 Aug 2010 01:19:16 +0530 Subject: [PATCH 1/7] [FIX] l10n_be : Wizards corrected in order to allow accented characters bzr revid: jvo@tinyerp.com-20100823194916-dbqboguw2avbo6aq --- .../wizard/l10_be_partner_vat_listing.py | 28 ++++++++----------- .../wizard/l10n_be_account_vat_declaration.py | 19 ++++++------- .../l10n_be_account_vat_declaration_view.xml | 2 +- .../wizard/l10n_be_partner_vat_listing.xml | 2 +- addons/l10n_be/wizard/l10n_be_vat_intra.py | 16 +++++------ 5 files changed, 30 insertions(+), 37 deletions(-) diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py index bc92086975a..133d12511a3 100644 --- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py +++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py @@ -1,6 +1,3 @@ -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - - # -*- coding: utf-8 -*- ############################################################################## # @@ -25,7 +22,6 @@ import time import base64 from tools.translate import _ -import tools from osv import fields, osv class vat_listing_clients(osv.osv_memory): @@ -143,7 +139,7 @@ class partner_vat_list(osv.osv_memory): } def create_xml(self, cursor, user, ids, context={}): - datas=[] + datas = [] obj_sequence = self.pool.get('ir.sequence') obj_users = self.pool.get('res.users') obj_partner = self.pool.get('res.partner') @@ -178,16 +174,16 @@ class partner_vat_list(osv.osv_memory): country = ads.country_id.code sender_date = time.strftime('%Y-%m-%d') - + comp_name = obj_cmpny.name data_file = '\n\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]) +'' + data_file += '\n\n\t\n\t\t'+str(company_vat)+'\n\t\t'+ comp_name +'\n\t\t'+ street +'\n\t\t'+ zip_city +'' + data_file += '\n\t\t'+ country +'\n\t\n' + data_comp = '\n\n\t'+str(company_vat)+'\n\t'+ comp_name +'\n\t'+ street +'\n\t'+ zip_city +'\n\t'+ country +'\n' + data_period = '\n'+ obj_year.date_stop[:4] +'' error_message = [] data = self.read(cursor, user, ids)[0] for partner in data['partner_ids']: @@ -207,13 +203,13 @@ class partner_vat_list(osv.osv_memory): continue if line['turnover'] < context['limit_amount']: continue - seq +=1 - sum_tax +=line['amount'] - sum_turnover +=line['turnover'] - 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' + 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_decl ='\n' - data_file += tools.ustr(data_decl) + tools.ustr(data_comp) + tools.ustr(data_period) + tools.ustr(data_clientinfo) + '\n' + data_file += data_decl + data_comp + str(data_period) + data_clientinfo + '\n' msg = 'Save the File with '".xml"' extension.' file_save = base64.encodestring(data_file.encode('utf8')) self.write(cursor, user, ids, {'file_save':file_save, 'msg':msg, 'name':'vat_list.xml'}, context=context) diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py index 155e40b256b..ae23bf926e9 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py @@ -30,7 +30,7 @@ class l10n_be_vat_declaration(osv.osv_memory): def _get_xml_data(self, cr, uid, context=None): if context.get('file_save', False): - return base64.encodestring(context['file_save']) + return base64.encodestring(context['file_save'].encode('utf8')) return '' _columns = { @@ -47,21 +47,19 @@ class l10n_be_vat_declaration(osv.osv_memory): 'msg': 'Save the File with '".xml"' extension.', 'file_save': _get_xml_data, 'name': 'vat_declaration.xml', - } + } def create_xml(self, cr, uid, ids, context=None): obj_fyear = self.pool.get('account.fiscalyear') obj_tax_code = self.pool.get('account.tax.code') obj_acc_period = self.pool.get('account.period') obj_user = self.pool.get('res.users') - obj_comp = self.pool.get('res.company') - obj_data = self.pool.get('ir.model.data') mod_obj = self.pool.get('ir.model.data') if context is None: context = {} - list_of_tags=['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91'] + list_of_tags = ['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91'] data_tax = self.browse(cr, uid, ids[0]) if data_tax.tax_code_id: obj_company = data_tax.tax_code_id.company_id @@ -70,8 +68,7 @@ class l10n_be_vat_declaration(osv.osv_memory): user_cmpny = obj_company.name vat_no = obj_company.partner_id.vat if not vat_no: - raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!')) - + raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!')) tax_code_ids = obj_tax_code.search(cr, uid, [], context=context) ctx = context.copy() @@ -80,15 +77,15 @@ class l10n_be_vat_declaration(osv.osv_memory): 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) + city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address) year_id = obj_fyear.find(cr, uid) account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context) period_code = account_period.code send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4]) - data_of_file='\n' - data_of_file +='\n\t\n\t\t'+str(vat_no)+'\n\t\t'+str(obj_company.name)+'\n\t\t
'+address+'
' + data_of_file = '\n' + data_of_file +='\n\t\n\t\t'+str(vat_no)+'\n\t\t'+ obj_company.name +'\n\t\t
'+address+'
' data_of_file +='\n\t\t'+post_code+'\n\t\t'+city+'\n\t\t'+country_code+'\n\t\t'+send_ref+'\n\t' data_of_file +='\n\t\n\t\t1\n\t\t'+((vat_no and str(vat_no[2:])) or '')+'\n\t\t\n\t\t\t' @@ -115,7 +112,7 @@ class l10n_be_vat_declaration(osv.osv_memory): if item['code'] in list_of_tags: data_of_file +='\n\t\t\t\t' + str(abs(int(item['sum_period']*100))) + '' - data_of_file +='\n\t\t\t\n\t\t\n\t\n' + data_of_file += '\n\t\t\t\n\t\t\n\t\n' model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_vat_save')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] context['file_save'] = data_of_file diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml index f3af9f7368e..f7f9ff9ed32 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml @@ -38,7 +38,7 @@ form
- +