IMPORTANT CHANGE : - All EU countries should now be intrastat=True, including your own country - When generating lines for Intrastat Product/Service, all invoices for which country == Company's country are excluded

This commit is contained in:
Alexis de Lattre
2013-04-23 15:39:08 +02:00
committed by Alexis de Lattre
parent c93829bc12
commit 481001d4a6
2 changed files with 33 additions and 30 deletions

View File

@@ -2,83 +2,86 @@
<openerp>
<data noupdate="1">
<record id="base.fr" model="res.country">
<field name="intrastat" eval="True"/>
</record>
<record id="base.de" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.at" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.cy" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.dk" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.es" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.ee" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.fi" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.gr" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.hu" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.ie" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.it" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.lv" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.lt" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.lu" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.mt" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.nl" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.pl" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.pt" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.sk" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.cz" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.uk" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.si" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.se" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.ro" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.bg" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
<record id="base.be" model="res.country">
<field eval="True" name="intrastat"/>
<field name="intrastat" eval="True"/>
</record>
</data>
</openerp>

View File

@@ -60,10 +60,10 @@ class report_intrastat_common(osv.osv_memory):
def _check_generate_lines(self, cr, uid, intrastat, context=None):
if not intrastat.company_id.currency_id.code:
raise osv.except_osv(_('Error :'), _("The currency code is not set on the currency '%s'.") %intrastat.company_id.currency_id.name)
if not intrastat.currency_id.code == 'EUR':
raise osv.except_osv(_('Error :'), _("The company currency must be 'EUR', but is currently '%s'.") %intrastat.currency_id.code)
if not intrastat.company_id.country_id:
raise osv.except_osv(_('Error :'), _("The country is not set on the company '%s'.") %intrastat.company_id.name)
if not intrastat.currency_id.name == 'EUR':
raise osv.except_osv(_('Error :'), _("The company currency must be 'EUR', but is currently '%s'.") %intrastat.currency_id.name)
return True