From b204ed7f71410b22b92f200afa68765798a0b965 Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Tue, 22 Jul 2014 22:11:57 +0200
Subject: [PATCH 1/2] [ADD] port disable_openerp_online

---
 .../__init__.py                                     |   0
 .../__openerp__.py                                  |  10 +++-------
 .../data/ir_cron.xml                                |   0
 .../data/ir_ui_menu.xml                             |   0
 .../i18n/disable_openerp_online.pot                 |   0
 .../model/__init__.py                               |   0
 .../model/publisher_warranty_contract.py            |   0
 .../static/description}/icon.png                    | Bin
 .../static/src/js/disable_openerp_online.js         |   0
 .../static/src/xml/base.xml                         |   0
 .../views/disable_openerp_online.xml                |  10 ++++++++++
 11 files changed, 13 insertions(+), 7 deletions(-)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/__init__.py (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/__openerp__.py (90%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/data/ir_cron.xml (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/data/ir_ui_menu.xml (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/i18n/disable_openerp_online.pot (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/model/__init__.py (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/model/publisher_warranty_contract.py (100%)
 rename {__unported__/disable_openerp_online/static/src/img => disable_openerp_online/static/description}/icon.png (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/static/src/js/disable_openerp_online.js (100%)
 rename {__unported__/disable_openerp_online => disable_openerp_online}/static/src/xml/base.xml (100%)
 create mode 100644 disable_openerp_online/views/disable_openerp_online.xml

diff --git a/__unported__/disable_openerp_online/__init__.py b/disable_openerp_online/__init__.py
similarity index 100%
rename from __unported__/disable_openerp_online/__init__.py
rename to disable_openerp_online/__init__.py
diff --git a/__unported__/disable_openerp_online/__openerp__.py b/disable_openerp_online/__openerp__.py
similarity index 90%
rename from __unported__/disable_openerp_online/__openerp__.py
rename to disable_openerp_online/__openerp__.py
index 189445f0b..0144f82bb 100644
--- a/__unported__/disable_openerp_online/__openerp__.py
+++ b/disable_openerp_online/__openerp__.py
@@ -30,8 +30,8 @@ come with the standard code:
 * 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": [
@@ -39,14 +39,10 @@ come with the standard code:
         '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/__unported__/disable_openerp_online/data/ir_cron.xml b/disable_openerp_online/data/ir_cron.xml
similarity index 100%
rename from __unported__/disable_openerp_online/data/ir_cron.xml
rename to disable_openerp_online/data/ir_cron.xml
diff --git a/__unported__/disable_openerp_online/data/ir_ui_menu.xml b/disable_openerp_online/data/ir_ui_menu.xml
similarity index 100%
rename from __unported__/disable_openerp_online/data/ir_ui_menu.xml
rename to disable_openerp_online/data/ir_ui_menu.xml
diff --git a/__unported__/disable_openerp_online/i18n/disable_openerp_online.pot b/disable_openerp_online/i18n/disable_openerp_online.pot
similarity index 100%
rename from __unported__/disable_openerp_online/i18n/disable_openerp_online.pot
rename to disable_openerp_online/i18n/disable_openerp_online.pot
diff --git a/__unported__/disable_openerp_online/model/__init__.py b/disable_openerp_online/model/__init__.py
similarity index 100%
rename from __unported__/disable_openerp_online/model/__init__.py
rename to disable_openerp_online/model/__init__.py
diff --git a/__unported__/disable_openerp_online/model/publisher_warranty_contract.py b/disable_openerp_online/model/publisher_warranty_contract.py
similarity index 100%
rename from __unported__/disable_openerp_online/model/publisher_warranty_contract.py
rename to disable_openerp_online/model/publisher_warranty_contract.py
diff --git a/__unported__/disable_openerp_online/static/src/img/icon.png b/disable_openerp_online/static/description/icon.png
similarity index 100%
rename from __unported__/disable_openerp_online/static/src/img/icon.png
rename to disable_openerp_online/static/description/icon.png
diff --git a/__unported__/disable_openerp_online/static/src/js/disable_openerp_online.js b/disable_openerp_online/static/src/js/disable_openerp_online.js
similarity index 100%
rename from __unported__/disable_openerp_online/static/src/js/disable_openerp_online.js
rename to disable_openerp_online/static/src/js/disable_openerp_online.js
diff --git a/__unported__/disable_openerp_online/static/src/xml/base.xml b/disable_openerp_online/static/src/xml/base.xml
similarity index 100%
rename from __unported__/disable_openerp_online/static/src/xml/base.xml
rename to disable_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
new file mode 100644
index 000000000..038d8d428
--- /dev/null
+++ 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>

From 97b570b739105a61ce194bc20d442ac5c722b13e Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Mon, 28 Jul 2014 11:03:11 +0200
Subject: [PATCH 2/2] [IMP] rebranding [FIX] avoid warning for deleted menus

---
 disable_openerp_online/__openerp__.py      | 2 +-
 disable_openerp_online/data/ir_ui_menu.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/disable_openerp_online/__openerp__.py b/disable_openerp_online/__openerp__.py
index 0144f82bb..ea0613dac 100644
--- a/disable_openerp_online/__openerp__.py
+++ b/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",
diff --git a/disable_openerp_online/data/ir_ui_menu.xml b/disable_openerp_online/data/ir_ui_menu.xml
index 72529f77a..15d710ef4 100644
--- a/disable_openerp_online/data/ir_ui_menu.xml
+++ b/disable_openerp_online/data/ir_ui_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <delete model="ir.ui.menu" id="base.module_mi" />
-        <delete model="ir.ui.menu" id="base.menu_module_updates" />
+        <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>