Merge lp:~agilebg/openobject-addons/6.1-add-it-vat-22 into lp:openobject-addons/6.1

[Leonardo Pistone]

The second commit adds a new Italian tax for 22%.
The first one is necessary to free codes 22a and 22b that were mistakenly used for a 2% tax.

Thanks!

[Olivier Dony (Odoo) (odo-openerp)]

Looks good, thanks for the update!

I cannot vouch for the fiscal changes, but did the following sanity checks, for the record:
 - the branch is green on runbot in the agilebg team
 - the module installs properly
 - there were no references to the renamed 22a->2a entries, so none to correct elsewhere
 - l10n_it is not translated so there is no translation to fix when renaming the IDs
 - account.templates can be safely dropped during module update because there is no connection between a template and the actual account after installation (at least not in the standard distribution)
 - Leonardo and Agile BG are part of OpenERP Italia community that is maintaining those modules.

Seeing the urgency of the fix, it was merged in addons 6.1 at revision 7255 revid:<email address hidden>

If the members of the Italian Community have any remark or patch, do not hesitate to comment here, it's not too late! :-)

review: Approve

[Leonardo Pistone (lepistone)]

Great, Olivier, thanks! That is a quick an thorough review!

I would still ask some Italian to review that, even though it is after-the-fact.

[Lorenzo Battistini (elbati)]

The new VAT configuration is coherent with 21% VAT configuration.
This means that the new 22% VAT is also affected by bug 1083635.
I approve this merge anyway, even if it is affected by that bug, because I prefer to have a uniform tax configuration and to fix it entirely when and if the solution to bug 1083635 will come.

review: Approve (code review)

[Olivier Dony (Odoo) (odo-openerp)]

On 10/04/2013 07:35 PM, Lorenzo Battistini - Agile BG wrote:
> Review: Approve code review
>
> The new VAT configuration is coherent with 21% VAT configuration. This means
> that the new 22% VAT is also affected by bug 1083635. I approve this merge
> anyway, even if it is affected by that bug, because I prefer to have a
> uniform tax configuration and to fix it entirely when and if the solution to
> bug 1083635 will come.

We would really appreciate it if you could submit a merge proposal for 6.1 with
the updated patch, as I suppose the 6.1 patch posted on bug 1083635 is now
outdated?
We'll fast-forward that merge, granted that the 7.0 version is merged already.

Thanks!

[Lorenzo Battistini (elbati)]

On 10/04/2013 07:45 PM, Olivier Dony (OpenERP) wrote:
> We would really appreciate it if you could submit a merge proposal for 6.1 with
> the updated patch, as I suppose the 6.1 patch posted on bug 1083635 is now
> outdated?
> We'll fast-forward that merge, granted that the 7.0 version is merged already

Here it is
https://code.launchpad.net/~agilebg/openobject-addons/6.1-bug-1083635-elbati/+merge/189470
<https://code.launchpad.net/%7Eagilebg/openobject-addons/6.1-bug-1083635-elbati/+merge/189470>

Thanks

--
Lorenzo Battistini

=== modified file 'l10n_it/data/account.tax.code.template.csv'
--- l10n_it/data/account.tax.code.template.csv	2012-02-18 13:39:08 +0000
+++ l10n_it/data/account.tax.code.template.csv	2013-10-04 11:01:20 +0000
@@ -60,6 +60,20 @@
 IVC21Idet40,template_impcode_pagata_21det40,IVA a credito 21% detraibile 40% (imponibile),template_impcode_pagata
 IVC21det50,template_ivacode_pagata_21det50,IVA a credito 21% detraibile 50%,template_ivacode_pagata
 IVC21Idet50,template_impcode_pagata_21det50,IVA a credito 21% detraibile 50% (imponibile),template_impcode_pagata
