Merge pull request OCA#26 from hbrunn/8.0-disable_openerp_online

[ADD] disable_openerp_online
chafique-delli · Aug 13, 2014 · 7841e39 · 7841e39
2 parents 7fc2ef4 + 97b570b
commit 7841e39
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/__unported__/disable_openerp_online/data/ir_ui_menu.xml b/__unported__/disable_openerp_online/data/ir_ui_menu.xml
diff --git a/...rted__/disable_openerp_online/__init__.py → disable_openerp_online/__init__.py b/...rted__/disable_openerp_online/__init__.py → disable_openerp_online/__init__.py
diff --git a/...d__/disable_openerp_online/__openerp__.py → disable_openerp_online/__openerp__.py b/...d__/disable_openerp_online/__openerp__.py → disable_openerp_online/__openerp__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 {
-    "name": "Remove openerp.com bindings",
+    "name": "Remove odoo.com bindings",
     "version": "1.1",
     "author": "Therp BV",
     "complexity": "normal",
@@ -30,23 +30,19 @@
 * update notifier code is deactivated and the function is overwritten
 * apps and updates menu items in settings are removed
 * help and account menu items in user menu are removed
-* prevent lookup of OPW for current database uuid and resulting"""
-    """ 'unsupported' warning
+* prevent lookup of OPW for current database uuid and resulting
+  'unsupported' warning
     """,
     "category": "",
     "depends": [
         'base',
         'mail',
     ],
     "data": [
+        "views/disable_openerp_online.xml",
         'data/ir_ui_menu.xml',
         'data/ir_cron.xml',
     ],
-    "js": [
-        'static/src/js/disable_openerp_online.js',
-    ],
-    "css": [
-    ],
     "qweb": [
         'static/src/xml/base.xml',
     ],

diff --git a/..._/disable_openerp_online/data/ir_cron.xml → disable_openerp_online/data/ir_cron.xml b/..._/disable_openerp_online/data/ir_cron.xml → disable_openerp_online/data/ir_cron.xml
diff --git a/disable_openerp_online/data/ir_ui_menu.xml b/disable_openerp_online/data/ir_ui_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <delete model="ir.ui.menu" search="[('id', '=', ref('base.module_mi'))]" />
+        <delete model="ir.ui.menu" search="[('id', '=', ref('base.menu_module_updates'))]" />
+    </data>
+</openerp>
diff --git a/...rp_online/i18n/disable_openerp_online.pot → ...rp_online/i18n/disable_openerp_online.pot b/...rp_online/i18n/disable_openerp_online.pot → ...rp_online/i18n/disable_openerp_online.pot
diff --git a/.../disable_openerp_online/model/__init__.py → disable_openerp_online/model/__init__.py b/.../disable_openerp_online/model/__init__.py → disable_openerp_online/model/__init__.py
diff --git a/...line/model/publisher_warranty_contract.py → ...line/model/publisher_warranty_contract.py b/...line/model/publisher_warranty_contract.py → ...line/model/publisher_warranty_contract.py
diff --git a/...le_openerp_online/static/src/img/icon.png → ...penerp_online/static/description/icon.png b/...le_openerp_online/static/src/img/icon.png → ...penerp_online/static/description/icon.png
diff --git a/...e/static/src/js/disable_openerp_online.js → ...e/static/src/js/disable_openerp_online.js b/...e/static/src/js/disable_openerp_online.js → ...e/static/src/js/disable_openerp_online.js
diff --git a/...le_openerp_online/static/src/xml/base.xml → ...le_openerp_online/static/src/xml/base.xml b/...le_openerp_online/static/src/xml/base.xml → ...le_openerp_online/static/src/xml/base.xml
diff --git a/disable_openerp_online/views/disable_openerp_online.xml b/disable_openerp_online/views/disable_openerp_online.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <template id="assets_backend" name="disable_openerp_online assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/disable_openerp_online/static/src/js/disable_openerp_online.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>