[FIX] Bug Fixed 'odoo-debrand'

6 years ago · 8959ad883e
10 changed files with 165 additions and 51 deletions
--- a/odoo-debrand/README.rst
+++ b/odoo-debrand/README.rst
@ -1,6 +1,6 @@
-.. image:: https://img.shields.io/badge/licence-GPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/gpl-3.0-standalone.html
-   :alt: License: GPL-3
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3

 ===============
 Odoo Debranding
@ -8,6 +8,7 @@ Odoo Debranding

 Debranding of odoo with the given configurations under Website Admin -> Debranding Configurations.
 Will replace:
+
 - Page Title
 - Odoo from Popups
 - Settings Odoo branding Items
@ -18,39 +19,39 @@ Will replace:
 - Odoo Database Selector Logo, Labels
 - Copyright @odoo with your company on website page

-
-
-
 Installation
 ============
+- www.odoo.com/documentation/12.0/setup/install.html
+- Install our custom addon

-To install this module from odoo apps after updating the app list.
-
-
-Usage
-=====
+Company
+-------
+* `Cybrosys Techno Solutions <https://cybrosys.com/>`__

-Fill the configuration under Website Admin. Clear Browser Image caches after installing the module.
+Credits
+-------
+* Developer:
+   V12 Tintuk Tomin

-Known issues / Roadmap
-======================
-
-* ...
+Contacts
+--------
+* Mail Contact : odoo@cybrosys.com

 Bug Tracker
-===========
-
-Contact odoo@cybrosys.com
+-----------
+Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.

+Maintainer
+==========
+.. image:: https://cybrosys.com/images/logo.png
+   :target: https://cybrosys.com

-Contributors
------------
+This module is maintained by Cybrosys Technologies.

-* Tintuk Tomin <odoo@cybrosys.com>
+For support and more information, please visit `Our Website <https://cybrosys.com/>`__

-Maintainer
----------
+Further information
+===================
+HTML Description: `<static/description/index.html>`__

-This module is maintained by Cybrosys Technologies.

-For support and more information, please visit https://www.cybrosys.com.
--- a/odoo-debrand/init.py
+++ b/odoo-debrand/init.py
@ -1,4 +1,24 @@
 # -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################

 from . import controllers
 from . import models
--- a/odoo-debrand/manifest.py
+++ b/odoo-debrand/manifest.py
@ -1,30 +1,33 @@
 # -*- coding: utf-8 -*-
-##############################################################################
+#############################################################################
 #
 #    Cybrosys Technologies Pvt. Ltd.
-#    Copyright (C) 2017-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
-#    Author:Tintuk Tomin <tintuk@cybrosys.in>
-#    you can modify it under the terms of the GNU LESSER
-#    GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
-
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
 #
-#    You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
-#    GENERAL PUBLIC LICENSE (LGPL v3) along with this program.
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
 #    If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
+#############################################################################

 {
    'name': "Odoo Debranding",
-    'version': "12.0.1.0.1",
+    'version': "12.0.1.1.1",
    'summary': """Debrand Odoo""",
-    'description': """Debrand Odoo""",
+    'description': """Debrand Odoo,Debranding""",
    'author': "Cybrosys Techno Solutions",
    'company': "Cybrosys Techno Solutions",
+    'maintainer': "Cybrosys Techno Solutions",
    'website': "https://cybrosys.com/",
    'category': 'Tools',
    'depends': ['base', 'im_livechat', 'website'],
@ -34,7 +37,7 @@
    'demo': [],
    'qweb': ["static/src/xml/base.xml"],
    'images': ['static/description/debranding_1.gif'],
-    'license': "LGPL-3",
+    'license': "AGPL-3",
    'installable': True,
    'application': False
 }
--- a/odoo-debrand/controllers/init.py
+++ b/odoo-debrand/controllers/init.py
@ -1,3 +1,23 @@
 # -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################

 from . import controllers
