Merge pull request #67 from hilarak/10.0

10.0  [FIX] footer conflict

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",

odoo-debrand/controllers/controllers.py

@@ -23,12 +23,12 @@ db_monodb = http.db_monodb
 
 
 class BinaryCustom(Binary):
-    @http.route([
+	@http.route([
-        '/web/binary/company_logo',
+	'/web/binary/company_logo',
-        '/logo',
+	'/logo',
-        '/logo.png',
+	'/logo.png',
-    ], type='http', auth="none")
+	], 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

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>
+</odoo>