+IVC22,template_ivacode_pagata_22,IVA a credito 22%,template_ivacode_pagata
+IVC22I,template_impcode_pagata_22,IVA a credito 22% (imponibile),template_impcode_pagata
+IVD22,template_ivacode_riscossa_22,IVA a debito 22%,template_ivacode_riscossa
+IVD22I,template_impcode_riscossa_22,IVA a debito 22% (imponibile),template_impcode_riscossa
+IVC22ind,template_ivacode_pagata_22ind,IVA a credito 22% indetraibile,template_ivacode_pagata
+IVC22Iind,template_impcode_pagata_22ind,IVA a credito 22% indetraibile (imponibile),template_impcode_pagata
+IVC22det10,template_ivacode_pagata_22det10,IVA a credito 22% detraibile 10%,template_ivacode_pagata
+IVC22Idet10,template_impcode_pagata_22det10,IVA a credito 22% detraibile 10% (imponibile),template_impcode_pagata
+IVC22det15,template_ivacode_pagata_22det15,IVA a credito 22% detraibile 15%,template_ivacode_pagata
+IVC22Idet15,template_impcode_pagata_22det15,IVA a credito 22% detraibile 15% (imponibile),template_impcode_pagata
+IVC22det40,template_ivacode_pagata_22det40,IVA a credito 22% detraibile 40%,template_ivacode_pagata
+IVC22Idet40,template_impcode_pagata_22det40,IVA a credito 22% detraibile 40% (imponibile),template_impcode_pagata
+IVC22det50,template_ivacode_pagata_22det50,IVA a credito 22% detraibile 50%,template_ivacode_pagata
+IVC22Idet50,template_impcode_pagata_22det50,IVA a credito 22% detraibile 50% (imponibile),template_impcode_pagata
 Rit,template_ra,Ritenute d'acconto,vat_code_chart_root
 RitD20,template_ritcode_20,Ritenute a debito 20%,template_ra
 RitD20I,template_ritimpcode_20,Ritenute a debito 20% (imponibile),template_ra

=== modified file 'l10n_it/data/account.tax.template.csv'
--- l10n_it/data/account.tax.template.csv	2012-02-18 13:39:08 +0000
+++ l10n_it/data/account.tax.template.csv	2013-10-04 11:01:20 +0000
@@ -1,4 +1,6 @@
 id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depend,type,account_collected_id:id,account_paid_id:id,type_tax_use,base_code_id:id,tax_code_id:id,ref_base_code_id:id,ref_tax_code_id:id,ref_base_sign,ref_tax_sign,price_include,base_sign,tax_sign
+22a,22a,l10n_it_chart_template_generic,Iva al 22% (debito),,0.22,,False,percent,2601,2601,sale,template_impcode_riscossa_22,template_ivacode_riscossa_22,template_impcode_riscossa_22,template_ivacode_riscossa_22,-1,-1,False,,
+22b,22b,l10n_it_chart_template_generic,Iva al 22% (credito),,0.22,,False,percent,1601,1601,purchase,template_impcode_pagata_22,template_ivacode_pagata_22,template_impcode_pagata_22,template_ivacode_pagata_22,,,False,-1,-1
 21a,21a,l10n_it_chart_template_generic,Iva al 21% (debito),,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,,
 21b,21b,l10n_it_chart_template_generic,Iva al 21% (credito),,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,False,-1,-1
 20a,20a,l10n_it_chart_template_generic,Iva al 20% (debito),,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,,
@@ -25,8 +27,8 @@
 20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,,,False,-1,-1
 20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),1,0.5,20I5,False,percent,,,purchase,,,,,,,False,,
 20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),2,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,,,False,,
-22a,22a,l10n_it_chart_template_generic,Iva 2% (debito),,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,,
-22b,22b,l10n_it_chart_template_generic,Iva 2% (credito),,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,False,-1,-1
+2a,2a,l10n_it_chart_template_generic,Iva 2% (debito),,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,,
+2b,2b,l10n_it_chart_template_generic,Iva 2% (credito),,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,False,-1,-1
 4a,4a,l10n_it_chart_template_generic,Iva 4% (debito),,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,,
 4b,4b,l10n_it_chart_template_generic,Iva 4% (credito),,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,False,-1,-1
 4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,,,False,-1,-1
@@ -40,13 +42,29 @@
 4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),1,0.5,4I5,False,percent,,,purchase,,,,,,,False,,
 00a,00a,l10n_it_chart_template_generic,Esente IVA (debito),,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,,
 00b,00b,l10n_it_chart_template_generic,Esente IVA (credito),,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,,,False,-1,-1
