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

*bugfixed vat listing wizard and belgian chart of account 

bzr revid: qdp@tinyerp.com-20080910142751-3vetoo2se2ms5nge
This commit is contained in:
qdp 2008-09-10 16:27:51 +02:00
parent 6c7e1038b0
commit 49c366fbd5
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/l10n_be/account_pcmn_belgium.xml
View File

@ -40,7 +40,7 @@
</record>
<record id="user_type_tax" model="account.account.type">
<field name="name">Tax</field>
<field name="code">payable</field>
<field name="code">tax</field>
<field name="close_method">unreconciled</field>
</record>
<record id="user_type_financiers" model="account.account.type">
@ -57,13 +57,9 @@
<field name="name">Produit</field>
<field name="code">produit</field>
<field name="close_method">none</field>
</record>
<record id="user_type_charge" model="account.account.type">
<field name="name">Charge</field>
<field name="code">charge</field>
<field name="close_method">none</field>
</record>
<!-- Chart template of l10n_be -->
<!-- Account template definition -->
<record id="a_root" model="account.account.template">

4
addons/l10n_be/wizard/partner_vat_listing.py
View File

@ -93,7 +93,7 @@ class wizard_vat(wizard.interface):
for p_id in p_id_list:
record=[] # this holds record per partner
obj_partner=pooler.get_pool(cr.dbname).get('res.partner').browse(cr,uid,p_id)
cr.execute('select a.type,sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) where a.type in ('"'income'"','"'tax'"') and l.partner_id=%d and l.date between %s group by a.type'%(p_id,period))
cr.execute('select b.code,sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code in ('"'produit'"','"'tax'"') and l.partner_id=%d and l.date between %s group by a.type'%(p_id,period))
line_info=cr.fetchall()
if not line_info:
continue
@ -108,7 +108,7 @@ class wizard_vat(wizard.interface):
else:
raise wizard.except_wizard('Data Insufficient!', 'The Partner "'+obj_partner.name + '"'' has no default type address!')
if len(line_info)==1:
if line_info[0][0]=='income':
if line_info[0][0]=='produit':
record.append(0.00)
record.append(line_info[0][1])
else: