thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[FIX] Crash Issue Fix

pull/46/head
SHEREEF PT 8 years ago
parent
a4e66fe5d8
commit
77c0bc3b24
5 changed files with 84 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      odoo-debrand/__manifest__.py
  2. 7
      odoo-debrand/doc/changelog.rst
  3. 1
      odoo-debrand/models/__init__.py
  4. 22
      odoo-debrand/views/templates.xml
  5. 144
      odoo-debrand/views/views.xml

5
odoo-debrand/__manifest__.py
View File

@ -22,7 +22,7 @@
############################################################################## ##############################################################################
{ {
'name': "Odoo Debranding", 'name': "Odoo Debranding",
'version': "10.0.1.0", 'version': "10.0.2.0",
'summary': """Debrand Odoo""", 'summary': """Debrand Odoo""",
'description': """Debrand Odoo""", 'description': """Debrand Odoo""",
'author': "Cybrosys Techno Solutions", 'author': "Cybrosys Techno Solutions",
@ -31,8 +31,7 @@
'category': 'Tools', 'category': 'Tools',
'depends': ['base', 'im_livechat', 'website'], 'depends': ['base', 'im_livechat', 'website'],
'data': [ 'data': [
'views/views.xml', 'views/views.xml'],
'views/templates.xml'],
'demo': [], 'demo': [],
'qweb': ["static/src/xml/*.xml"], 'qweb': ["static/src/xml/*.xml"],
'images': ['static/description/banner.jpg'], 'images': ['static/description/banner.jpg'],

7
odoo-debrand/doc/changelog.rst
View File

@ -0,0 +1,7 @@
Changelog
=========
`10.0.2.0.0`
------------
- Fixed Crash Issue on Un-installing.

1
odoo-debrand/models/__init__.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from . import models from . import models

22
odoo-debrand/views/templates.xml
View File

@ -1,22 +0,0 @@
<openerp>
<data>
<!-- <template id="listing"> -->
<!-- <ul> -->
<!-- <li t-foreach="objects" t-as="object"> -->
<!-- <a t-attf-href="#{ root }/objects/#{ object.id }"> -->
<!-- <t t-esc="object.display_name"/> -->
<!-- </a> -->
<!-- </li> -->
<!-- </ul> -->
<!-- </template> -->
<!-- <template id="object"> -->
<!-- <h1><t t-esc="object.display_name"/></h1> -->
<!-- <dl> -->
<!-- <t t-foreach="object._fields" t-as="field"> -->
<!-- <dt><t t-esc="field"/></dt> -->
<!-- <dd><t t-esc="object[field]"/></dd> -->
<!-- </t> -->
<!-- </dl> -->
<!-- </template> -->
</data>
</openerp>

144
odoo-debrand/views/views.xml
View File

@ -1,97 +1,100 @@
<openerp> <odoo>
<data> <record id="debrand_config" model="ir.ui.view">
<record id="debrand_config" model="ir.ui.view">
<field name="name">Debranding Configuration</field> <field name="name">Debranding Configuration</field>
<field name="model">website.config.settings</field> <field name="model">website.config.settings</field>
<field name="inherit_id" ref="website.view_website_config_settings"/> <field name="inherit_id" ref="website.view_website_config_settings"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//group[@name='social']" position="after"> <xpath expr="//group[@name='social']" position="after">
<group name="debrand_config" string="Debranding Configurations"> <group name="debrand_config" string="Debranding Configurations">
<label for="company_logo" string="Company Logo"/> <label for="company_logo" string="Company Logo"/>
<div>
<div id="company_logo" class="oe_inline">
<field name="company_logo"
widget="image"
class="oe_avatar"
options="{'preview_image': 'image_medium', 'size': [130, 130]}"
/>
</div>
</div>
<label for="company_favicon" string="Company Favicon"/>
<div>
<div id="company_favicon" class="oe_inline">
<field name="company_favicon"
widget="image"
class="oe_avatar"
options="{'preview_image': 'image_small', 'size': [30, 30]}"/>
</div>
</div>
<label for="company_name" string="Company Name"/>
<div> <div>
<div id="company_logo" class="oe_inline"> <div id="company_name" class="oe_inline">
<field name="company_logo" <field name="company_name"/>
widget="image"
class="oe_avatar"
options="{'preview_image': 'image_medium', 'size': [130, 130]}"
/>
</div> </div>
</div> </div>
<label for="company_favicon" string="Company Favicon"/> <label for="company_website" string="Company Website"/>
<div> <div>
<div id="company_favicon" class="oe_inline"> <div id="company_website" class="oe_inline">
<field name="company_favicon" <field name="company_website"/>
widget="image"
class="oe_avatar"
options="{'preview_image': 'image_small', 'size': [30, 30]}"/>
</div> </div>
</div> </div>
<label for="company_name" string="Company Name"/> </group>
<div> </xpath>
<div id="company_name" class="oe_inline">
<field name="company_name"/>
</div>
</div>
<label for="company_website" string="Company Website"/>
<div>
<div id="company_website" class="oe_inline">
<field name="company_website"/>
</div>
</div>
</group>
</xpath>
</field> </field>
</record> </record>
<template id="login_layout" inherit_id="web.login_layout"> <template id="login_layout" inherit_id="web.login_layout">
<xpath expr="//div[@class='text-center']" position="replace"> <xpath expr="//div[@class='text-center']" position="replace">
<div class="text-center" t-if="not disable_footer"> <div class="text-center" t-if="not disable_footer">
<t t-if="not disable_database_manager"> <t t-if="not disable_database_manager">
<a class="" href="/web/database/manager">Manage Databases</a> | <a class="" href="/web/database/manager">Manage Databases</a> |
</t> </t>
<a t-att-href="request.env['website'].sudo().search([])[0].company_name or ''" target="_blank"> <a t-att-href="request.env['website'].sudo().search([])[0].company_name or ''" target="_blank">
<span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a> <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
</div> </div>
</xpath>
</xpath>
</template> </template>
<template id="login_layout_secondary" inherit_id="web.menu_secondary"> <template id="login_layout_secondary" inherit_id="web.menu_secondary">
<xpath expr="//div[@class='o_sub_menu_footer']" position="replace"> <xpath expr="//div[@class='o_sub_menu_footer']" position="replace">
<div class="o_sub_menu_footer"> <div class="o_sub_menu_footer">
Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank"> Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank">
<span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a> <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
</div> </div>
</xpath> </xpath>
</template> </template>
<template id="login_layout_im_livechat" inherit_id="im_livechat.support_page"> <template id="login_layout_im_livechat" inherit_id="im_livechat.support_page">
<xpath expr="//body" position="replace"> <xpath expr="//body" position="replace">
<body> <body>
<div class="main" style="opacity: 1;"> <div class="main" style="opacity: 1;">
<h1 class="channel_name"><t t-esc="channel.name"/></h1> <h1 class="channel_name"><t t-esc="channel.name"/></h1>
<div>Website Live Chat Powered by <strong><t t-esc="request.env['website'].sudo().search([])[0].company_name or '"/></strong></div> <div>Website Live Chat Powered by <strong><t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></strong></div>
</div> </div>
</body> </body>
</xpath> </xpath>
</template> </template>
<template id="login_layout" inherit_id="mail.message_user_assigned"> <template id="login_layout" inherit_id="mail.message_user_assigned">
<xpath expr="//p[last()]" position="replace"> <xpath expr="//p[last()]" position="replace">
<p style="color:#9E588B;">Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''"> <p style="color:#9E588B;">Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''">
<t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>.</p> <t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>.</p>
</xpath> </xpath>
</template> </template>
<template id="website.layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
<xpath expr="//footer" position="inside"> <template id="layout_footer_copyright" inherit_id="website.layout" name="Footer Copyright">
<div class="container mt16 mb8"> <xpath expr="//footer" position="inside">
<div class="pull-right" t-if="not editable"> <div class="container mt16 mb8">
Powered by <a class="label label-danger" t-att-href="request.env['website'].sudo().search([])[0].company_website"> <div class="pull-right" t-if="not editable">
<t t-esc="request.env['website'].sudo().search([])[0].company_name"/> </a>. Powered by <a class="label label-danger" t-att-href="request.env['website'].sudo().search([])[0].company_website or ''">
</div> <t t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/> </a>.
<div class="pull-left text-muted"> </div>
Copyright &amp;copy; <span t-esc="request.env['website'].sudo().search([])[0].company_name"/> <div class="pull-left text-muted">
Copyright &amp;copy; <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/>
</div>
</div> </div>
</div> </xpath>
</xpath>
</template> </template>
<template id="footer_extend" inherit_id="website.footer_custom"> <template id="footer_extend" inherit_id="website.footer_custom">
<xpath position="replace" expr="//h2"/> <xpath position="replace" expr="//h2"/>
</template> </template>
@ -133,8 +136,8 @@
<a class="" href="/web/database/manager">Manage Databases</a> | <a class="" href="/web/database/manager">Manage Databases</a> |
</t> </t>
<t> <t>
<a t-att-href="request.env['website'].sudo().search([])[0].company_website" target="_blank">Powered by <a t-att-href="request.env['website'].sudo().search([])[0].company_website or ''" target="_blank">Powered by
<span t-esc="request.env['website'].sudo().search([])[0].company_name"/></a> <span t-esc="request.env['website'].sudo().search([])[0].company_name or ''"/></a>
</t> </t>
</div> </div>
@ -142,5 +145,4 @@
</div> </div>
</xpath> </xpath>
</template> </template>
</data> </odoo>
</openerp>
Write Preview
Loading…
Cancel
Save