diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 6aa096eedb7..008e7d78139 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -149,9 +149,6 @@ module named account_voucher.
         'test/test_edi_invoice.yml',
         'test/account_report.yml',
     ],
-    "js": [
-        'static/src/js/edi_invoice.js'
-    ],
     'installable': True,
     'active': False,
     'certificate': '0080331923549',
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index b46a87ee9ca..60084c4c484 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -47,6 +47,8 @@ technical OpenERP documentation at http://doc.openerp.com
         'static/src/js/sessionless.js',
         'static/src/js/edi_import.js',
         'static/src/js/edi_view.js',
+        'static/src/js/edi_invoice.js',
+        'static/src/js/edi_sale_purchase_order.js',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/account/static/src/js/edi_invoice.js b/addons/edi/static/src/js/edi_invoice.js
similarity index 100%
rename from addons/account/static/src/js/edi_invoice.js
rename to addons/edi/static/src/js/edi_invoice.js
diff --git a/addons/sale/static/src/js/edi_sale_purchase_order.js b/addons/edi/static/src/js/edi_sale_purchase_order.js
similarity index 90%
rename from addons/sale/static/src/js/edi_sale_purchase_order.js
rename to addons/edi/static/src/js/edi_sale_purchase_order.js
index 29c81dbe28d..1216957bf72 100644
--- a/addons/sale/static/src/js/edi_sale_purchase_order.js
+++ b/addons/edi/static/src/js/edi_sale_purchase_order.js
@@ -8,7 +8,7 @@ openerp.web.EdiViewCenterSalePurchase = openerp.web.Class.extend({
         var self = this;
         this.edi_document = eval(edi.document)
         this.$element = element;
-        QWeb.add_template("/sale/static/src/xml/edi_sale_purchase_order.xml");
+        QWeb.add_template("/edi/static/src/xml/edi_sale_purchase_order.xml");
         
     },
     start: function() {
diff --git a/addons/account/static/src/xml/edi_invoice.xml b/addons/edi/static/src/xml/edi_invoice.xml
similarity index 100%
rename from addons/account/static/src/xml/edi_invoice.xml
rename to addons/edi/static/src/xml/edi_invoice.xml
diff --git a/addons/sale/static/src/xml/edi_sale_purchase_order.xml b/addons/edi/static/src/xml/edi_sale_purchase_order.xml
similarity index 100%
rename from addons/sale/static/src/xml/edi_sale_purchase_order.xml
rename to addons/edi/static/src/xml/edi_sale_purchase_order.xml
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 8e5b9803c6c..49d17d9e1e8 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -40,7 +40,7 @@ Dashboard for purchase management that includes:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images' : ['images/purchase_order.jpeg', 'images/purchase_analysis.jpeg', 'images/request_for_quotation.jpeg'],
-    'depends': ['base', 'account', 'stock', 'process', 'procurement'],
+    'depends': ['stock', 'process', 'procurement'],
     'data': [
         'security/purchase_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d626cfe3ff6..eb003dff918 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -101,9 +101,6 @@ Dashboard for Sales Manager that includes:
         'test/sale_report.yml',
 
     ],
-    "js": [
-        'static/src/js/edi_sale_purchase_order.js',
-    ],
     'installable': True,
     'active': False,
     'certificate': '0058103601429',