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

[FIX] l10n_be, intracom declaration: grid 48 is now properly handled by the intracom xml statement 

bzr revid: qdp-launchpad@openerp.com-20120208111804-d9gsf2lnrgie51oc
This commit is contained in:
Quentin (OpenERP) 2012-02-08 12:18:04 +01:00
parent bfcdf128c8
commit 542c70b925
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/l10n_be/account_tax_code_template.xml
View File

@ -142,6 +142,27 @@
<field name="parent_id" ref="atctn_IIG"/>
<field name="notprintable" eval="0"/>
</record>
<record id="atctn_48s44" model="account.tax.code.template">
<field name="name">Notes de crédit aux opérations grille [44]</field>
<field name="code">48s44</field>
<field name="sign">1</field>
<field name="parent_id" ref="atctn_48"/>
<field name="notprintable" eval="0"/>
</record>
<record id="atctn_48s46L" model="account.tax.code.template">
<field name="name">Notes de crédit aux opérations grille [46L]</field>
<field name="code">48s46L</field>
<field name="sign">1</field>
<field name="parent_id" ref="atctn_48"/>
<field name="notprintable" eval="0"/>
</record>
<record id="atctn_48s46T" model="account.tax.code.template">
<field name="name">Notes de crédit aux opérations grille [46T]</field>
<field name="code">48s46T</field>
<field name="sign">1</field>
<field name="parent_id" ref="atctn_48"/>
<field name="notprintable" eval="0"/>
</record>
<record id="atctn_49" model="account.tax.code.template">
<field name="name">Notes de crédit aux opérations du point II</field>
<field name="code">49</field>

6
addons/l10n_be/account_tax_template.xml
View File

@ -191,7 +191,7 @@
<field name="base_code_id" ref="atctn_44"/>
<field name="base_sign">1</field>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="atctn_48"/>
<field name="ref_base_code_id" ref="atctn_48s44"/>
<field name="ref_base_sign">1</field>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
@ -208,7 +208,7 @@
<field name="base_code_id" ref="atctn_46L"/>
<field name="base_sign">1</field>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="atctn_48"/>
<field name="ref_base_code_id" ref="atctn_48s46L"/>
<field name="ref_base_sign">1</field>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>
@ -225,7 +225,7 @@
<field name="base_code_id" ref="atctn_46T"/>
<field name="base_sign">1</field>
<field name="tax_sign">1</field>
<field name="ref_base_code_id" ref="atctn_48"/>
<field name="ref_base_code_id" ref="atctn_48s46T"/>
<field name="ref_base_sign">1</field>
<field name="ref_tax_sign">1</field>
<field name="child_depend" eval="0"/>

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

@ -159,16 +159,22 @@ class partner_vat_intra(osv.osv_memory):
'issued_by': issued_by,
})
codes = ('44', '46L', '46T')
cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat, t.code AS intra_code, SUM(l.tax_amount) AS amount
codes = ('44', '46L', '46T', '48s44', '48s46L', '48s46T')
cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat,
(CASE WHEN t.code = '48s44' THEN '44'
WHEN t.code = '48s46L' THEN '46L'
WHEN t.code = '48s46T' THEN '46T'
ELSE t.code END) AS intra_code,
SUM(CASE WHEN t.code in ('48s44','48s46L','48s46T') THEN -l.tax_amount ELSE l.tax_amount END) AS amount
FROM account_move_line l
LEFT JOIN account_tax_code t ON (l.tax_code_id = t.id)
LEFT JOIN res_partner p ON (l.partner_id = p.id)
WHERE t.code IN %s
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])))
GROUP BY p.name, l.partner_id, p.vat, intra_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']) + ', '