--- a/odoo-debrand/controllers/controllers.py
+++ b/odoo-debrand/controllers/controllers.py
@ -1,4 +1,24 @@
 # -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################

 import imghdr
 import json
@ -86,7 +106,9 @@ class BinaryCustom(Binary):


 class OdooDebrand(Database):
+
 	def _render_template(self, **d):
+
 		d.setdefault('manage', True)
 		d['insecure'] = odoo.tools.config.verify_admin_password('admin')
 		d['list_db'] = odoo.tools.config['list_db']
@ -95,6 +117,7 @@ class OdooDebrand(Database):
 		d['pattern'] = DBNAME_PATTERN
 		website_id = request.env['website'].sudo().search([])
 		d['website_name'] = website_id and website_id[0].name or ''
+		d['company_name'] = website_id and website_id[0].company_id.name or ''
 		d['favicon']= website_id and	website_id[0].favicon_url or ''
 		d['company_logo_url'] = website_id and website_id[0].company_logo_url or ''

--- a/odoo-debrand/doc/changelog.md
+++ b/odoo-debrand/doc/changelog.md
@ -0,0 +1,16 @@
+## Module <odoo-debrand>
+
+#### 01.01.2019
+#### Version 12.0.1.0.0
+#### ADD
+Initial Commit for odoo-debrand
+
+#### 10.02.2019
+#### Version 12.0.1.0.1
+#### FIX
+Bug Fixed, Issue in New Db Creation
+
+#### 25.09.2019
+#### Version 12.0.1.1.1
+#### FIX
+Bug Fixed, Icon in database manager.
--- a/odoo-debrand/doc/changelog.rst
+++ b/odoo-debrand/doc/changelog.rst
@ -1,10 +0,0 @@
-Changelog
-=========
-
-`12.0.1.0.0`
------------
- Initial commit
-
-`12.0.1.0.1`
------------
- [Fix] Issue in New Db Creation
--- a/odoo-debrand/models/init.py
+++ b/odoo-debrand/models/init.py
@ -1,3 +1,23 @@
 # -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################

 from . import models
--- a/odoo-debrand/models/models.py
+++ b/odoo-debrand/models/models.py
@ -1,4 +1,24 @@
 # -*- coding: utf-8 -*-
+#############################################################################
+#
+#    Cybrosys Technologies Pvt. Ltd.
+#
+#    Copyright (C) 2019-TODAY Cybrosys Technologies(<https://www.cybrosys.com>).
+#    Author: Tintuk Tomin(<https://www.cybrosys.com>)
+#
+#    You can modify it under the terms of the GNU AFFERO
+#    GENERAL PUBLIC LICENSE (AGPL v3), Version 3.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU AFFERO GENERAL PUBLIC LICENSE (AGPL v3) for more details.
+#
+#    You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+#    (AGPL v3) along with this program.
+#    If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################

 import base64
 import os
--- a/odoo-debrand/views/database_manager_extend.html
+++ b/odoo-debrand/views/database_manager_extend.html
@ -126,12 +126,13 @@
            <!-- Database List -->
            <div class="row">
                <div class="col-lg-6 offset-lg-3 o_database_list">
-                    <img src="/web/static/src/img/logo2.png" class="img-fluid d-block mx-auto"/>
+                    <img src="{{ company_logo_url }}" class="img-fluid d-block mx-auto"/>
+                    <!--<img src="/web/static/src/img/logo2.png" class="img-fluid d-block mx-auto"/>-->
                    {% if not list_db %}
                        <div class="alert alert-danger text-center">The database manager has been disabled by the administrator</div>
                    {% elif insecure and databases %}
                        <div class="alert alert-warning">
-                            Warning, your database manager is not protected.<br/>
+                            Warning, {{ company_name }} database manager is not protected.<br/>
                            Please <a href="#" data-toggle="modal" data-target=".o_database_master">set a master password</a> to secure it.
                        </div>
                    {% endif %}