diff --git a/intrastat_base/__terp__.py b/intrastat_base/__terp__.py index 089173ab..c97584e3 100644 --- a/intrastat_base/__terp__.py +++ b/intrastat_base/__terp__.py @@ -42,7 +42,6 @@ Please contact Alexis de Lattre from Akretion for 'depends': ['base_vat'], 'init_xml': ['country_data.xml'], 'update_xml': [ - 'security/ir.model.access.csv', 'product_view.xml', 'country_view.xml', 'tax_view.xml', diff --git a/intrastat_base/i18n/fr_FR.po b/intrastat_base/i18n/fr.po similarity index 100% rename from intrastat_base/i18n/fr_FR.po rename to intrastat_base/i18n/fr.po diff --git a/intrastat_base/intrastat_common.py b/intrastat_base/intrastat_common.py index 5cbf191a..ad2ee39d 100644 --- a/intrastat_base/intrastat_common.py +++ b/intrastat_base/intrastat_common.py @@ -60,10 +60,8 @@ 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.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 diff --git a/intrastat_base/intrastat_demo.xml b/intrastat_base/intrastat_demo.xml index 31aa5658..96bd8800 100644 --- a/intrastat_base/intrastat_demo.xml +++ b/intrastat_base/intrastat_demo.xml @@ -13,7 +13,7 @@ FR58441019213 - + BE0828696437 True diff --git a/intrastat_base/security/ir.model.access.csv b/intrastat_base/security/ir.model.access.csv deleted file mode 100644 index d7a2bf1c..00000000 --- a/intrastat_base/security/ir.model.access.csv +++ /dev/null @@ -1,2 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_report_intrastat_common","Read access on report.intrastat.common","model_report_intrastat_common","base.group_user",1,0,0,0 diff --git a/intrastat_base/tax_view.xml b/intrastat_base/tax_view.xml index 5141c3e2..ff64770c 100644 --- a/intrastat_base/tax_view.xml +++ b/intrastat_base/tax_view.xml @@ -17,8 +17,12 @@ - - + + + + +