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 fcaf151aab4..f11bb396183 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -137,9 +137,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
}
data_of_file = """
-
-
- %(vat_no)s
+
+
+ %(only_vat)s
%(cmpny_name)s
%(address)s
%(post_code)s
@@ -147,12 +147,10 @@ class l10n_be_vat_declaration(osv.osv_memory):
%(country_code)s
%(email)s
%(phone)s
-
-
-
-
-
- %(only_vat)s
+
+
+
+ %(only_vat)s
%(cmpny_name)s
%(address)s
%(post_code)s
@@ -160,26 +158,26 @@ class l10n_be_vat_declaration(osv.osv_memory):
%(country_code)s
%(email)s
%(phone)s
-
-
+
+
""" % (file_data)
if starting_month != ending_month:
#starting month and ending month of selected period are not the same
#it means that the accounting isn't based on periods of 1 month but on quarters
- data_of_file += '\t\t%(quarter)s\n\t\t' % (file_data)
+ data_of_file += '\t\t%(quarter)s\n\t\t' % (file_data)
else:
- data_of_file += '\t\t%(month)s\n\t\t' % (file_data)
- data_of_file += '\t%(year)s' % (file_data)
- data_of_file += '\n\t\t\n'
+ data_of_file += '\t\t%(month)s\n\t\t' % (file_data)
+ data_of_file += '\t%(year)s' % (file_data)
+ data_of_file += '\n\t\t\n'
- data_of_file += '\t\t\t'
+ data_of_file += '\t\t\t'
cases_list = []
for item in tax_info:
if item['code'] == '91' and ending_month != 12:
#the tax code 91 can only be send for the declaration of December
continue
- if item['code']:
+ if item['code'] and item['sum_period']:
if item['code'] == 'VI':
if item['sum_period'] >= 0:
item['code'] = '71'
@@ -191,16 +189,15 @@ class l10n_be_vat_declaration(osv.osv_memory):
for item in cases_list:
grid_amount_data = {
'code': str(int(item['code'])),
- 'amount': str(abs(int(round(item['sum_period']*100)))),
+ 'amount': str(item['sum_period']),
}
- data_of_file += '\n\t\t\t%(amount)s' % (grid_amount_data)
+ data_of_file += '\n\t\t\t%(amount)s' % (grid_amount_data)
- data_of_file += '\n\t\t'
- data_of_file += '\n\t\t%(client_nihil)s' % (file_data)
- data_of_file += '\n\t\t' % (file_data)
- data_of_file += '\n\t\t'''
- data_of_file += '\n\t\t%(comments)s' % (file_data)
- data_of_file += '\n\t \n'
+ data_of_file += '\n\t\t'
+ data_of_file += '\n\t\t%(client_nihil)s' % (file_data)
+ data_of_file += '\n\t\t' % (file_data)
+ data_of_file += '\n\t\t%(comments)s' % (file_data)
+ data_of_file += '\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