diff --git a/odoo-debrand/README.rst b/odoo-debrand/README.rst index 21a39ea56..634d276d9 100644 --- a/odoo-debrand/README.rst +++ b/odoo-debrand/README.rst @@ -10,11 +10,9 @@ Debranding of odoo with the given configurations under Website Admin -> Debrandi Will replace: - Page Title - - Odoo from Popups + - Login Page Modification - User Drop down Odoo links - - Website Title - POS Odoo logo replaced by company logo - - Odoo label from Dialogues - Odoo Database Selector Logo, Labels Installation diff --git a/odoo-debrand/__manifest__.py b/odoo-debrand/__manifest__.py index 270ebdb14..2c34cce80 100644 --- a/odoo-debrand/__manifest__.py +++ b/odoo-debrand/__manifest__.py @@ -22,17 +22,18 @@ { 'name': "Odoo Debranding", - 'version': "13.0.1.0.0", - 'summary': """Debrand Odoo""", - 'description': """Debrand Odoo,Debranding""", + 'version': "13.0.1.1.1", + 'summary': """Odoo Backend and Front end Debranding""", + 'description': """Debrand Odoo,Debranding, odoo13""", 'author': "Cybrosys Techno Solutions", 'company': "Cybrosys Techno Solutions", 'maintainer': "Cybrosys Techno Solutions", 'website': "https://cybrosys.com/", 'category': 'Tools', - 'depends': ['base', 'im_livechat', 'website'], + 'depends': ['website', 'base_setup'], 'data': [ - 'views/views.xml' + 'views/views.xml', + 'views/res_config_views.xml' ], 'qweb': ["static/src/xml/base.xml"], 'images': ['static/description/banner.gif'], diff --git a/odoo-debrand/controllers/controllers.py b/odoo-debrand/controllers/controllers.py index 075794057..7cf13605d 100644 --- a/odoo-debrand/controllers/controllers.py +++ b/odoo-debrand/controllers/controllers.py @@ -104,6 +104,7 @@ class BinaryCustom(Binary): imgext = '.' + mimetype.split('/')[1] if imgext == '.svg+xml': imgext = '.svg' + response = http.send_file(image_data, filename=imgname + imgext, mimetype=mimetype, diff --git a/odoo-debrand/models/models.py b/odoo-debrand/models/models.py index 38fe24cb0..3cf17bbf0 100644 --- a/odoo-debrand/models/models.py +++ b/odoo-debrand/models/models.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################# # # Cybrosys Technologies Pvt. Ltd. @@ -24,6 +25,9 @@ from odoo import models, fields, api, tools class OdooDebrand(models.Model): + """ + Fields to access from the database manager. + """ _inherit = "website" def get_company_logo(self): @@ -33,5 +37,5 @@ class OdooDebrand(models.Model): id = self.env['website'].sudo().search([]) self.favicon_url ="/web/image/website/%s/favicon"%(id[0].id) - favicon_url = fields.Text("Url", compute='get_favicon') + favicon_url = fields.Text("Url", compute='get_favicon') company_logo_url = fields.Text("Url", compute='get_company_logo') diff --git a/odoo-debrand/static/description/images/debranding-03.png b/odoo-debrand/static/description/images/debranding-03.png index 5a614c5c5..e199e3b2f 100644 Binary files a/odoo-debrand/static/description/images/debranding-03.png and b/odoo-debrand/static/description/images/debranding-03.png differ diff --git a/odoo-debrand/static/description/index.html b/odoo-debrand/static/description/index.html index bef243cd6..a2a169e9e 100644 --- a/odoo-debrand/static/description/index.html +++ b/odoo-debrand/static/description/index.html @@ -5,16 +5,16 @@

ODOO DEBRANDING

-

Debrand Odoo Back-end + Front-End .

+

Debrand Odoo Back-End + Front-End .

Key Highlights

@@ -54,7 +54,7 @@

Overview

- Want to debrand your company website? Odoo Debranding module developed by Cybrosys Technologies helps you to change the aesthetic look of Odoo software via customizing them with Logo and other branding changes. The module helps you to change almost every area of Odoo visuals, delivering a brand new customized website. + Odoo Debranding module helps you to change the aesthetic look of Odoo software via customizing. The module helps you to remove all odoo reference from Front end and Back end.
@@ -70,14 +70,15 @@ checkModify database selector page.
  • - check Modify login page.
    • - + check Modify login page (Remove 'Powered by odoo'). +
  • - checkRemove Odoo's default favicon.
    • -
  • - checkUpdated warning messages.
    • -
  • - checkPage title modification.
    • + checkPage title modification (Remove Odoo from Title) + +
  • + checkUpdated User dropdown List (Remove 'Accounts and Documentation')
    • +
  • + checkRemove About from Configuration menu.
    • @@ -95,14 +96,6 @@
    -
    -

    check As you see in the settings option you need to set up the Website name & favicon then only the change will be affected in the title. Also you need to setup the company logo from the settings page to change the default logo..

    - -
    -
    - -
    -

    checkCompany logo in login page.

    @@ -120,15 +113,6 @@
    - -
    -
    -

    check Updated the Odoo title in the messages.

    - -
    -
    - -
    diff --git a/odoo-debrand/static/src/js/title.js b/odoo-debrand/static/src/js/title.js index edc6697a2..ac65f574a 100644 --- a/odoo-debrand/static/src/js/title.js +++ b/odoo-debrand/static/src/js/title.js @@ -1,4 +1,4 @@ -odoo.define('odoo-debrand-11.title', function(require) { +odoo.define('odoo-debrand.title', function(require) { "use strict"; var core = require('web.core'); @@ -25,54 +25,31 @@ var map_title ={ except_orm: _lt('Global Business Error'), access_denied: _lt('Access Denied'), }; - - var myWebClient = WebClient.include({ - init: function (parent) { - this._super(); - var obj = this; - this._rpc({ - fields: ['name',], - domain: [], - model: 'website', - method: 'search_read', - limit: 1, - context: session.user_context, - }) - .then(function (result) { - obj.set('title_part', {"zopenerp": result[0].name}); - }); - }, - start: function () { - this._super(); - this._rpc({ - fields: ['name',], - domain: [], - model: 'website', + +var myWebClient = WebClient.include({ + + start: function () { + this._super(); + var domain = session.user_context.allowed_company_ids; + var obj = this; + this._rpc({ + fields: ['name','id',], + domain: [['id', 'in', domain]], + model: 'res.company', method: 'search_read', - limit: 1, - context: session.user_context, - }) - .then(function(result){ - $("link[type='image/x-icon']").attr('href', '/web/image/website/'+result[0].id+'/favicon'); - }); - }, - }); + }) + .then(function (result) { + obj.set('title_part', {"zopenerp": result[0].name}); // Replacing the name 'Oodo' to selected company name near favicon + }); + }, +}); var ExceptionHandler = { - /** - * @param parent The parent. - * @param error The error object as returned by the JSON-RPC implementation. - */ init: function(parent, error) {}, - /** - * Called to inform to display the widget, if necessary. A typical way would be to implement - * this interface in a class extending instance.web.Dialog and simply display the dialog in this - * method. - */ display: function() {}, }; -var RedirectWarningHandler = Dialog.extend(ExceptionHandler, { +var RedirectWarningHandler = Widget.extend(ExceptionHandler, { // Rewriting the exception handler init: function(parent, error) { this._super(parent); this.error = error; @@ -80,32 +57,36 @@ var RedirectWarningHandler = Dialog.extend(ExceptionHandler, { display: function() { var self = this; var error = this.error; - error.data.message = error.data.arguments[0]; - new Dialog(this, { - size: 'medium', - title: _.str.capitalize(error.type) || _t("Warning"), + new WarningDialog(this, { + title: _.str.capitalize(error.type) || _t("Warning"), // Replacing 'Odoo Warning' to 'Warning' buttons: [ {text: error.data.arguments[2], classes : "btn-primary", click: function() { - window.location.href = '#action='+error.data.arguments[1]; + $.bbq.pushState({ + 'action': error.data.arguments[1], + 'cids': $.bbq.getState().cids, + }, 2); self.destroy(); + location.reload(); }}, {text: _t("Cancel"), click: function() { self.destroy(); }, close: true} - ], - $content: QWeb.render('CrashManager.warning', {error: error}), + ] + }, { + message: error.data.arguments[0], }).open(); } }); + core.crash_registry.add('odoo.exceptions.RedirectWarning', RedirectWarningHandler); + function session_expired(cm) { return { - display: function () { - cm.show_warning({type: _t("Session Expired"), data: {message: _t("Your Odoo session expired. Please refresh the current web page.")}}); + display: function () { // Replace 'Odoo session expired' to 'Session Expired' + cm.show_warning({type: _t("Session Expired"), data: {message: _t("Your Session expired. Please refresh the current web page.")}}); } }; } core.crash_registry.add('odoo.http.SessionExpiredException', session_expired); - }); diff --git a/odoo-debrand/static/src/xml/base.xml b/odoo-debrand/static/src/xml/base.xml index f40c74b50..963e4226e 100644 --- a/odoo-debrand/static/src/xml/base.xml +++ b/odoo-debrand/static/src/xml/base.xml @@ -1,5 +1,7 @@ + + @@ -17,6 +19,7 @@ Your permission is required to enable desktop notifications. + diff --git a/odoo-debrand/views/database_manager_extend.html b/odoo-debrand/views/database_manager_extend.html index ccbc5c992..bc597cb73 100644 --- a/odoo-debrand/views/database_manager_extend.html +++ b/odoo-debrand/views/database_manager_extend.html @@ -1,30 +1,31 @@ + - - - {{ website_name }} - + + + {{ website_name }} + - - + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - {% macro master_input() -%} -
    - {% if insecure %} - - {% else %} - - - {% endif %} + + + +{% macro master_input() -%} +
    + {% if insecure %} + + {% else %} + + + {% endif %} +
    +{%- endmacro %} + +{% macro create_form() -%} +{{ master_input() }} +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    - {%- endmacro %} +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +{%- endmacro %} - {% macro create_form() -%} - {{ master_input() }} -
    - -
    - + +
    + +
    +
    + + + {% if not list_db %} +
    The database manager has been disabled by the administrator
    -
    -
    - -
    - + {% elif insecure and databases %} +
    + Warning, {{ company_name }} database manager is not protected.
    + Please set a master password to + secure it.
    -
    -
    - -
    - -
    - + {% endif %} + {% if error %} +
    {{ error }}
    + {% endif %} + {% if list_db and databases %} +
    + {% for db in databases %} +
    + + {% if db in incompatible_databases %} + + {% endif %} + {{ db }} + + {% if manage %} +
    + + + +
    + {% endif %}
    + {% endfor %}
    -
    -
    - -
    - -
    -
    -
    - -
    - + {% if manage %} +
    + + +
    -
    -
    - -
    - -
    -
    -
    - -
    - + {% else %} +
    + Manage databases
    + {% endif %} + {% elif list_db %} +
    + {{ create_form() }} + +
    + or restore a + database + {% endif %}
    - {%- endmacro %} - - -
    - -
    -
    - - - {% if not list_db %} -
    The database manager has been disabled by the administrator
    - {% elif insecure and databases %} -
    - Warning, {{ company_name }} database manager is not protected.
    - Please set a master password to secure it. -
    - {% endif %} - {% if error %} -
    {{ error }}
    - {% endif %} - {% if list_db and databases %} -
    - {% for db in databases %} -
    - - {% if db in incompatible_databases %} - - {% endif %} - {{ db }} - - {% if manage %} -
    - - - -
    - {% endif %} -
    - {% endfor %} -
    - {% if manage %} -
    - - - -
    - {% else %} -
    - Manage databases -
    - {% endif %} - {% elif list_db %} -
    - {{ create_form() }} - -
    - or restore a database - {% endif %} +
    +
    + + - -