diff --git a/odoo-debrand/__init__.py b/odoo-debrand/__init__.py index 9e5827f90..aa4d0fd63 100644 --- a/odoo-debrand/__init__.py +++ b/odoo-debrand/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- + from . import controllers from . import models diff --git a/odoo-debrand/__manifest__.py b/odoo-debrand/__manifest__.py index d2df2e102..2f531bf84 100644 --- a/odoo-debrand/__manifest__.py +++ b/odoo-debrand/__manifest__.py @@ -20,9 +20,10 @@ # If not, see . # ############################################################################## + { 'name': "Odoo Debranding", - 'version': "12.0.1.0", + 'version': "12.0.1.0.1", 'summary': """Debrand Odoo""", 'description': """Debrand Odoo""", 'author': "Cybrosys Techno Solutions", @@ -31,7 +32,8 @@ 'category': 'Tools', 'depends': ['base', 'im_livechat', 'website'], 'data': [ - 'views/views.xml'], + 'views/views.xml' + ], 'demo': [], 'qweb': ["static/src/xml/base.xml"], 'images': ['static/description/debranding_1.gif'], diff --git a/odoo-debrand/controllers/controllers.py b/odoo-debrand/controllers/controllers.py index 2490cf78b..703e21dbd 100644 --- a/odoo-debrand/controllers/controllers.py +++ b/odoo-debrand/controllers/controllers.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- + import imghdr import json import io diff --git a/odoo-debrand/doc/changelog.rst b/odoo-debrand/doc/changelog.rst index 4d4886673..6e041335a 100644 --- a/odoo-debrand/doc/changelog.rst +++ b/odoo-debrand/doc/changelog.rst @@ -5,3 +5,6 @@ Changelog ------------ - Initial commit +`12.0.1.0.1` +------------ +- [Fix] Issue in New Db Creation \ No newline at end of file diff --git a/odoo-debrand/models/models.py b/odoo-debrand/models/models.py index 51a371293..105497d12 100644 --- a/odoo-debrand/models/models.py +++ b/odoo-debrand/models/models.py @@ -8,7 +8,6 @@ from odoo import models, fields, api, tools class OdooDebrand(models.Model): _inherit = "website" - def get_company_logo(self): id = self.env.user.company_id.id self.company_logo_url ="/web/image/res.company/%s/logo"%(id) diff --git a/odoo-debrand/static/src/xml/base.xml b/odoo-debrand/static/src/xml/base.xml index 66a53ecd7..78c9c87cc 100644 --- a/odoo-debrand/static/src/xml/base.xml +++ b/odoo-debrand/static/src/xml/base.xml @@ -1,12 +1,14 @@ - - - + + + diff --git a/odoo-debrand/views/database_manager_extend.html b/odoo-debrand/views/database_manager_extend.html index 9a724d035..958ab407e 100644 --- a/odoo-debrand/views/database_manager_extend.html +++ b/odoo-debrand/views/database_manager_extend.html @@ -1,363 +1,365 @@ - - - - {{ website_name }} - - - - - - - - - - - - - - - - - + + + {{ website_name }} + - - + + -{% macro master_input() -%} -
- {% if insecure %} - - {% else %} - - - {% endif %} -
-{%- endmacro %} + -{% macro create_form() -%} -

Odoo is up and running!
- Create a new database by filling out the form, - you'll be able to install your first app in a minute.

- {{ master_input() }} -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - - -
-
-
-
- - -
-
- - -
-
-
-
-
- -
-
-{%- endmacro %} + - - -
-
-
- -
- {% if 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 databases %} -
- {% for db in databases %} - - {{ db }} - {% if manage %} -
- Backup - Duplicate - Delete -
+ + + + + + + + + + + + + + + + + {% macro master_input() -%} +
+ {% if insecure %} + + {% else %} + + {% endif %} - - {% endfor %}
- {% if manage %} -
- - - -
- {% else %} -
- Manage databases -
- {% endif %} - {% else %} -
- {{ create_form() }} - -
- - or restore a database - - {% endif %} -
-
+ {%- endmacro %} - - - - -