Merge lp:~akretion-team/new-report-intrastat/8.0-add-intrastat-product into lp:new-report-intrastat

[Alexis de Lattre]

Add module intrastat_product as discussed with Luc de Meyer.

Rename report_intrastat_product to l10n_fr_report_intrastat_product, so that it's clean that this object is France-specific and don't risk any collision with modules from other countries. Migrations scripts are provided.

[lp:~akretion-team/new-report-intrastat/8.0-add-intrastat-product]

98. By Alexis de Lattre on 2014-12-01

Rename field country_id to origin_country_id (TODO : write mig script) and move this field from l10n_fr_intrastat_product to intrastat_product

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for your work, it's great that you made a module agnostic to the country.
I added comments regarding the new API, and I will test your module.

[lp:~akretion-team/new-report-intrastat/8.0-add-intrastat-product]

99. By Alexis de Lattre on 2014-12-12

Take into accout the remarks of Guewen

100. By Alexis de Lattre on 2014-12-13

Move intrastat_code and uom_id of report.intrastat.code from l10n_fr_intrastat_product to intrastat_product, as discussed with Luc de Meyer

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (tested intrastat_product / code review)

=== modified file 'intrastat_base/__openerp__.py'
--- intrastat_base/__openerp__.py	2014-03-09 08:29:59 +0000
+++ intrastat_base/__openerp__.py	2014-12-13 00:30:09 +0000
@@ -52,5 +52,4 @@
     ],
     'demo': ['intrastat_demo.xml'],
     'installable': True,
-    'active': False,
 }

=== added directory 'intrastat_product'
=== added file 'intrastat_product/__init__.py'
--- intrastat_product/__init__.py	1970-01-01 00:00:00 +0000
+++ intrastat_product/__init__.py	2014-12-13 00:30:09 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Intrastat product module for OpenERP
+#    Copyright (C) 2011-2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import intrastat