+22a INC,22a INC,l10n_it_chart_template_generic,Iva al 22% (debito) INC,,0.22,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_22,l10n_it.template_ivacode_riscossa_22,l10n_it.template_impcode_riscossa_22,l10n_it.template_ivacode_riscossa_22,-1,-1,True,,
 21a INC,21a INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,,
 20a INC,20a INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,,
 10a INC,10a INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,,
 12a INC,12a INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,,
-22a INC,22a INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,,
+2a INC,2a INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,,
 4a INC,4a INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,,
 00a INC,00a INC,l10n_it_chart_template_generic,Esente IVA (debito) INC,,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,,
+2210,2210,l10n_it_chart_template_generic,Iva al 22% detraibile 10%,,0.22,,True,percent,,,purchase,template_impcode_pagata_22det10,,template_impcode_pagata_22det10,,,,False,-1,-1
+2210a,2210a,l10n_it_chart_template_generic,Iva al 22% detraibile 10% (D),2,0,2210,False,balance,1601,1601,purchase,,template_ivacode_pagata_22det10,,template_ivacode_pagata_22det10,,,False,,
+2210b,2210b,l10n_it_chart_template_generic,Iva al 22% detraibile 10% (I),1,0.9,2210,False,percent,,,purchase,,,,,,,False,,
+2215,2215,l10n_it_chart_template_generic,Iva al 22% detraibile 15%,,0.22,,True,percent,,,purchase,template_impcode_pagata_22det15,,template_impcode_pagata_22det15,,,,False,-1,-1
+2215a,2215a,l10n_it_chart_template_generic,Iva al 22% detraibile 15% (D),2,0,2215,False,balance,1601,1601,purchase,,template_ivacode_pagata_22det15,,template_ivacode_pagata_22det15,,,False,,
+2215b,2215b,l10n_it_chart_template_generic,Iva al 22% detraibile 15% (I),1,0.85,2215,False,percent,,,purchase,,,,,,,False,,
+2240,2240,l10n_it_chart_template_generic,Iva al 22% detraibile 40%,,0.22,,True,percent,,,purchase,template_impcode_pagata_22det40,,template_impcode_pagata_22det40,,,,False,-1,-1
+2240a,2240a,l10n_it_chart_template_generic,Iva al 22% detraibile 40% (D),2,0,2240,False,balance,1601,1601,purchase,,template_ivacode_pagata_22det40,,template_ivacode_pagata_22det40,,,False,,
+2240b,2240b,l10n_it_chart_template_generic,Iva al 22% detraibile 40% (I),1,0.6,2240,False,percent,,,purchase,,,,,,,False,,
+22AO,22AO,l10n_it_chart_template_generic,Iva al 22% indetraibile,,0.22,,True,percent,,,purchase,template_impcode_pagata_22ind,,template_impcode_pagata_22ind,,,,False,-1,-1
+22AOa,22AOa,l10n_it_chart_template_generic,Iva al 22% indetraibile (D),2,0,22AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_22ind,,template_ivacode_pagata_22ind,,,False,,
+22AOb,22AOb,l10n_it_chart_template_generic,Iva al 22% indetraibile (I),1,1,22AO,False,percent,,,purchase,,,,,,,False,,
+22I5,22I5,l10n_it_chart_template_generic,IVA al 22% detraibile al 50%,,0.22,,True,percent,,,purchase,template_impcode_pagata_22det50,,template_impcode_pagata_22det50,,,,False,-1,-1
+22I5b,22I5b,l10n_it_chart_template_generic,IVA al 22% detraibile al 50% (I),1,0.5,22I5,False,percent,,,purchase,,,,,,,False,,
+22I5a,22I5a,l10n_it_chart_template_generic,IVA al 22% detraibile al 50% (D),2,0,22I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_22det50,,template_ivacode_pagata_22det50,,,False,,
 2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,,,False,-1,-1
 2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),2,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,,,False,,
 2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),1,0.9,2110,False,percent,,,purchase,,,,,,,False,,