Permalink
Browse files

🌈 CI errors (#662)

Conflicts:
	theme_kit/__init__.py
	theme_kit/__openerp__.py
	theme_kit/models/res_config.py
	theme_kit/models/theme.py
  • Loading branch information...
GabbasovDinar committed Sep 25, 2018
1 parent 2a65174 commit 8d8fd6637c46b088864881c99a02a644ddd6de9b
View
@@ -1,2 +1,3 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
from . import models
View
@@ -1,10 +1,13 @@
# -*- coding: utf-8 -*-
# Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
{
"name": """Brand kit""",
"summary": """Brand your odoo instance in few clicks""",
"category": "Debranding",
"images": ['images/brandkit.png'],
"version": "1.1.2",
"version": "10.0.1.1.2",
"application": False,
"author": "IT-Projects LLC, Ivan Yelizariev",
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->
<odoo>
<data>
<!--Template Burger King-->
<record model="theme_kit.top_panel" id="burger_king_top_panel">
<field name="name">Burger King</field>
@@ -250,5 +251,4 @@
<field name="content_id" ref="ikea_content"/>
</record>
</data>
</odoo>
@@ -1,2 +1,3 @@
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
from . import theme
from . import res_config
@@ -1,4 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# Copyright 2016,2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
import hashlib
from openerp import models, fields, api
@@ -1,4 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# Copyright 2016,2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
from odoo import models, fields, api
from odoo.addons.base.ir.ir_qweb.assetsbundle import AssetsBundle, LessStylesheetAsset
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->
<odoo>
<data>
<record id="ir_attachment_login_bg_action" model="ir.actions.act_window">
<field name="name">Login page wallpapers</field>
<field name="type">ir.actions.act_window</field>
@@ -16,5 +17,4 @@
</p>
</field>
</record>
</data>
</odoo>
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
Copyright 2016,2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->
<odoo>
<data>
<menuitem id="main_menu" name="Brand Kit" parent="base.menu_administration" sequence="1" groups="base.group_no_one"/>
<record id="view_config" model="ir.ui.view">
@@ -77,5 +79,4 @@
</record>
<menuitem id="config_menu" name="Brand" parent="main_menu" sequence="1" action="config_action"/>
</data>
</odoo>
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<!-- Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->
<odoo noupdate="1">
<template id="theme_kit.custom_css">
<style type="text/css">
</style>
@@ -14,5 +16,4 @@
</template>
<template id="theme_kit.dummy">
</template>
</data>
</odoo>
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2016 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
Copyright 2016 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). -->
<odoo>
<data>
<record id="theme_view_tree" model="ir.ui.view">
<field name="name">theme_kit.theme.tree</field>
<field name="model">theme_kit.theme</field>
<field name="arch" type="xml">
<tree string="Color Schemes">
<tree>
<field name="name"/>
</tree>
</field>
@@ -284,5 +286,4 @@
<menuitem id="theme_left_panel_menu" name="Color Left Panel" parent="theme_color_setting" sequence="2" action="theme_left_panel_action"/>
<menuitem id="theme_conten_menu" name="Color Content" parent="theme_color_setting" sequence="3" action="theme_content_action"/>
</data>
</odoo>

0 comments on commit 8d8fd66

Please sign in to comment.