=== added file 'intrastat_product/__openerp__.py'
--- intrastat_product/__openerp__.py	1970-01-01 00:00:00 +0000
+++ intrastat_product/__openerp__.py	2014-12-13 00:30:09 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Intrastat Product module for OpenERP
+#    Copyright (C) 2011-2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Intrastat Product',
+    'version': '1.1',
+    'category': 'Localisation/Report Intrastat',
+    'license': 'AGPL-3',
+    'summary': 'Base module for Intrastat Product',
+    'description': """
+This module contains the common objects for the Intrastat Product.
+This module is country-independant.
+
+This module has been written by Alexis de Lattre from Akretion
+<[e-mail]>
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['intrastat_base'],
+    'data': [
+        'intrastat_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    'demo': ['intrastat_demo.xml'],
+    'installable': True,
+}

=== added directory 'intrastat_product/i18n'
=== added file 'intrastat_product/i18n/intrastat_product.pot'
--- intrastat_product/i18n/intrastat_product.pot	1970-01-01 00:00:00 +0000
+++ intrastat_product/i18n/intrastat_product.pot	2014-12-13 00:30:09 +0000
@@ -0,0 +1,122 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* intrastat_product
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-28 22:48+0000\n"
+"PO-Revision-Date: 2014-11-28 22:48+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: intrastat_product
+#: help:product.category,intrastat_id:0
+msgid "Code from the Harmonised System. If this code is not set on the product itself, it will be read here, on the related product category."
+msgstr ""
+
+#. module: intrastat_product
+#: help:product.template,intrastat_id:0
+msgid "Code from the Harmonised System. Nomenclature is available from the World Customs Organisation, see http://www.wcoomd.org/. Some countries have made their own extensions to this nomenclature."
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,create_uid:0
+msgid "Created by"
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,description:0
+msgid "Description"
+msgstr ""
+
+#. module: intrastat_product
+#: help:report.intrastat.code,name:0
+msgid "Full length Harmonized System code (digits only). Full list is available from the World Customs Organisation, see http://www.wcoomd.org"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model,name:intrastat_product.model_report_intrastat_code
+msgid "H.S. Code"
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,name:0
+msgid "H.S. code"
+msgstr ""
+
+#. module: intrastat_product
+#: code:addons/intrastat_product/intrastat.py:56
+#, python-format
+msgid "H.S. codes should only contain digits. It is not the case of H.S. code '%s'."
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,id:0
+msgid "ID"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.actions.act_window,name:intrastat_product.product_intrastat_code_act
+#: model:ir.ui.menu,name:intrastat_product.product_intrastat_code_menu
+#: field:product.category,intrastat_id:0
+#: field:product.template,intrastat_id:0
+#: view:report.intrastat.code:intrastat_product.product_intrastat_code_form
+msgid "Intrastat Code"
+msgstr ""
+
+#. module: intrastat_product
+#: view:report.intrastat.code:intrastat_product.product_intrastat_code_tree
+msgid "Intrastat Codes"
+msgstr ""
+
+#. module: intrastat_product
+#: view:product.category:intrastat_product.product_category_form_view
+msgid "Intrastat Properties"
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: intrastat_product
+#: field:report.intrastat.code,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model,name:intrastat_product.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: intrastat_product
+#: model:ir.model,name:intrastat_product.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: intrastat_product
+#: view:report.intrastat.code:intrastat_product.product_intrastat_code_search
+msgid "Search Intrastat Codes"
+msgstr ""
+
+#. module: intrastat_product
+#: help:report.intrastat.code,description:0
+msgid "Short text description of the H.S. category"
+msgstr ""
+
+#. module: intrastat_product
+#: sql_constraint:report.intrastat.code:0
+msgid "This H.S. code already exists in Odoo !"
+msgstr ""
+

=== added file 'intrastat_product/intrastat.py'
--- intrastat_product/intrastat.py	1970-01-01 00:00:00 +0000
+++ intrastat_product/intrastat.py	2014-12-13 00:30:09 +0000
@@ -0,0 +1,113 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Intrastat Product module for OpenERP
+#    Copyright (C) 2004-2009 Tiny SPRL (http://tiny.be)
+#    Copyright (C) 2010-2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import models, fields, api, _
+from openerp.exceptions import ValidationError
+
+
+class ReportIntrastatCode(models.Model):
+    _name = "report.intrastat.code"
+    _description = "H.S. Code"
+    _order = "name"
+
+    name = fields.Char(
+        string='H.S. code',
+        help="Full length Harmonized System code (digits only). Full list is "
+        "available from the World Customs Organisation, see "
+        "http://www.wcoomd.org")
+    description = fields.Char(
+        'Description', help="Short text description of the H.S. category")
+    intrastat_code = fields.Char(
+        string='European Intrastat Code', size=9, required=True,
+        help="Code used for the Intrastat declaration. Must be part "
+        "of the 'Combined Nomenclature' (CN), cf "
+        "http://en.wikipedia.org/wiki/Combined_Nomenclature"
+        "Must have 8 digits with sometimes a 9th digit.")
+    intrastat_uom_id = fields.Many2one(
+        'product.uom', string='UoM for Intrastat Report',
+        help="Select the unit of measure if one is required for "
+        "this particular Intrastat Code (other than the weight in Kg). "
+        "If no particular unit of measure is required, leave empty.")
+    active = fields.Boolean(default=True)
+
+    @api.multi
+    def name_get(self):
+        res = []
+        for code in self:
+            name = code.name
+            if code.description:
+                name = u'%s %s' % (name, code.description)
+            res.append((code.id, name))
+        return res
+
+    @api.constrains('name', 'intrastat_code')
+    def _hs_code(self):
+        if self.name and not self.name.isdigit():
+            raise ValidationError(
+                _("H.S. codes should only contain digits. It is not the case "
+                    "of H.S. code '%s'.") % self.name)
+        if self.intrastat_code and not self.intrastat_code.isdigit():
+            raise ValidationError(
+                _("The field Intrastat Code should only contain digits. "
+                    "It is not the case of Intrastat Code '%s'.")
+                % self.intrastat_code)
+        if self.intrastat_code and len(self.intrastat_code) not in (8, 9):
+            raise ValidationError(
+                _("The field Intrastat Code should "
+                    "contain 8 or 9 digits. It is not the case of "
+                    "Intrastat Code '%s'.")
+                % self.intrastat_code)
+
+    _sql_constraints = [(
+        'hs_code_uniq',
+        'unique(name)',
+        'This H.S. code already exists in Odoo !'
+        )]
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    intrastat_id = fields.Many2one(
+        'report.intrastat.code', string='Intrastat Code',
+        help="Code from the Harmonised System. Nomenclature is "
+        "available from the World Customs Organisation, see "
+        "http://www.wcoomd.org/. Some countries have made their own "
+        "extensions to this nomenclature.")
+    origin_country_id = fields.Many2one(
+        'res.country', string='Country of Origin',
+        help="Country of origin of the product i.e. product "
+        "'made in ____'. If you have different countries of origin "
+        "depending on the supplier from which you purchased the product, "
+        "leave this field empty and use the equivalent field on the "
+        "'product supplier info' form.")
+
+
+class ProductCategory(models.Model):
+    _inherit = "product.category"
+
+    intrastat_id = fields.Many2one(
+        'report.intrastat.code', string='Intrastat Code',
+        help="Code from the Harmonised System. If this code is not "
+        "set on the product itself, it will be read here, on the "
+        "related product category.")

=== added file 'intrastat_product/intrastat_demo.xml'
--- intrastat_product/intrastat_demo.xml	1970-01-01 00:00:00 +0000
+++ intrastat_product/intrastat_demo.xml	2014-12-13 00:30:09 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2011-2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data noupdate="1">
+
+<record id="84715000" model="report.intrastat.code">
+    <field name="name">84715000</field>
+    <field name="intrastat_code">84715000</field>
+    <field name="intrastat_uom_id" ref="product.product_uom_unit"/>
+    <field name="description">Automatic data-processing machines (computers)</field>
+</record>
+
+<record id="84717050" model="report.intrastat.code">
+    <field name="name">84717050</field>
+    <field name="intrastat_code">84717050</field>
+    <field name="intrastat_uom_id" ref="product.product_uom_unit"/>
+    <field name="description">Storage units</field>
+</record>
+
+<record id="85340090" model="report.intrastat.code">
+    <field name="name">85340090</field>
+    <field name="intrastat_code">85340090</field>
+    <field name="description">Printed circuits</field>
+</record>
+
+<record id="product.product_product_3" model="product.product">
+    <field name="intrastat_id" ref="84715000" />
+    <field name="origin_country_id" ref="base.tw" />
+    <field name="weight_net">5</field>
+</record>
+
+<record id="product.product_product_4" model="product.product">
+    <field name="intrastat_id" ref="84715000" />
+    <field name="origin_country_id" ref="base.cn" />
+    <field name="weight_net">6</field>
+</record>
+
+<record id="product.product_product_5" model="product.product">
+    <field name="intrastat_id" ref="84715000" />
+    <field name="origin_country_id" ref="base.cn" />
+    <field name="weight_net">6.5</field>
+</record>
+
+<record id="product.product_product_17" model="product.product">
+    <field name="intrastat_id" ref="84717050" />
+    <field name="origin_country_id" ref="base.sg" />
+    <field name="weight_net">0.5</field>
+</record>
+
+<record id="product.product_product_18" model="product.product">
+    <field name="intrastat_id" ref="84717050" />
+    <field name="origin_country_id" ref="base.sg" />
+    <field name="weight_net">0.5</field>
+</record>
+
+<record id="product.product_product_19" model="product.product">
+    <field name="intrastat_id" ref="84717050" />
+    <field name="origin_country_id" ref="base.sg" />
+    <field name="weight_net">0.5</field>
+</record>
+
+<record id="product.product_product_20" model="product.product">
+    <field name="intrastat_id" ref="85340090" />
+    <field name="origin_country_id" ref="base.tw" />
+    <field name="weight_net">0.7</field>
+</record>
+
+<record id="product.product_product_21" model="product.product">
+    <field name="intrastat_id" ref="85340090" />
+    <field name="origin_country_id" ref="base.tw" />
+    <field name="weight_net">0.8</field>
+</record>
+
+<record id="product.product_product_25" model="product.product">
+    <field name="intrastat_id" ref="84715000" />
+    <field name="origin_country_id" ref="base.be" />
+    <field name="weight_net">2</field>
+</record>
+
+
+</data>
+</openerp>

=== added file 'intrastat_product/intrastat_view.xml'
--- intrastat_product/intrastat_view.xml	1970-01-01 00:00:00 +0000
+++ intrastat_product/intrastat_view.xml	2014-12-13 00:30:09 +0000
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2010-2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<!-- product.template form view -->
+<record id="product_template_form_view" model="ir.ui.view">
+    <field name="name">intrastat.product.template.form</field>
+    <field name="model">product.template</field>
+    <field name="inherit_id" ref="intrastat_base.product_template_form_view" />
+    <field name="arch" type="xml">
+        <field name="exclude_from_intrastat" position="before">
+            <field name="intrastat_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
+            <field name="origin_country_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
+        </field>
+    </field>
+</record>
+
+<!-- Product category form view -->
+<record id="product_category_form_view" model="ir.ui.view">
+    <field name="name">intrastat.product.category.form</field>
+    <field name="model">product.category</field>
+    <field name="inherit_id" ref="product.product_category_form_view"/>
+    <field name="arch" type="xml">
+        <xpath expr="//group[@name='parent']" position="inside">
+            <group name="intrastat" string="Intrastat Properties" colspan="2">
+                <field name="intrastat_id" />
+            </group>
+        </xpath>
+    </field>
+</record>
+
+<!-- Add search view for H.S. code -->
+<record id="product_intrastat_code_search" model="ir.ui.view">
+    <field name="name">intrastat.product.intrastat.code.search</field>
+    <field name="model">report.intrastat.code</field>
+    <field name="arch" type="xml">
+        <search string="Search Intrastat Codes">
+            <field name="name"
+                filter_domain="['|', '|', ('name', 'like', self), ('intrastat_code', 'like', self), ('description', 'ilike', self)]"/>
+        </search>
+    </field>
+</record>
+
+<!-- Add tree view for H.S. code -->
+<record id="product_intrastat_code_tree" model="ir.ui.view">
+    <field name="name">intrastat.product.intrastat.code.tree</field>
+    <field name="model">report.intrastat.code</field>
+    <field name="arch" type="xml">
+        <tree string="Intrastat Codes">
+            <field name="name"/>
+            <field name="intrastat_code" />
+            <field name="intrastat_uom_id"/>
+            <field name="description"/>
+        </tree>
+    </field>
+</record>
+
+<!-- Add form view for H.S. code -->
+<record id="product_intrastat_code_form" model="ir.ui.view">
+    <field name="name">fr.intrastat.product.intrastat.code.form</field>
+    <field name="model">report.intrastat.code</field>
+    <field name="arch" type="xml">
+        <form string="Intrastat Code">
+            <group name="main">
+                <field name="name" />
+                <field name="intrastat_code"/>
+                <field name="intrastat_uom_id"/>
+                <field name="description" />
+                <field name="active"/>
+            </group>
+        </form>
+    </field>
+</record>
+
+<!-- Action for H.S. code -->
+<record id="product_intrastat_code_act" model="ir.actions.act_window">
+    <field name="name">Intrastat Code</field>
+    <field name="res_model">report.intrastat.code</field>
+    <field name="view_mode">tree,form</field>
+</record>
+
+<!-- Menu entry for H.S. code -->
+<menuitem id="product_intrastat_code_menu"
+    action="product_intrastat_code_act"
+    parent="product.prod_config_main" />
+
+</data>
+</openerp>

=== added directory 'intrastat_product/security'
=== added file 'intrastat_product/security/ir.model.access.csv'
--- intrastat_product/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ intrastat_product/security/ir.model.access.csv	2014-12-13 00:30:09 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_intrastat_code_sale_manager,Full access on report.intrastat.code to sale manager,model_report_intrastat_code,base.group_sale_manager,1,1,1,1
+access_report_intrastat_code_employee,Read access on report.intrastat.code to employee,model_report_intrastat_code,base.group_user,1,0,0,0

=== modified file 'l10n_fr_intrastat_product/__openerp__.py'
--- l10n_fr_intrastat_product/__openerp__.py	2014-07-03 22:18:44 +0000
+++ l10n_fr_intrastat_product/__openerp__.py	2014-12-13 00:30:09 +0000
@@ -23,7 +23,7 @@
 
 {
     'name': 'France Intrastat Product',
-    'version': '1.1',
+    'version': '1.2',
     'category': 'Localisation/Report Intrastat',
     'license': 'AGPL-3',
     'summary': 'Module for Intrastat product reporting (DEB) for France',
@@ -35,7 +35,7 @@
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
-    'depends': ['intrastat_base', 'sale_stock', 'purchase', 'l10n_fr_siret'],
+    'depends': ['intrastat_product', 'sale_stock', 'purchase', 'l10n_fr_siret'],
     'data': [
         'security/intrastat_product_security.xml',
         'security/ir.model.access.csv',
@@ -51,6 +51,5 @@
     ],
     'demo': ['intrastat_demo.xml'],
     'installable': True,
-    'active': False,
     'application': True,
 }

=== modified file 'l10n_fr_intrastat_product/intrastat_demo.xml'
--- l10n_fr_intrastat_product/intrastat_demo.xml	2014-10-30 12:30:41 +0000
+++ l10n_fr_intrastat_product/intrastat_demo.xml	2014-12-13 00:30:09 +0000
@@ -21,84 +21,10 @@
     <field name="country_id" ref="base.fr"/>
 </record>
 
-<record id="84715000" model="report.intrastat.code">
-    <field name="name">84715000</field>
-    <field name="description">Automatic data-processing machines (computers)</field>
-    <field name="intrastat_code">84715000</field>
-    <field name="intrastat_uom_id" ref="product.product_uom_unit"/>
-</record>
-
-<record id="84717050" model="report.intrastat.code">
-    <field name="name">84717050</field>
-    <field name="description">Storage units</field>
-    <field name="intrastat_code">84717050</field>
-    <field name="intrastat_uom_id" ref="product.product_uom_unit"/>
-</record>
-
-<record id="85340090" model="report.intrastat.code">
-    <field name="name">85340090</field>
-    <field name="description">Printed circuits</field>
-    <field name="intrastat_code">85340090</field>
-</record>
-
 <record id="product.product_uom_unit" model="product.uom">
     <field name="intrastat_label">PCE</field>
 </record>
 
-<record id="product.product_product_3" model="product.product">
-    <field name="country_id" ref="base.tw" />
-    <field name="intrastat_id" ref="84715000" />
-    <field name="weight_net">5</field>
-</record>
-
-<record id="product.product_product_4" model="product.product">
-    <field name="country_id" ref="base.cn" />
-    <field name="intrastat_id" ref="84715000" />
-    <field name="weight_net">6</field>
-</record>
-
-<record id="product.product_product_5" model="product.product">
-    <field name="country_id" ref="base.cn" />
-    <field name="intrastat_id" ref="84715000" />
-    <field name="weight_net">6</field>
-</record>
-
-<record id="product.product_product_25" model="product.product">
-    <field name="country_id" ref="base.be" />
-    <field name="intrastat_id" ref="84715000" />
-    <field name="weight_net">2</field>
-</record>
-
-<record id="product.product_product_17" model="product.product">
-    <field name="country_id" ref="base.sg" />
-    <field name="intrastat_id" ref="84717050" />
-    <field name="weight_net">0.5</field>
-</record>
-
-<record id="product.product_product_18" model="product.product">
-    <field name="country_id" ref="base.sg" />
-    <field name="intrastat_id" ref="84717050" />
-    <field name="weight_net">0.5</field>
-</record>
-
-<record id="product.product_product_19" model="product.product">
-    <field name="country_id" ref="base.sg" />
-    <field name="intrastat_id" ref="84717050" />
-    <field name="weight_net">0.5</field>
-</record>
-
-<record id="product.product_product_20" model="product.product">
-    <field name="country_id" ref="base.tw" />
-    <field name="intrastat_id" ref="85340090" />
-    <field name="weight_net">0.7</field>
-</record>
-
-<record id="product.product_product_21" model="product.product">
-    <field name="country_id" ref="base.tw" />
-    <field name="intrastat_id" ref="85340090" />
-    <field name="weight_net">0.8</field>
-</record>
-
 <!-- Elec import is the fiscal rep of Asustek -->
 <record id="base.res_partner_1" model="res.partner">
     <field name="intrastat_fiscal_representative" ref="base.res_partner_2" />

=== modified file 'l10n_fr_intrastat_product/intrastat_product.py'
--- l10n_fr_intrastat_product/intrastat_product.py	2014-10-30 12:30:41 +0000
+++ l10n_fr_intrastat_product/intrastat_product.py	2014-12-13 00:30:09 +0000
@@ -32,15 +32,15 @@
 logger = logging.getLogger(__name__)
 
 
-class report_intrastat_product(orm.Model):
-    _name = "report.intrastat.product"
-    _description = "Intrastat Product"
+class l10n_fr_report_intrastat_product(orm.Model):
+    _name = "l10n.fr.report.intrastat.product"
+    _description = "Intrastat Product for France (DEB)"
     _rec_name = "start_date"
     _inherit = ['mail.thread']
     _order = "start_date desc, type"
     _track = {
         'state': {
-            'l10n_fr_intrastat_product.declaration_done': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
+            'l10n_fr_intrastat_product.l10n_fr_declaration_done': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
             }
         }
 
@@ -53,7 +53,7 @@
             'intrastat_line_ids': False,
             'state': 'draft',
         })
-        return super(report_intrastat_product, self).copy(cr, uid, id, default=default, context=context)
+        return super(l10n_fr_report_intrastat_product, self).copy(cr, uid, id, default=default, context=context)
 
 
     def _compute_numbers(self, cr, uid, ids, name, arg, context=None):
@@ -73,7 +73,7 @@
         return self.pool.get('report.intrastat.common')._compute_dates(cr, uid, ids, self, context=context)
 
     def _get_intrastat_from_product_line(self, cr, uid, ids, context=None):
-        return self.pool.get('report.intrastat.product').search(cr, uid, [('intrastat_line_ids', 'in', ids)], context=context)
+        return self.pool.get('l10n.fr.report.intrastat.product').search(cr, uid, [('intrastat_line_ids', 'in', ids)], context=context)
 
     _columns = {
         'company_id': fields.many2one('res.company', 'Company', required=True,
@@ -84,13 +84,13 @@
         'end_date': fields.function(_compute_dates, type='date',
             string='End date', multi='intrastat-product-dates', readonly=True,
             store={
-                'report.intrastat.product': (lambda self, cr, uid, ids, c={}: ids, ['start_date'], 10),
+                'l10n.fr.report.intrastat.product': (lambda self, cr, uid, ids, c={}: ids, ['start_date'], 10),
                 },
             help="End date for the declaration. Is the last day of the month of the start date."),
         'year_month': fields.function(_compute_dates, type='char',
              string='Month', multi='intrastat-product-dates', readonly=True,
              track_visibility='always', store={
-                'report.intrastat.product': (lambda self, cr, uid, ids, c={}: ids, ['start_date'], 10)
+                'l10n.fr.report.intrastat.product': (lambda self, cr, uid, ids, c={}: ids, ['start_date'], 10)
                 },
             help="Year and month of the declaration."),
         'type': fields.selection([
@@ -104,24 +104,24 @@
             ], 'Obligation level', required=True, track_visibility='always',
             states={'done': [('readonly', True)]},
             help="Your obligation level for a certain type of DEB (Import or Export) depends on the total value that you export or import per year. Note that the obligation level 'Simplified' doesn't exist for an Import DEB."),
-        'intrastat_line_ids': fields.one2many('report.intrastat.product.line',
+        'intrastat_line_ids': fields.one2many('l10n.fr.report.intrastat.product.line',
             'parent_id', 'Report intrastat product lines',
             states={'done': [('readonly', True)]}),
         'num_lines': fields.function(_compute_numbers, type='integer',
             multi='numbers', string='Number of lines', store={
-                'report.intrastat.product.line': (_get_intrastat_from_product_line, ['parent_id'], 20),
+                'l10n.fr.report.intrastat.product.line': (_get_intrastat_from_product_line, ['parent_id'], 20),
             },
             track_visibility='always', help="Number of lines in this declaration."),
         'total_amount': fields.function(_compute_numbers,
             digits_compute=dp.get_precision('Account'), multi='numbers',
             string='Total amount', store={
-                'report.intrastat.product.line': (_get_intrastat_from_product_line, ['amount_company_currency', 'parent_id'], 20),
+                'l10n.fr.report.intrastat.product.line': (_get_intrastat_from_product_line, ['amount_company_currency', 'parent_id'], 20),
             },
             help="Total amount in company currency of the declaration."),
         'total_fiscal_amount': fields.function(_compute_total_fiscal_amount,
             digits_compute=dp.get_precision('Account'),
             string='Total fiscal amount', track_visibility='always', store={
-                'report.intrastat.product.line': (_get_intrastat_from_product_line, ['amount_company_currency', 'parent_id'], 20),
+                'l10n.fr.report.intrastat.product.line': (_get_intrastat_from_product_line, ['amount_company_currency', 'parent_id'], 20),
             },
             help="Total fiscal amount in company currency of the declaration. This is the total amount that is displayed on the Prodouane website."),
         'currency_id': fields.related('company_id', 'currency_id', readonly=True,
@@ -135,12 +135,12 @@
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
-        res = super(report_intrastat_product, self).default_get(
+        res = super(l10n_fr_report_intrastat_product, self).default_get(
             cr, uid, fields_list, context=context)
         if not res:
             res = {}
         company_id = self.pool['res.company']._company_default_get(
-            cr, uid, 'report.intrastat.product', context=context)
+            cr, uid, 'l10n.fr.report.intrastat.product', context=context)
         company = self.pool['res.company'].browse(
             cr, uid, company_id, context=context)
         if company.import_obligation_level == 'none':
@@ -204,7 +204,7 @@
         assert len(ids) == 1, "Only one ID accepted"
         if context is None:
             context = {}
-        line_obj = self.pool['report.intrastat.product.line']
+        line_obj = self.pool['l10n.fr.report.intrastat.product.line']
 
         data_obj = self.pool['ir.model.data']
         uom_categ_model, weight_uom_categ_id = data_obj.get_object_reference(
@@ -320,9 +320,9 @@
                 # The origin country should only be declated on Import
                 if intrastat.type == 'export':
                     product_country_origin_id_to_write = False
-                elif line.product_id.country_id:
+                elif line.product_id.origin_country_id:
                 # If we have the country of origin on the product -> take it
-                    product_country_origin_id_to_write = line.product_id.country_id.id
+                    product_country_origin_id_to_write = line.product_id.origin_country_id.id
                 else:
                     # If we don't, look on the product supplier info
                     origin_partner_id = parent_values.get('origin_partner_id', False)
@@ -500,7 +500,7 @@
         assert len(ids) == 1, "Only one ID accepted"
         intrastat = self.browse(cr, uid, ids[0], context=context)
         self.pool.get('report.intrastat.common')._check_generate_lines(cr, uid, intrastat, context=context)
-        line_obj = self.pool.get('report.intrastat.product.line')
+        line_obj = self.pool.get('l10n.fr.report.intrastat.product.line')
         line_remove_ids = line_obj.search(cr, uid, [('parent_id', '=', ids[0]), ('invoice_id', '!=', False)], context=context)
         if line_remove_ids:
             line_obj.unlink(cr, uid, line_remove_ids, context=context)
@@ -793,13 +793,13 @@
         return True
 
 
-class report_intrastat_product_line(orm.Model):
-    _name = "report.intrastat.product.line"
-    _description = "Intrastat Product Lines"
+class l10n_fr_report_intrastat_product_line(orm.Model):
+    _name = "l10n.fr.report.intrastat.product.line"
+    _description = "Intrastat Product Lines for France"
     _order = 'id'
 
     _columns = {
-        'parent_id': fields.many2one('report.intrastat.product', 'Intrastat product ref', ondelete='cascade', readonly=True),
+        'parent_id': fields.many2one('l10n.fr.report.intrastat.product', 'Intrastat product ref', ondelete='cascade', readonly=True),
         'company_id': fields.related('parent_id', 'company_id', type='many2one', relation='res.company', string="Company", readonly=True),
         'type': fields.related('parent_id', 'type', type='char', string="Type", readonly=True),
         'company_currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', string="Company currency", readonly=True),
@@ -830,7 +830,7 @@
             digits_compute=dp.get_precision('Account'), readonly=True,
             help="Amount of product value in invoice currency ; it is the amount of the invoice line or group of invoice lines."),
         'invoice_currency_id': fields.many2one('res.currency', "Invoice currency", readonly=True),
-        'product_country_origin_id': fields.many2one('res.country', 'Product country of origin'),
+        'product_country_origin_id': fields.many2one('res.country', 'Product country of origin'),  # TODO rename product_origin_country_id
         'product_country_origin_code': fields.related('product_country_origin_id', 'code', type='char', relation='res.country', string='Product country of origin', readonly=True),
         'transport': fields.selection([
             (1, '1. Transport maritime'),

=== modified file 'l10n_fr_intrastat_product/intrastat_product_reminder.xml'
--- l10n_fr_intrastat_product/intrastat_product_reminder.xml	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_product/intrastat_product_reminder.xml	2014-12-13 00:30:09 +0000
@@ -9,7 +9,7 @@
 <openerp>
 
 <data noupdate="1"> <!-- noupdate = 1 for the 'active' field -->
-<record id="intrastat_product_cron" model="ir.cron">
+<record id="l10n_fr_intrastat_product_cron" model="ir.cron">
     <field name="name">Intrastat Product Reminder</field>
     <field name="active" eval="False"/>
     <field name="user_id" ref="base.user_root"/>
@@ -17,7 +17,7 @@
     <field name="interval_type">months</field>
     <field name="numbercall">-1</field> <!-- don't limit the number of calls -->
     <field name="doall" eval="False"/>
-    <field name="model" eval="'report.intrastat.product'"/>
+    <field name="model" eval="'l10n.fr.report.intrastat.product'"/>
     <field name="function" eval="'_scheduler_reminder'" />
     <field name="args" eval="'()'"/>
 </record>
@@ -25,9 +25,9 @@
 </data>
 <data>
 
-<record id="intrastat_product_reminder_email_template" model="email.template">
+<record id="l10n_fr_intrastat_product_reminder_email_template" model="email.template">
     <field name="name">Intrastat Product Reminder</field>
-    <field name="model_id" ref="l10n_fr_intrastat_product.model_report_intrastat_product"/>
+    <field name="model_id" ref="l10n_fr_intrastat_product.model_l10n_fr_report_intrastat_product"/>
     <field name="email_from">${object.company_id.email or '[e-mail]'}</field>
     <field name="email_to">${object.company_id.intrastat_email_list}</field>
     <field name="subject">${object.type} Intrastat Product ${object.year_month} for ${object.company_id.name}</field>

=== modified file 'l10n_fr_intrastat_product/intrastat_product_view.xml'
--- l10n_fr_intrastat_product/intrastat_product_view.xml	2014-07-03 22:18:44 +0000
+++ l10n_fr_intrastat_product/intrastat_product_view.xml	2014-12-13 00:30:09 +0000
@@ -10,9 +10,9 @@
 <data>
 
 <!-- Form view of DEB, with integrated form+tree view of lines -->
-<record id="intrastat_product_form" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.form</field>
-    <field name="model">report.intrastat.product</field>
+<record id="l10n_fr_intrastat_product_form" model="ir.ui.view">
+    <field name="name">l10n.fr.intrastat.product.form</field>
+    <field name="model">l10n.fr.report.intrastat.product</field>
     <field name="arch" type="xml">
         <form string="Intrastat Product">
             <header>
@@ -108,9 +108,9 @@
 </record>
 
 <!-- Tree view for DEB -->
-<record id="intrastat_product_tree" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.tree</field>
-    <field name="model">report.intrastat.product</field>
+<record id="l10n_fr_intrastat_product_tree" model="ir.ui.view">
+    <field name="name">l10n.fr.intrastat.product.tree</field>
+    <field name="model">l10n.fr.report.intrastat.product</field>
     <field name="arch" type="xml">
         <tree string="Intrastat Product" colors="blue:state=='draft'">
             <field name="year_month" />
@@ -128,9 +128,9 @@
 
 
 <!-- Search view for DEB -->
-<record id="intrastat_product_search" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.search</field>
-    <field name="model">report.intrastat.product</field>
+<record id="l10n_fr_intrastat_product_search" model="ir.ui.view">
+    <field name="name">l10n.fr.intrastat.product.search</field>
+    <field name="model">l10n.fr.report.intrastat.product</field>
     <field name="arch" type="xml">
         <search string="Search Intrastat Products">
             <filter name="import" string="Import" domain="[('type', '=', 'import')]" />
@@ -146,9 +146,9 @@
 </record>
 
 <!-- Graph view for DEB -->
-<record id="intrastat_product_graph" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.graph</field>
-    <field name="model">report.intrastat.product</field>
+<record id="l10n_fr_intrastat_product_graph" model="ir.ui.view">
+    <field name="name">l10n.fr.intrastat.product.graph</field>
+    <field name="model">l10n.fr.report.intrastat.product</field>
     <field name="arch" type="xml">
         <graph string="Intrastat Product" type="bar">
             <field name="start_date" type="row"/>
@@ -159,21 +159,23 @@
 </record>
 
 <!-- Action related -->
-<record id="intrastat_product_tree_action" model="ir.actions.act_window">
+<record id="l10n_fr_intrastat_product_tree_action" model="ir.actions.act_window">
     <field name="name">Intrastat Product</field>
-    <field name="res_model">report.intrastat.product</field>
+    <field name="res_model">l10n.fr.report.intrastat.product</field>
     <field name="view_mode">tree,form,graph</field>
 </record>
 
 
 <!-- Intrastat product menu -->
-<menuitem id="intrastat_product_menu" parent="intrastat_base.menu_intrastat_base_root" action="intrastat_product_tree_action" />
+<menuitem id="l10n_fr_intrastat_product_menu"
+    parent="intrastat_base.menu_intrastat_base_root"
+    action="l10n_fr_intrastat_product_tree_action" />
 
 
 <!-- Notification in the chatter -->
-<record id="declaration_done" model="mail.message.subtype">
+<record id="l10n_fr_declaration_done" model="mail.message.subtype">
     <field name="name">Intrastat Product Validated</field>
-    <field name="res_model">report.intrastat.product</field>
+    <field name="res_model">l10n.fr.report.intrastat.product</field>
     <field name="default" eval="False"/>
     <field name="description">Intrastat Product Validated</field>
 </record>

=== added directory 'l10n_fr_intrastat_product/migrations'
=== added directory 'l10n_fr_intrastat_product/migrations/8.0.1.2'
=== added file 'l10n_fr_intrastat_product/migrations/8.0.1.2/pre-migration.py'
--- l10n_fr_intrastat_product/migrations/8.0.1.2/pre-migration.py	1970-01-01 00:00:00 +0000
+++ l10n_fr_intrastat_product/migrations/8.0.1.2/pre-migration.py	2014-12-13 00:30:09 +0000
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Report intrastat product module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    cr.execute(
+        'ALTER SEQUENCE "report_intrastat_product_line_id_seq" RENAME TO '
+        '"l10n_fr_report_intrastat_product_line_id_seq"')
+
+    cr.execute(
+        'ALTER TABLE "report_intrastat_product_line" RENAME TO '
+        '"l10n_fr_report_intrastat_product_line"')
+
+    cr.execute(
+        "UPDATE ir_model SET model='l10n.fr.report.intrastat.product.line' "
+        "WHERE model='report.intrastat.product.line'")
+
+    cr.execute(
+        "UPDATE ir_model_fields SET relation='l10n.fr.report.intrastat.product.line' "
+        "WHERE relation='report.intrastat.product.line'")
+
+    cr.execute(
+        'ALTER SEQUENCE "report_intrastat_product_id_seq" RENAME TO '
+        '"l10n_fr_report_intrastat_product_id_seq"')
+
+    cr.execute(
+        'ALTER TABLE "report_intrastat_product" RENAME TO '
+        '"l10n_fr_report_intrastat_product"')
+
+    cr.execute(
+        "UPDATE ir_model SET model='l10n.fr.report.intrastat.product' "
+        "WHERE model='report.intrastat.product'")
+
+    cr.execute(
+        "UPDATE ir_model_fields SET relation='l10n.fr.report.intrastat.product' "
+        "WHERE relation='report.intrastat.product'")

=== modified file 'l10n_fr_intrastat_product/product.py'
--- l10n_fr_intrastat_product/product.py	2014-10-30 12:30:41 +0000
+++ l10n_fr_intrastat_product/product.py	2014-12-13 00:30:09 +0000
@@ -21,158 +21,47 @@
 #
 ##############################################################################
 
-from openerp.osv import orm, fields
-from openerp.tools.translate import _
-
-
-class report_intrastat_code(orm.Model):
-    _name = "report.intrastat.code"
-    _description = "Intrastat code"
-    _order = "name"
-    _columns = {
-        'name': fields.char(
-            'H.S. code', size=16, required=True,
-            help="Full lenght H.S. code"),
-        'description': fields.char(
-            'Description', size=255,
-            help='Short text description of the H.S. category'),
-        'intrastat_code': fields.char(
-            'Intrastat code for DEB', size=9, required=True,
-            help="H.S. code used for the DEB in France. Must be part "
-            "of the 'Nomenclature combinée' (NC) with 8 digits with "
-            "sometimes a 9th digit for the "
-            "'Nomenclature Générale des Produits' (NGP)."),
-        'intrastat_uom_id': fields.many2one(
-            'product.uom', 'UoM for intrastat product report',
-            help="Select the unit of measure if one is required for "
-            "this particular intrastat code (other than the weight in Kg). "
-            "If no particular unit of measure is required, leave empty."),
-    }
-
-    def name_get(self, cr, uid, ids, context=None):
-        res = []
-        for code in self.read(
-                cr, uid, ids, ['name', 'description'], context=context):
-            display_name = code['name']
-            if code['description']:
-                display_name = '%s %s' % (display_name, code['description'])
-            res.append((code['id'], display_name))
-        return res
-
-    def _intrastat_code(self, cr, uid, ids):
-        for intrastat_code_to_check in self.read(
-                cr, uid, ids, ['intrastat_code']):
-            if intrastat_code_to_check['intrastat_code']:
-                if (not intrastat_code_to_check['intrastat_code'].isdigit()
-                        or len(intrastat_code_to_check['intrastat_code'])
-                        not in (8, 9)):
-                    return False
-        return True
-
-    def _hs_code(self, cr, uid, ids):
-        for code_to_check in self.read(cr, uid, ids, ['name']):
-            if code_to_check['name']:
-                if not code_to_check['name'].isdigit():
-                    return False
-        return True
-
-    _constraints = [
-        (
-            _intrastat_code,
-            "The 'Intrastat code for DEB' should have exactly 8 or 9 digits.",
-            ['intrastat_code']
-        ),
-        (
-            _hs_code,
-            "'Intrastat code' should only contain digits.",
-            ['name']
-        ),
-    ]
-
-
-class product_uom(orm.Model):
+from openerp import models, fields, api, _
+from openerp.exceptions import ValidationError
+
+
+class ProductUom(models.Model):
     _inherit = "product.uom"
-    _columns = {
-        'intrastat_label': fields.char(
-            'Intrastat label', size=12,
-            help="Label used in the XML file export of the Intrastat "
-            "product report for this unit of measure."),
-        }
-
-
-class product_template(orm.Model):
-    _inherit = "product.template"
-    _columns = {
-        'intrastat_id': fields.many2one(
-            'report.intrastat.code', 'Intrastat code',
-            help="Code from the Harmonised System. Nomenclature is "
-            "available from the World Customs Organisation, see "
-            "http://www.wcoomd.org/. Some countries have made their own "
-            "extensions to this nomenclature."),
-        'country_id': fields.many2one(
-            'res.country', 'Country of origin',
-            help="Country of origin of the product i.e. product "
-            "'made in ____'. If you have different countries of origin "
-            "depending on the supplier from which you purchased the product, "
-            "leave this field empty and use the equivalent field on the "
-            "'product supplier info' form."),
-        # This field should be called origin_country_id, but it's named
-        # country_id to keep "compatibility with OpenERP users that used
-        # the "report_intrastat" module
-        }
-
-
-class product_category(orm.Model):
-    _inherit = "product.category"
-    _columns = {
-        'intrastat_id': fields.many2one(
-            'report.intrastat.code', 'Intrastat code',
-            help="Code from the Harmonised System. If this code is not "
-            "set on the product itself, it will be read here, on the "
-            "related product category."),
-    }
-
-
-class product_supplierinfo(orm.Model):
+
+    intrastat_label = fields.Char(
+        string='Intrastat Label', size=12,
+        help="Label used in the XML file export of the Intrastat "
+        "Product Report for this unit of measure.")
+
+
+class ProductSupplierinfo(models.Model):
     _inherit = "product.supplierinfo"
-    _columns = {
-        'origin_country_id': fields.many2one(
-            'res.country', 'Country of origin',
-            help="Country of origin of the product "
-            "(i.e. product 'made in ____') when purchased from this supplier. "
-            "This field is used only when the equivalent field on the product "
-            "form is empty."),
-        }
-
-    def _same_supplier_same_origin(self, cr, uid, ids):
+
+    origin_country_id = fields.Many2one(
+        'res.country', string='Country of Origin',
+        help="Country of origin of the product "
+        "(i.e. product 'made in ____') when purchased from this supplier. "
+        "This field is used only when the equivalent field on the product "
+        "form is empty.")
+
+    @api.constrains('origin_country_id', 'name', 'product_tmpl_id')
+    def _same_supplier_same_origin(self):
         """Products from the same supplier should have the same origin"""
-        for supplierinfo in self.browse(cr, uid, ids):
-            country_origin_id = supplierinfo.origin_country_id.id
-            # Search for same supplier and same product
-            same_product_same_supplier_ids = self.search(
-                cr, uid, [
-                    ('product_id', '=', supplierinfo.product_id.id),
-                    ('name', '=', supplierinfo.name.id)])
+        # Search for same supplier and same product tmpl
+        same_product_same_suppliers = self.search([
+            ('product_tmpl_id', '=', self.product_tmpl_id.id),
+            ('name', '=', self.name.id)])
             # 'name' on product_supplierinfo is a many2one to res.partner
-            for supplieri in self.browse(
-                    cr, uid, same_product_same_supplier_ids):
-                if country_origin_id != supplieri.origin_country_id.id:
-                    raise orm.except_orm(
-                        _('Error !'),
-                        _("For a particular product, all supplier info "
-                            "entries with the same supplier should have the "
-                            "same country of origin. But, for product '%s' "
-                            "with supplier '%s', there is one entry with "
-                            "country of origin '%s' and another entry with "
-                            "country of origin '%s'.")
-                        % (supplieri.product_id.name,
-                            supplieri.name.name,
-                            supplierinfo.origin_country_id.name,
-                            supplieri.origin_country_id.name))
-        return True
-
-    _constraints = [(
-        _same_supplier_same_origin,
-        "Wrong configuration of the supplier information",
-        ['origin_country_id', 'name', 'product_id']
-        )]
+        for supplieri in same_product_same_suppliers:
+            if self.origin_country_id != supplieri.origin_country_id:
+                raise ValidationError(
+                    _("For a particular product, all supplier info "
+                        "entries with the same supplier should have the "
+                        "same country of origin. But, for product '%s' "
+                        "with supplier '%s', there is one entry with "
+                        "country of origin '%s' and another entry with "
+                        "country of origin '%s'.")
+                    % (self.product_tmpl_id.name,
+                        self.name.name,
+                        self.origin_country_id.name,
+                        supplieri.origin_country_id.name))

=== modified file 'l10n_fr_intrastat_product/product_view.xml'
--- l10n_fr_intrastat_product/product_view.xml	2014-07-03 22:15:06 +0000
+++ l10n_fr_intrastat_product/product_view.xml	2014-12-13 00:30:09 +0000
@@ -9,19 +9,6 @@
 <openerp>
 <data>
 
-<!-- Add fields on product.template view -->
-<record id="product_template_form_view" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.template.form</field>
-    <field name="model">product.template</field>
-    <field name="inherit_id" ref="intrastat_base.product_template_form_view" />
-    <field name="arch" type="xml">
-        <field name="exclude_from_intrastat" position="before">
-            <field name="intrastat_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
-            <field name="country_id" attrs="{'invisible': [('type', '=', 'service')]}"/>
-        </field>
-    </field>
-</record>
-
 <!-- Add field on product.supplierinfo -->
 <record id="product_supplierinfo_form_view" model="ir.ui.view">
     <field name="name">fr.intrastat.product.product.supplierinfo.form</field>
@@ -34,89 +21,19 @@
     </field>
 </record>
 
-<!-- Add intrastat_id on Product category -->
-<record id="product_category_form_view" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.category.form</field>
-    <field name="model">product.category</field>
-    <field name="inherit_id" ref="product.product_category_form_view"/>
-    <field name="arch" type="xml">
-        <xpath expr="//group[@name='parent']" position="inside">
-            <group name="intrastat" string="Intrastat Properties" colspan="2">
-                <field name="intrastat_id" />
-            </group>
-        </xpath>
-    </field>
-</record>
-
 <!-- Add the field intrastat_label on product UoM -->
 <record id="product_uom_form_view" model="ir.ui.view">
     <field name="name">fr.intrastat.product.uom.form</field>
     <field name="model">product.uom</field>
     <field name="inherit_id" ref="product.product_uom_form_view" />
     <field name="arch" type="xml">
-        <data>
-            <field name="category_id" position="after">
-                <field name="intrastat_label" groups="l10n_fr_intrastat_product.group_detailed_intrastat_product"/>
-            </field>
-        </data>
-    </field>
-</record>
-
-<!-- Add search view for H.S. code -->
-<record id="product_intrastat_code_search" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.intrastat.code.search</field>
-    <field name="model">report.intrastat.code</field>
-    <field name="arch" type="xml">
-        <search string="Search Intrastat Code">
-            <field name="name" />
-            <field name="description" />
-        </search>
-    </field>
-</record>
-
-
-<!-- Add tree view for H.S. code -->
-<record id="product_intrastat_code_tree" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.intrastat.code.tree</field>
-    <field name="model">report.intrastat.code</field>
-    <field name="arch" type="xml">
-        <tree string="Intrastat code">
-            <field name="name" />
-            <field name="intrastat_code" />
-            <field name="description" />
-            <field name="intrastat_uom_id" groups="l10n_fr_intrastat_product.group_detailed_intrastat_product"/>
-        </tree>
-    </field>
-</record>
-
-
-<!-- Add form view for H.S. code -->
-<record id="product_intrastat_code_form" model="ir.ui.view">
-    <field name="name">fr.intrastat.product.intrastat.code.form</field>
-    <field name="model">report.intrastat.code</field>
-    <field name="arch" type="xml">
-        <form string="Intrastat code">
-            <field name="name" />
-            <field name="intrastat_code" />
-            <field name="description" />
-            <field name="intrastat_uom_id" />
-        </form>
-    </field>
-</record>
-
-<!-- Action for H.S. code -->
-<record id="product_intrastat_code_act" model="ir.actions.act_window">
-    <field name="name">Intrastat Code</field>
-    <field name="res_model">report.intrastat.code</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<!-- Menu entry for H.S. code -->
-<menuitem id="product_intrastat_code_menu" action="product_intrastat_code_act" parent="product.prod_config_main" />
-
-<menuitem id="product_intrastat_code_menu_purchase" action="product_intrastat_code_act" parent="purchase.menu_product_in_config_purchase" />
-
-<menuitem id="product_intrastat_code_menu_stock" action="product_intrastat_code_act" parent="stock.menu_product_in_config_stock" />
+        <field name="category_id" position="after">
+            <field name="intrastat_label"
+                groups="l10n_fr_intrastat_product.group_detailed_intrastat_product"/>
+        </field>
+    </field>
+</record>
+
 
 </data>
 </openerp>

=== modified file 'l10n_fr_intrastat_product/security/intrastat_product_security.xml'
--- l10n_fr_intrastat_product/security/intrastat_product_security.xml	2014-02-01 22:43:05 +0000
+++ l10n_fr_intrastat_product/security/intrastat_product_security.xml	2014-12-13 00:30:09 +0000
@@ -15,14 +15,14 @@
 
 <record id="fr_intrastat_product_rule" model="ir.rule">
     <field name="name">Intrastat Product multi-company</field>
-    <field name="model_id" ref="model_report_intrastat_product"/>
+    <field name="model_id" ref="model_l10n_fr_report_intrastat_product"/>
     <field name="global" eval="True"/>
     <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
 </record>
 
 <record id="fr_intrastat_product_line_rule" model="ir.rule">
     <field name="name">Intrastat Product Line multi-company</field>
-    <field name="model_id" ref="model_report_intrastat_product_line"/>
+    <field name="model_id" ref="model_l10n_fr_report_intrastat_product_line"/>
     <field name="global" eval="True"/>
     <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
 </record>

=== modified file 'l10n_fr_intrastat_product/security/ir.model.access.csv'
--- l10n_fr_intrastat_product/security/ir.model.access.csv	2011-04-26 07:28:46 +0000
+++ l10n_fr_intrastat_product/security/ir.model.access.csv	2014-12-13 00:30:09 +0000
@@ -1,7 +1,5 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_intrastat_type","report.intrastat.type","model_report_intrastat_type","account.group_account_manager",1,1,1,1
-"access_report_intrastat_code","report.intrastat.code finance manager","model_report_intrastat_code","account.group_account_manager",1,1,1,1
-"access_report_intrastat_code_product_manager","report.intrastat.code product manager","model_report_intrastat_code","account.group_account_manager",1,1,1,1
-"access_report_intrastat_code_employee","report.intrastat.code read for employee","model_report_intrastat_code","base.group_user",1,0,0,0
-"access_report_intrastat_product","report.intrastat.product","model_report_intrastat_product","account.group_account_manager",1,1,1,1
-"access_report_intrastat_product_line","report.intrastat.product.line","model_report_intrastat_product_line","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_report_intrastat_type,report.intrastat.type,model_report_intrastat_type,account.group_account_manager,1,1,1,1
+access_report_intrastat_code,report.intrastat.code finance manager,intrastat_product.model_report_intrastat_code,account.group_account_manager,1,1,1,1
+access_report_intrastat_product,report.intrastat.product,model_l10n_fr_report_intrastat_product,account.group_account_manager,1,1,1,1
+access_report_intrastat_product_line,report.intrastat.product.line,model_l10n_fr_report_intrastat_product_line,account.group_account_manager,1,1,1,1

=== modified file 'l10n_fr_intrastat_service/__openerp__.py'
--- l10n_fr_intrastat_service/__openerp__.py	2014-02-01 22:43:05 +0000
+++ l10n_fr_intrastat_service/__openerp__.py	2014-12-13 00:30:09 +0000
@@ -23,7 +23,7 @@
 
 {
     'name': 'France Intrastat Service',
-    'version': '1.1',
+    'version': '1.2',
     'category': 'Localisation/Report Intrastat',
     'license': 'AGPL-3',
     'summary': 'Module for Intrastat service reporting (DES) for France',
@@ -46,6 +46,5 @@
     ],
     'demo': [],
     'installable': True,
-    'active': False,
     'application': True,
 }

=== modified file 'l10n_fr_intrastat_service/intrastat_service.py'
--- l10n_fr_intrastat_service/intrastat_service.py	2014-04-14 17:41:39 +0000
+++ l10n_fr_intrastat_service/intrastat_service.py	2014-12-13 00:30:09 +0000
@@ -33,15 +33,15 @@
 logger = logging.getLogger(__name__)
 
 
-class report_intrastat_service(orm.Model):
-    _name = "report.intrastat.service"
+class l10n_fr_report_intrastat_service(orm.Model):
+    _name = "l10n.fr.report.intrastat.service"
     _order = "start_date desc"
     _rec_name = "start_date"
     _inherit = ['mail.thread']
     _description = "Intrastat Service"
     _track = {
         'state': {
-            'l10n_fr_intrastat_service.declaration_done':
+            'l10n_fr_intrastat_service.l10n_fr_declaration_done':
             lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
             }
         }
@@ -56,7 +56,7 @@
             'intrastat_line_ids': False,
             'state': 'draft',
         })
-        return super(report_intrastat_service, self).copy(
+        return super(l10n_fr_report_intrastat_service, self).copy(
             cr, uid, id, default=default, context=context)
 
     def _compute_numbers(self, cr, uid, ids, name, arg, context=None):
@@ -68,7 +68,7 @@
             cr, uid, ids, self, context=context)
 
     def _get_intrastat_from_service_line(self, cr, uid, ids, context=None):
-        return self.pool['report.intrastat.service'].search(
+        return self.pool['l10n.fr.report.intrastat.service'].search(
             cr, uid, [('intrastat_line_ids', 'in', ids)], context=context)
 
     _columns = {
@@ -85,7 +85,7 @@
             _compute_dates, type='date',
             string='End date', multi='intrastat-service-dates', readonly=True,
             store={
-                'report.intrastat.service': (
+                'l10n.fr.report.intrastat.service': (
                     lambda self, cr, uid, ids, c={}: ids, ['start_date'], 20),
                 },
             help="End date for the declaration. Must be the last day of the "
@@ -94,19 +94,19 @@
             _compute_dates, type='char',
             string='Month', multi='intrastat-service-dates', readonly=True,
             track_visibility='always', store={
-                'report.intrastat.service': (
+                'l10n.fr.report.intrastat.service': (
                     lambda self, cr, uid, ids, c={}: ids, ['start_date'], 20),
                 },
             help="Year and month of the declaration."),
         'intrastat_line_ids': fields.one2many(
-            'report.intrastat.service.line',
+            'l10n.fr.report.intrastat.service.line',
             'parent_id', 'Report intrastat service lines',
             states={'done': [('readonly', True)]}),
         'num_lines': fields.function(
             _compute_numbers,
             type='integer', multi='numbers', string='Number of lines',
             store={
-                'report.intrastat.service.line': (
+                'l10n.fr.report.intrastat.service.line': (
                     _get_intrastat_from_service_line, ['parent_id'], 20),
                 },
             track_visibility='always',
@@ -116,7 +116,7 @@
             digits_compute=dp.get_precision('Account'),
             multi='numbers', string='Total amount',
             store={
-                'report.intrastat.service.line': (
+                'l10n.fr.report.intrastat.service.line': (
                     _get_intrastat_from_service_line,
                     ['amount_company_currency', 'parent_id'], 20),
                 },
@@ -145,7 +145,7 @@
         'state': 'draft',
         'company_id': lambda self, cr, uid, context:
         self.pool['res.company']._company_default_get(
-            cr, uid, 'report.intrastat.service', context=context),
+            cr, uid, 'l10n.fr.report.intrastat.service', context=context),
         }
 
     def _check_start_date(self, cr, uid, ids):
@@ -165,7 +165,7 @@
 
     def generate_service_lines(self, cr, uid, ids, context=None):
         intrastat = self.browse(cr, uid, ids[0], context=context)
-        line_obj = self.pool['report.intrastat.service.line']
+        line_obj = self.pool['l10n.fr.report.intrastat.service.line']
         invoice_obj = self.pool['account.invoice']
         self.pool['report.intrastat.common']._check_generate_lines(
             cr, uid, intrastat, context=context)
@@ -421,14 +421,14 @@
         return True
 
 
-class report_intrastat_service_line(orm.Model):
-    _name = "report.intrastat.service.line"
+class l10n_fr_report_intrastat_service_line(orm.Model):
+    _name = "l10n.fr.report.intrastat.service.line"
     _description = "Intrastat Service Lines"
     _rec_name = "partner_vat"
     _order = 'id'
     _columns = {
         'parent_id': fields.many2one(
-            'report.intrastat.service',
+            'l10n.fr.report.intrastat.service',
             'Intrastat service ref', ondelete='cascade'),
         'company_id': fields.related(
             'parent_id', 'company_id',

=== modified file 'l10n_fr_intrastat_service/intrastat_service_view.xml'
--- l10n_fr_intrastat_service/intrastat_service_view.xml	2014-10-30 12:30:41 +0000
+++ l10n_fr_intrastat_service/intrastat_service_view.xml	2014-12-13 00:30:09 +0000
@@ -10,9 +10,9 @@
 <data>
 
 <!-- Form view for DES -->
-<record id="intrastat_service_form" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_form" model="ir.ui.view">
     <field name="name">fr.intrastat.service.form</field>
-    <field name="model">report.intrastat.service</field>
+    <field name="model">l10n.fr.report.intrastat.service</field>
     <field name="arch" type="xml">
         <form string="Intrastat Service">
             <header>
@@ -54,9 +54,9 @@
 </record>
 
 <!-- Tree view for DES -->
-<record id="intrastat_service_tree" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_tree" model="ir.ui.view">
     <field name="name">fr.intrastat.service.tree</field>
-    <field name="model">report.intrastat.service</field>
+    <field name="model">l10n.fr.report.intrastat.service</field>
     <field name="arch" type="xml">
         <tree string="Intrastat Service" colors="blue:state=='draft'">
             <field name="year_month" />
@@ -70,9 +70,9 @@
 </record>
 
 <!-- Search view for DES -->
-<record id="intrastat_service_search" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_search" model="ir.ui.view">
     <field name="name">fr.intrastat.service.search</field>
-    <field name="model">report.intrastat.service</field>
+    <field name="model">l10n.fr.report.intrastat.service</field>
     <field name="arch" type="xml">
         <search string="Search Intrastat Service">
             <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]" />
@@ -85,9 +85,9 @@
 </record>
 
 <!-- Graph view for DES -->
-<record id="intrastat_service_graph" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_graph" model="ir.ui.view">
     <field name="name">fr.intrastat.service.graph</field>
-    <field name="model">report.intrastat.service</field>
+    <field name="model">l10n.fr.report.intrastat.service</field>
     <field name="arch" type="xml">
         <graph string="Intrastat Service" type="bar">
             <field name="start_date" type="row"/>
@@ -97,9 +97,9 @@
 </record>
 
 <!-- Form view for service lines -->
-<record id="intrastat_service_line_form" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_line_form" model="ir.ui.view">
     <field name="name">fr.intrastat.service.line.form</field>
-    <field name="model">report.intrastat.service.line</field>
+    <field name="model">l10n.fr.report.intrastat.service.line</field>
     <field name="arch" type="xml">
         <form string="Intrastat service lines">
             <group colspan="4" col="4" string="Information to declare">
@@ -119,9 +119,9 @@
 </record>
 
 <!-- Tree view for service lines -->
-<record id="intrastat_service_line_tree" model="ir.ui.view">
+<record id="l10n_fr_intrastat_service_line_tree" model="ir.ui.view">
     <field name="name">fr.intrastat.service.line.tree</field>
-    <field name="model">report.intrastat.service.line</field>
+    <field name="model">l10n.fr.report.intrastat.service.line</field>
     <field name="arch" type="xml">
         <tree string="Intrastat service lines">
             <field name="partner_vat" />
@@ -135,21 +135,23 @@
 
 
 <!-- Action related -->
-<record id="intrastat_service_tree_action" model="ir.actions.act_window">
+<record id="l10n_fr_intrastat_service_tree_action" model="ir.actions.act_window">
     <field name="name">Intrastat Service</field>
-    <field name="res_model">report.intrastat.service</field>
+    <field name="res_model">l10n.fr.report.intrastat.service</field>
     <field name="view_mode">tree,form,graph</field>
 </record>
 
 
 <!-- Intrastat service menu -->
-<menuitem id="intrastat_service_menu" parent="intrastat_base.menu_intrastat_base_root" action="intrastat_service_tree_action" />
+<menuitem id="l10n_fr_intrastat_service_menu"
+    parent="intrastat_base.menu_intrastat_base_root"
+    action="l10n_fr_intrastat_service_tree_action" />
 
 
 <!-- Notification in the chatter -->
-<record id="declaration_done" model="mail.message.subtype">
+<record id="l10n_fr_declaration_done" model="mail.message.subtype">
     <field name="name">Intrastat Service Validated</field>
-    <field name="res_model">report.intrastat.service</field>
+    <field name="res_model">l10n.fr.report.intrastat.service</field>
     <field name="default" eval="False"/>
     <field name="description">Intrastat Service Validated</field>
 </record>

=== added directory 'l10n_fr_intrastat_service/migrations'
=== added directory 'l10n_fr_intrastat_service/migrations/8.0.1.2'
=== added file 'l10n_fr_intrastat_service/migrations/8.0.1.2/pre-migration.py'
--- l10n_fr_intrastat_service/migrations/8.0.1.2/pre-migration.py	1970-01-01 00:00:00 +0000
+++ l10n_fr_intrastat_service/migrations/8.0.1.2/pre-migration.py	2014-12-13 00:30:09 +0000
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Report intrastat service module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    cr.execute(
+        'ALTER SEQUENCE "report_intrastat_service_line_id_seq" RENAME TO '
+        '"l10n_fr_report_intrastat_service_line_id_seq"')
+
+    cr.execute(
+        'ALTER TABLE "report_intrastat_service_line" RENAME TO '
+        '"l10n_fr_report_intrastat_service_line"')
+
+    cr.execute(
+        "UPDATE ir_model SET model='l10n.fr.report.intrastat.service.line' "
+        "WHERE model='report.intrastat.service.line'")
+
+    cr.execute(
+        "UPDATE ir_model_fields SET relation='l10n.fr.report.intrastat.service.line' "
+        "WHERE relation='report.intrastat.service.line'")
+
+    cr.execute(
+        'ALTER SEQUENCE "report_intrastat_service_id_seq" RENAME TO '
+        '"l10n_fr_report_intrastat_service_id_seq"')
+
+    cr.execute(
+        'ALTER TABLE "report_intrastat_service" RENAME TO '
+        '"l10n_fr_report_intrastat_service"')
+
+    cr.execute(
+        "UPDATE ir_model SET model='l10n.fr.report.intrastat.service' "
+        "WHERE model='report.intrastat.service'")
+
+    cr.execute(
+        "UPDATE ir_model_fields SET relation='l10n.fr.report.intrastat.service' "
+        "WHERE relation='report.intrastat.service'")

=== modified file 'l10n_fr_intrastat_service/security/intrastat_service_security.xml'
--- l10n_fr_intrastat_service/security/intrastat_service_security.xml	2014-02-01 22:43:05 +0000
+++ l10n_fr_intrastat_service/security/intrastat_service_security.xml	2014-12-13 00:30:09 +0000
@@ -2,17 +2,17 @@
 <openerp>
 <data noupdate="1">
 
-<record id="fr_intrastat_service_rule" model="ir.rule">
+<record id="l10n_fr_intrastat_service_rule" model="ir.rule">
     <field name="name">Intrastat Service multi-company</field>
-    <field name="model_id" ref="model_report_intrastat_service"/>
+    <field name="model_id" ref="model_l10n_fr_report_intrastat_service"/>
     <field name="global" eval="True"/>
     <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
 </record>
 
 
-<record id="fr_intrastat_service_line_rule" model="ir.rule">
+<record id="l10n_fr_intrastat_service_line_rule" model="ir.rule">
     <field name="name">Intrastat Service Line multi-company</field>
-    <field name="model_id" ref="model_report_intrastat_service_line"/>
+    <field name="model_id" ref="model_l10n_fr_report_intrastat_service_line"/>
     <field name="global" eval="True"/>
     <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
 </record>

=== modified file 'l10n_fr_intrastat_service/security/ir.model.access.csv'
--- l10n_fr_intrastat_service/security/ir.model.access.csv	2011-03-27 20:59:53 +0000
+++ l10n_fr_intrastat_service/security/ir.model.access.csv	2014-12-13 00:30:09 +0000
@@ -1,3 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_report_intrastat_service","report.intrastat.service","model_report_intrastat_service","account.group_account_manager",1,1,1,1
-"access_report_intrastat_service_line","report.intrastat.service.line","model_report_intrastat_service_line","account.group_account_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_fr_report_intrastat_service,Full access to l10n.fr.report.intrastat.service to accouting manager,model_l10n_fr_report_intrastat_service,account.group_account_manager,1,1,1,1
+access_l10n_fr_report_intrastat_service_line,Full access to l10n.fr.report.intrastat.service.line to accouting manager,model_l10n_fr_report_intrastat_service_line,account.group_account_manager,1,1,1,1