[MERGE] merge with latest stable

[odoo/odoo.git] / addons / sale_margin / __init__.py

diff --git a/addons/sale_margin/__init__.py b/addons/sale_margin/__init__.py
index ff24fd1..425dcf6 100644 (file)
--- a/addons/sale_margin/__init__.py
+++ b/addons/sale_margin/__init__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,12 +14,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import invoice_margin
-import report
 import sale_margin
+import report
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: