diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 516fa7cfb4c..7da8dc73388 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -208,20 +208,54 @@ class partner_vat_list_13(osv.osv_memory):
other = data['other'] or ''
sender_date = time.strftime('%Y-%m-%d')
comp_name = obj_cmpny.name
- data_file = '\n'
- data_file += '\n\t'
- data_file += '\n\t\t'+company_vat+''
- data_file += '\n\t\t'+ comp_name +''
- data_file += '\n\t\t'+ street +''
- data_file += '\n\t\t'+ zip +''
- data_file += '\n\t\t'+ city +''
- data_file += '\n\t\t'+ country +''
- data_file += '\n\t\t'+ email +''
- data_file += '\n\t\t'+ phone +''
- data_file += '\n\t'
- data_file += '\n\t'
- data_comp = '\n\t\t \n\t\t\n\t\t\t'+SenderId+' \n\t\t\t'+ comp_name +' \n\t\t\t'+ street +' \n\t\t\t'+ zip +' \n\t\t\t'+ city +' \n\t\t\t'+ country +' \n\t\t\t'+ email +' \n\t\t\t'+ phone +' \n\t\t'
- data_period = '\n\t\t' + context['year'] +''
+
+ annual_listing_data = {
+ 'identificationType': data['identification_type'].upper(),
+ 'issued_by': issued_by,
+ 'other': other,
+ 'company_vat': company_vat,
+ 'comp_name': comp_name,
+ 'street': street,
+ 'zip': zip,
+ 'city': city,
+ 'country': country,
+ 'email': email,
+ 'phone': phone,
+ 'SenderId': SenderId,
+ 'period': context['year'],
+ 'comments': data['comments']
+ }
+
+ data_file = """
+
+
+ %(company_vat)s
+ %(comp_name)s
+ %(street)s
+ %(zip)s
+ %(city)s
+ %(country)s
+ %(email)s
+ %(phone)s
+
+
+""" %(annual_listing_data)
+
+ data_comp = """
+
+
+ %(SenderId)s
+ %(comp_name)s
+ %(street)s
+ %(zip)s
+ %(city)s
+ %(country)s
+ %(email)s
+ %(phone)s
+
+ %(period)s
+ """ %(annual_listing_data)
+
error_message = []
for partner in data['partner_ids']:
@@ -249,9 +283,27 @@ class partner_vat_list_13(osv.osv_memory):
seq += 1
sum_tax += line['amount']
sum_turnover += line['turnover']
- data_clientinfo += '\n\t\t\n\t\t\t'+line['vat'].replace(' ','').upper()[2:] +'\n\t\t\t'+str(int(round(line['turnover'] * 100))) +'\n\t\t\t'+str(int(round(line['amount'] * 100))) +'\n\t\t'
- data_decl ='\n\t'
- data_file += data_decl + data_comp + str(data_period) + data_clientinfo + '\n\t\t \n\t\t'+data['comments']+'\n\t\n'
+
+ amount_data = {
+ 'seq': str(seq),
+ 'vat_issued': vat_issued,
+ 'only_vat': line['vat'].replace(' ','').upper()[2:],
+ 'turnover': str(int(round(line['turnover'] * 100))),
+ 'vat_amount': str(int(round(line['amount'] * 100))),
+ 'dnum': dnum,
+ 'sum_tax': str(int(round(sum_tax * 100))),
+ 'sum_turnover': str(int(round(sum_turnover * 100))),
+ }
+
+ data_clientinfo += """
+
+ %(only_vat)s
+ %(turnover)s
+ %(vat_amount)s
+""" %(amount_data)
+
+ data_decl ='' %(amount_data)
+ data_file += data_decl + data_comp + data_clientinfo + '\n\t\t \n\t\t%(comments)s\n\t\n' %(annual_listing_data)
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_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 3b6679b9d61..a58d84d0f62 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -1,74 +1,74 @@
-
-
- Partner VAT Listing
- partner.vat_13
- form
-
-
-
-
+
+
+ Partner VAT Listing
+ partner.vat_13
+ form
+
+
+
+
-
- Partner VAT Listing
- ir.actions.act_window
- partner.vat_13
- form
- form
-
- new
-
+
+ Partner VAT Listing
+ ir.actions.act_window
+ partner.vat_13
+ form
+ form
+
+ new
+
-
+
-
- Vat Listing
- partner.vat.list_13
- form
-
-
-
-
-
+
+ Vat Listing
+ partner.vat.list_13
+ form
+
+
+
+
+