odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: l10n_be: Improvement in partner vat intra report 

bzr revid: rpa@tinyerp.com-20111206113834-977cd1107qtodeys
This commit is contained in:
Rucha (Open ERP) 2011-12-06 17:08:34 +05:30
parent 163e57b8af
commit cdaa80f341
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/l10n_be/wizard/l10n_be_vat_intra.py
View File

@ -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):

12
addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
View File

@ -78,7 +78,7 @@
<para style="terp_tblheader_General_Centre">VAT Number</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Country</para>
<para style="terp_tblheader_General_Centre">Partners without VAT</para>
</td>
</tr>
<tr>
@ -89,7 +89,7 @@
<para style="terp_default_Centre_9">[[ data['form']['company_vat'] ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ data['form']['country'] ]]</para>
<para style="terp_default_Centre_9">[[ data['form']['partner_wo_vat'] or '-']]</para>
</td>
</tr>
</blockTable>
@ -120,13 +120,13 @@
<para style="terp_default_9">[[ l['partner_name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ l['vatnum'] ]]</para>
<para style="terp_default_9">[[ l['vat'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ l['code'] ]]</para>
<para style="terp_default_9">[[ l['intra_code'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ l['amount'] ]]</para>
<para style="terp_default_Right_9">[[ l['amount']/100 ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@ -147,7 +147,7 @@
<para style="terp_tblheader_General_Right">Total:</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ data['form']['amountsum'] ]]</para>
<para style="terp_tblheader_General_Right">[[ data['form']['amountsum']/100 ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>