Merge pull request #399 from trobz/9.0-disable_openerp_online

[MIG] disable_openerp_online > disable_odoo_online

disable_openerp_online/__openerp__.py → disable_odoo_online/__openerp__.py

@@ -20,7 +20,7 @@
 ##############################################################################
 {
     "name": "Remove odoo.com bindings",
-    "version": "8.0.1.1.0",
+    "version": "9.0.1.0.0",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "complexity": "normal",
@@ -40,12 +40,12 @@ come with the standard code:
         'mail',
     ],
     "data": [
-        "views/disable_openerp_online.xml",
+        "views/disable_odoo_online.xml",
         'views/ir_ui_menu.xml',
         'data/ir_cron.xml',
     ],
     "qweb": [
         'static/src/xml/base.xml',
     ],
-    'installable': False,
+    'installable': True,
 }

disable_openerp_online/i18n/de.po → disable_odoo_online/i18n/de.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * disable_openerp_online
+# * disable_odoo_online
 # 
 # Translators:
 msgid ""
@@ -17,22 +17,22 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_uid:0
 msgid "Created by"
 msgstr "Erstellt von"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_date:0
 msgid "Created on"
 msgstr "Erstellt am:"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_uid:0
 msgid "Last Updated by"
 msgstr "Zuletzt aktualisiert von"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_date:0
 msgid "Last Updated on"
 msgstr "Zuletzt aktualisiert am"

disable_openerp_online/i18n/en.po → disable_odoo_online/i18n/en.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * disable_openerp_online
+# * disable_odoo_online
 # 
 # Translators:
 msgid ""
@@ -17,22 +17,22 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_uid:0
 msgid "Created by"
 msgstr "Created by"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_date:0
 msgid "Created on"
 msgstr "Created on"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_uid:0
 msgid "Last Updated by"
 msgstr "Last Updated by"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_date:0
 msgid "Last Updated on"
 msgstr "Last Updated on"

disable_openerp_online/i18n/es.po → disable_odoo_online/i18n/es.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * disable_openerp_online
+# * disable_odoo_online
 # 
 # Translators:
 msgid ""
@@ -17,22 +17,22 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_uid:0
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_date:0
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_uid:0
 msgid "Last Updated by"
 msgstr "Última actualización de"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_date:0
 msgid "Last Updated on"
 msgstr "Última actualización en"

disable_openerp_online/i18n/fr.po → disable_odoo_online/i18n/fr.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * disable_openerp_online
+# * disable_odoo_online
 # 
 # Translators:
 msgid ""
@@ -17,22 +17,22 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_uid:0
 msgid "Created by"
 msgstr "Créé par"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_date:0
 msgid "Created on"
 msgstr "Date"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_uid:0
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_date:0
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"

disable_openerp_online/i18n/sl.po → disable_odoo_online/i18n/sl.po

@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * disable_openerp_online
+# * disable_odoo_online
 # 
 # Translators:
 msgid ""
@@ -17,22 +17,22 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_uid:0
 msgid "Created by"
 msgstr "Ustvaril"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,create_date:0
 msgid "Created on"
 msgstr "Ustvarjeno"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_uid:0
 msgid "Last Updated by"
 msgstr "Zadnjič posodobil"
 
-#. module: disable_openerp_online
+#. module: disable_odoo_online
 #: field:publisher_warranty.contract,write_date:0
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"

disable_openerp_online/model/publisher_warranty_contract.py → disable_odoo_online/model/publisher_warranty_contract.py

@@ -18,11 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv.orm import Model
+from openerp import api, models
 
 
-class publisher_warranty_contract(Model):
+class publisher_warranty_contract(models.AbstractModel):
     _inherit = 'publisher_warranty.contract'
 
-    def update_notification(self, cr, uid, ids, cron_mode=True, context=None):
+    @api.multi
+    def update_notification(self, cron_mode=True, context=None):
         pass

disable_odoo_online/static/src/js/disable_odoo_online.js

@@ -0,0 +1,9 @@
+odoo.define('disable_odoo_online.announcement', function (require) {
+	"use strict";
+	var WebClient = require('web.WebClient');
+	WebClient.include({
+	    show_announcement_bar: function() {
+	        // do nothing here
+	    }
+	});
+});

disable_openerp_online/static/src/xml/base.xml → disable_odoo_online/static/src/xml/base.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-extend="UserMenu">
-        <t t-jquery="a[data-menu='account'], a[data-menu='help']">
+        <t t-jquery="a[data-menu='account'], a[data-menu='documentation'], a[data-menu='support']">
             this.parent().remove();
         </t>
     </t>

disable_odoo_online/views/disable_odoo_online.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- the name of template will affect the order include the js,
+        this js file should load after annoucement.js to override function
+        in  annoucement.js file -->
+        <template id="assets_backend" name="mail disable_odoo_online assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/disable_odoo_online/static/src/js/disable_odoo_online.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>

disable_openerp_online/views/ir_ui_menu.xml → disable_odoo_online/views/ir_ui_menu.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <!-- Menus moved under Tools\Parameters -->
+        <!-- Menus moved under Tools\Parameters --> 
         <record model="ir.ui.menu" id="base.module_mi">
             <field name="parent_id" ref="base.menu_ir_property"/>
         </record>

disable_openerp_online/i18n/disable_openerp_online.pot

@@ -1,16 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-14 17:41+0000\n"
-"PO-Revision-Date: 2014-03-14 17:41+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-

disable_openerp_online/static/src/js/disable_openerp_online.js

@@ -1,7 +0,0 @@
-openerp.disable_openerp_online = function(instance) {
-    // Disabling the lookup of a valid OPW for the dbuuid,
-    // resulting in 'Your OpenERP is not supported'
-    instance.web.WebClient.include({
-        show_annoucement_bar: function() {}
-    });
-};

disable_openerp_online/views/disable_openerp_online.xml

@@ -1,10 +0,0 @@
-<?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>