From 8f7b233bc160f42f1ac4e22616362f23e64393f7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Mon, 6 Jun 2016 17:59:24 +0200
Subject: [PATCH] [MOV] decimal_precision: apply standard layout

Had to alter marketing_campaign as it imported get_precision from deeper
into the module instead of properly getting it from the module's toplevel.
---
 addons/decimal_precision/__init__.py                            | 2 +-
 addons/decimal_precision/__openerp__.py                         | 2 +-
 addons/decimal_precision/models/__init__.py                     | 2 ++
 addons/decimal_precision/{ => models}/decimal_precision.py      | 0
 .../decimal_precision_views.xml}                                | 0
 addons/marketing_campaign/marketing_campaign.py                 | 2 +-
 addons/marketing_campaign/report/campaign_analysis.py           | 1 -
 7 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 addons/decimal_precision/models/__init__.py
 rename addons/decimal_precision/{ => models}/decimal_precision.py (100%)
 rename addons/decimal_precision/{decimal_precision_view.xml => views/decimal_precision_views.xml} (100%)

diff --git a/addons/decimal_precision/__init__.py b/addons/decimal_precision/__init__.py
index 11d092a4be6..32ff2047e37 100644
--- a/addons/decimal_precision/__init__.py
+++ b/addons/decimal_precision/__init__.py
@@ -2,4 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 #import decimal_precision
-from decimal_precision import get_precision
+from .models.decimal_precision import get_precision
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 65bff3bc388..9a48b9177e1 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -13,7 +13,7 @@ The decimal precision is configured per company.
     'depends': ['base'],
     'category' : 'Hidden',
     'data': [
-        'decimal_precision_view.xml',
+        'views/decimal_precision_views.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [],
diff --git a/addons/decimal_precision/models/__init__.py b/addons/decimal_precision/models/__init__.py
new file mode 100644
index 00000000000..44007d7a214
--- /dev/null
+++ b/addons/decimal_precision/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import decimal_precision
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/models/decimal_precision.py
similarity index 100%
rename from addons/decimal_precision/decimal_precision.py
rename to addons/decimal_precision/models/decimal_precision.py
diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/views/decimal_precision_views.xml
similarity index 100%
rename from addons/decimal_precision/decimal_precision_view.xml
rename to addons/decimal_precision/views/decimal_precision_views.xml
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 36429c10bcb..9b1e9bad619 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -9,7 +9,7 @@ from traceback import format_exception
 from sys import exc_info
 from openerp.tools.safe_eval import safe_eval as eval
 import re
-from openerp.addons.decimal_precision import decimal_precision as dp
+import openerp.addons.decimal_precision as dp
 
 from openerp import api, SUPERUSER_ID
 from openerp.osv import fields, osv
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 653621947e8..bb0a8e6510d 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -2,7 +2,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from openerp import tools
 from openerp.osv import fields, osv
-from openerp.addons.decimal_precision import decimal_precision as dp
 
 
 class campaign_analysis(osv.osv):