From 8ef3d81f024022c221eda73432f3dfc362cc34e2 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Mon, 1 Dec 2014 10:29:07 +0100
Subject: [PATCH] Rename field country_id to origin_country_id (TODO : write
 mig script) and move this field from l10n_fr_intrastat_product to
 intrastat_product

---
 intrastat_product/intrastat.py       |  7 +++++++
 intrastat_product/intrastat_demo.xml | 27 +++++++++++++++++++++++----
 intrastat_product/intrastat_view.xml |  1 +
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/intrastat_product/intrastat.py b/intrastat_product/intrastat.py
index 11fd2f2..b4f5d6c 100644
--- a/intrastat_product/intrastat.py
+++ b/intrastat_product/intrastat.py
@@ -72,6 +72,13 @@ class ProductTemplate(models.Model):
         "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):
diff --git a/intrastat_product/intrastat_demo.xml b/intrastat_product/intrastat_demo.xml
index e831a6d..e0a8c33 100644
--- a/intrastat_product/intrastat_demo.xml
+++ b/intrastat_product/intrastat_demo.xml
@@ -26,39 +26,58 @@
 
 <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" />
-</record>
-
-<record id="product.product_product_25" 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>
diff --git a/intrastat_product/intrastat_view.xml b/intrastat_product/intrastat_view.xml
index 635724c..66c1a4f 100644
--- a/intrastat_product/intrastat_view.xml
+++ b/intrastat_product/intrastat_view.xml
@@ -17,6 +17,7 @@
     <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>