diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index 5114550f9ac..83db7614693 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -146,9 +146,11 @@ class partner_vat_intra(osv.osv_memory): AND l.period_id IN %s GROUP BY p.name, l.partner_id, p.vat, t.code''', (codes, tuple([p.id for p in wiz_data.period_ids]))) + p_count = 0 for row in cr.dictfetchall(): if not row['vat']: p_list += str(row['partner_name']) + ', ' + p_count += 1 continue seq += 1 @@ -163,11 +165,13 @@ class partner_vat_intra(osv.osv_memory): 'partner_name': row['partner_name'], 'seq': seq, 'vatnum': row['vat'][2:].replace(' ','').upper(), + 'vat': row['vat'], 'country': row['vat'][:2], 'amount': amt, + 'intra_code': row['intra_code'], 'code': intra_code}) - xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum}) + xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count}) return xmldict def create_xml(self, cursor, user, ids, context=None): diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml index 97583a6afde..fbca8ec3d9c 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml @@ -78,7 +78,7 @@ VAT Number - Country + Partners without VAT @@ -89,7 +89,7 @@ [[ data['form']['company_vat'] ]] - [[ data['form']['country'] ]] + [[ data['form']['partner_wo_vat'] or '-']] @@ -120,13 +120,13 @@ [[ l['partner_name'] ]] - [[ l['vatnum'] ]] + [[ l['vat'] ]] - [[ l['code'] ]] + [[ l['intra_code'] ]] - [[ l['amount'] ]] + [[ l['amount']/100 ]] [[ company.currency_id.symbol ]] @@ -147,7 +147,7 @@ Total: - [[ data['form']['amountsum'] ]] + [[ data['form']['amountsum']/100 ]] [[ company.currency_id.symbol ]]