Merge lp:~openerp-dev/openobject-addons/trunk-bug-730885-skh into lp:openobject-addons

[Somesh Khare]

Hello,

Fix : l10n_be: vat_intra report: used tax code are wrong.

Thanks,
skh

[lp:~openerp-dev/openobject-addons/trunk-bug-730885-skh]

4608. By Somesh Khare on 2011-03-29

[FIX] l10n_be: vat_intra report: used tax code are wrong

[Somesh Khare (somesh.khare)]

Hello,

[Fix] : I have made the changes according to the last comment.

Thanks,
skh

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-730885-skh]

4609. By Floris on 2011-03-30

[FIX] l10n_be: vat_intra report: used tax code are wrong

[Somesh Khare (somesh.khare)]

Hello,

[Fix] : I have made the changes in the account_pcmn_belgium.xml according to the last comment.

Thanks,
skh

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-730885-skh]

4610. By Floris on 2011-03-31

[FIX] l10n_be: vat_intra report: used tax code are wrong

[Somesh Khare (somesh.khare)]

Hello,

[Fix] : These strings need to be verified by qdp.

Thanks,
skh

review: Needs Resubmitting

[qdp (OpenERP) (qdp)]

i should already have fixed that 2 weeks ago, so i'm rejecting this merge prop for the sake of clarity in LP. Please resubmit if the bug is confirmed again.

Thanks

review: Needs Information

Unmerged revisions

4610. By Floris on 2011-03-31

[FIX] l10n_be: vat_intra report: used tax code are wrong

4609. By Floris on 2011-03-30

[FIX] l10n_be: vat_intra report: used tax code are wrong

4608. By Somesh Khare on 2011-03-29

[FIX] l10n_be: vat_intra report: used tax code are wrong

4607. By Somesh Khare on 2011-03-29

[FIX] l10n_be: vat_intra report: used tax code are wrong

=== modified file 'l10n_be/account_pcmn_belgium.xml'
--- l10n_be/account_pcmn_belgium.xml	2011-01-14 00:11:01 +0000
+++ l10n_be/account_pcmn_belgium.xml	2011-03-31 05:46:34 +0000
@@ -6479,18 +6479,8 @@
         </record>
         <record id="vat_code_a44" model="account.tax.code.template">
             <field name="code">44</field>
-            <field name="name">Services intra-communautaires et ABC</field>
-            <field name="parent_id" ref="vat_code_out"/>
-        </record>
-        <record id="vat_code_a44a" model="account.tax.code.template">
-            <field name="code">44a</field>
             <field name="name">Services intra-communautaires</field>
-            <field name="parent_id" ref="vat_code_a44"/>
-        </record>
-        <record id="vat_code_a44b" model="account.tax.code.template">
-            <field name="code">44b</field>
-            <field name="name">ABC intra-communautaires</field>
-            <field name="parent_id" ref="vat_code_a44"/>
+            <field name="parent_id" ref="vat_code_out"/>
         </record>
 
         <record id="vat_code_a45" model="account.tax.code.template">
@@ -6498,11 +6488,21 @@
             <field name="name">Operations avec TVA due par le cocontractant</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
-        <record id="vat_code_a46" model="account.tax.code.template">
+       <record id="vat_code_a46" model="account.tax.code.template">
             <field name="code">46</field>
-            <field name="name">Livraisons intra-communautaire exemptees</field>
+            <field name="name">Livraisons intra-communautaire et ABC</field>
             <field name="parent_id" ref="vat_code_out"/>
         </record>
+        <record id="vat_code_a46a" model="account.tax.code.template">
+            <field name="code">46a</field>
+            <field name="name">Livraisons intra-communautaire</field>
+            <field name="parent_id" ref="vat_code_a44"/>
+        </record>
+        <record id="vat_code_a46b" model="account.tax.code.template">
+            <field name="code">46b</field>
+            <field name="name">Intra-communautaire ABC transactions</field>
+            <field name="parent_id" ref="vat_code_a44"/>
+        </record>
         <record id="vat_code_a47" model="account.tax.code.template">
             <field name="code">47</field>
             <field name="name">Autres operations exemptees</field>
 
=== modified file 'l10n_be/wizard/l10n_be_vat_intra.py'
--- l10n_be/wizard/l10n_be_vat_intra.py	2011-01-14 00:11:01 +0000
+++ l10n_be/wizard/l10n_be_vat_intra.py	2011-03-31 05:46:34 +0000
@@ -127,7 +127,7 @@
                       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 ('44a','44b','88')
+                      WHERE t.code IN ('44','46b','46a')
                        AND l.period_id IN %s
                       GROUP BY p.name, l.partner_id, p.vat, t.code''', (tuple(data['period_ids']), ))
         for row in cursor.dictfetchall():
@@ -138,7 +138,7 @@
             amt = row['amount'] or 0
             amt = int(round(amt * 100))
             amount_sum += amt
-            intra_code = row['intra_code'] == '88' and 'L' or (row['intra_code'] == '44b' and 'T' or (row['intra_code'] == '44a' and 'S' or ''))
+            intra_code = row['intra_code'] == '46a' and 'L' or (row['intra_code'] == '46b' and 'T' or (row['intra_code'] == '44' and 'S' or ''))
             data_clientinfo +='\n\t\t<ClientList SequenceNum="'+str(seq)+'">\n\t\t\t<CompanyInfo>\n\t\t\t\t<VATNum>'+row['vat'][2:] +'</VATNum>\n\t\t\t\t<Country>'+row['vat'][:2] +'</Country>\n\t\t\t</CompanyInfo>\n\t\t\t<Amount>'+str(amt) +'</Amount>\n\t\t\t<Code>'+str(intra_code) +'</Code>\n\t\t</ClientList>'
         amount_sum = int(amount_sum)
         data_decl = '\n\t<DeclarantList SequenceNum="1" DeclarantNum="'+ dnum + '" ClientNbr="'+ str(seq) +'" AmountSum="'+ str(amount_sum) +'" >'