From c8ff02cbd0563ab1da0f826a6dd1719738c413a3 Mon Sep 17 00:00:00 2001
From: Hilar Ak <hilarak@gmail.com>
Date: Tue, 13 Mar 2018 14:02:43 +0530
Subject: [PATCH 1/4] [FIX] footer conflict #66

---
 odoo-debrand/views/views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odoo-debrand/views/views.xml b/odoo-debrand/views/views.xml
index e31d82e71..578e39bbb 100644
--- a/odoo-debrand/views/views.xml
+++ b/odoo-debrand/views/views.xml
@@ -82,7 +82,7 @@
     </template>
 
     <template id="layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
-        <xpath expr="//footer" position="inside">
+        <xpath expr="//div[@class='container mt16 mb8']" position="replace">
               <div class="container mt16 mb8">
                   <div class="pull-right" t-if="not editable">
                     Powered by <a class="label label-danger" t-att-href="request.env['website'].sudo().search([])[0].company_website or ''">
@@ -145,4 +145,4 @@
             </div>
         </xpath>
     </template>
-</odoo>
\ No newline at end of file
+</odoo>

From 1dff29d66e068ba7d9874429f85d77777a5b66a3 Mon Sep 17 00:00:00 2001
From: Hilar Ak <hilarak@gmail.com>
Date: Tue, 13 Mar 2018 14:03:08 +0530
Subject: [PATCH 2/4] Update __manifest__.py

---
 odoo-debrand/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo-debrand/__manifest__.py b/odoo-debrand/__manifest__.py
index 606c657cb..cb5439303 100644
--- a/odoo-debrand/__manifest__.py
+++ b/odoo-debrand/__manifest__.py
@@ -22,7 +22,7 @@
 ##############################################################################
 {
     'name': "Odoo Debranding",
-    'version': "10.0.2.0",
+    'version': "10.0.3.0",
     'summary': """Debrand Odoo""",
     'description': """Debrand Odoo""",
     'author': "Cybrosys Techno Solutions",

From ba9586564876fabd9ca8a300dff8c01ab4ad0324 Mon Sep 17 00:00:00 2001
From: Hilar Ak <hilarak@gmail.com>
Date: Tue, 13 Mar 2018 14:04:07 +0530
Subject: [PATCH 3/4] Update controllers.py

---
 odoo-debrand/controllers/controllers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo-debrand/controllers/controllers.py b/odoo-debrand/controllers/controllers.py
index 5dff53697..977c9c49a 100644
--- a/odoo-debrand/controllers/controllers.py
+++ b/odoo-debrand/controllers/controllers.py
@@ -28,7 +28,7 @@ class BinaryCustom(Binary):
         '/logo',
         '/logo.png',
     ], type='http', auth="none")
-    def company_logo(self, dbname=None, **kw):
+	def company_logo(self, dbname=None, **kw):
 		imgname = 'logo'
 		imgext = '.png'
 		company_logo = request.env['website'].sudo().search([])[0].company_logo

From 2c89ee58f90469d8c8ef2331837f9f3c2bb9dc58 Mon Sep 17 00:00:00 2001
From: Hilar Ak <hilarak@gmail.com>
Date: Tue, 13 Mar 2018 14:38:33 +0530
Subject: [PATCH 4/4] Upadate tabs

---
 odoo-debrand/controllers/controllers.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/odoo-debrand/controllers/controllers.py b/odoo-debrand/controllers/controllers.py
index 977c9c49a..3d2b04158 100644
--- a/odoo-debrand/controllers/controllers.py
+++ b/odoo-debrand/controllers/controllers.py
@@ -23,11 +23,11 @@ db_monodb = http.db_monodb
 
 
 class BinaryCustom(Binary):
-    @http.route([
-        '/web/binary/company_logo',
-        '/logo',
-        '/logo.png',
-    ], type='http', auth="none")
+	@http.route([
+	'/web/binary/company_logo',
+	'/logo',
+	'/logo.png',
+	], type='http', auth="none")
 	def company_logo(self, dbname=None, **kw):
 		imgname = 'logo'
 		imgext = '.png'