[MERGE] l10n_be fixes

bzr revid: qdp-launchpad@openerp.com-20120813120228-00j6e539rq0nr7ab
This commit is contained in:
Quentin (OpenERP)
2012-08-13 14:02:28 +02:00
2 changed files with 4 additions and 8 deletions
@@ -181,12 +181,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
cases_list.append(item)
cases_list.sort()
for item in cases_list:
grid_amount_data = {
'code': str(int(item['code'])),
'amount': str(abs(item['sum_period'])),
}
data_of_file += '\n\t\t\t<ns2:Amount GridNumber="%(code)s">%(amount)s</ns2:Amount''>' % (grid_amount_data)
data_of_file += '\n\t\t\t<ns2:Amount GridNumber="%s">%.2f</ns2:Amount''>' % (str(int(item['code'])), abs(item['sum_period']))
data_of_file += '\n\t\t</ns2:Data>'
data_of_file += '\n\t\t<ns2:ClientListingNihil>%(client_nihil)s</ns2:ClientListingNihil>' % (file_data)
data_of_file += '\n\t\t<ns2:Ask Restitution="%(ask_restitution)s" Payment="%(ask_payment)s"/>' % (file_data)
+2 -2
View File
@@ -203,11 +203,11 @@ class partner_vat_intra(osv.osv_memory):
'vatnum': row['vat'][2:].replace(' ','').upper(),
'vat': row['vat'],
'country': row['vat'][:2],
'amount': amt,
'amount': '%.2f' % amt,
'intra_code': row['intra_code'],
'code': intra_code})
xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count})
xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': '%.2f' % amount_sum, 'partner_wo_vat': p_count})
return xmldict
def create_xml(self, cursor, user, ids, context=None):