From 50814b1ab7fe782a9d60f0e5905cc86759e0eb8c Mon Sep 17 00:00:00 2001
From: Damien Crier <damien.crier@camptocamp.com>
Date: Mon, 8 Feb 2016 12:57:27 +0100
Subject: [PATCH] [FIX] move country=FR from demo data to test file Case: When
 base_phone is installed --before-- account, account module installs l10n_fr
 (generate fiscal year and periods     (see
 https://github.com/odoo/odoo/blob/8.0/addons/account/account_pre_install.yml
 and     
 https://github.com/odoo/odoo/blob/8.0/addons/account/installer.py#L163)) and
 then account_demo.xml fails because fiscalyear and periods already exists.

---
 base_phone/__openerp__.py      |  1 -
 base_phone/base_phone_demo.xml | 18 ------------------
 base_phone/test/phonenum.yml   |  5 +++++
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 base_phone/base_phone_demo.xml

diff --git a/base_phone/__openerp__.py b/base_phone/__openerp__.py
index 7561de3..2037b4b 100644
--- a/base_phone/__openerp__.py
+++ b/base_phone/__openerp__.py
@@ -76,7 +76,6 @@ for any help or question about this module.
         'web_phone.xml',
         ],
     'qweb': ['static/src/xml/*.xml'],
-    'demo': ['base_phone_demo.xml'],
     'test': ['test/phonenum.yml'],
     'images': [],
     'installable': True,
diff --git a/base_phone/base_phone_demo.xml b/base_phone/base_phone_demo.xml
deleted file mode 100644
index 4e341e1..0000000
--- a/base_phone/base_phone_demo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Copyright (C) 2014 Alexis de Lattre
-    @author Alexis de Lattre <alexis@via.ecp.fr>
-    The licence is in the file __openerp__.py
--->
-
-<openerp>
-<data noupdate="1">
-
-<!-- I need a country on the company, because otherwize it raises an error -->
-<record id="base.main_company" model="res.company">
-    <field name="country_id" ref="base.fr"/>
-</record>
-
-</data>
-</openerp>
diff --git a/base_phone/test/phonenum.yml b/base_phone/test/phonenum.yml
index e1e320e..27aa6d7 100644
--- a/base_phone/test/phonenum.yml
+++ b/base_phone/test/phonenum.yml
@@ -1,3 +1,8 @@
+-
+  Write country = FR for the main company
+-
+  !record {model: res.company, id: base.main_company}:
+    country_id: base.fr
 -
   Write french phone numbers in national format
 -