Skip to content

Commit

Permalink
Merge pull request odoo#34 from Viindoo/fwd_from_14_to_15_220312_01
Browse files Browse the repository at this point in the history
Fwd from 14 to 15 220312 01
  • Loading branch information
davidtranhp committed Mar 13, 2022
2 parents bad0612 + ca2d2b6 commit 698f945
Show file tree
Hide file tree
Showing 28 changed files with 529 additions and 6 deletions.
3 changes: 2 additions & 1 deletion viin_brand/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

'author': "Viindoo",
'website': "https://www.tvtmarine.com",
'live_test_url': "https://v13demo-int.erponline.vn",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "support@ma.tvtmarine.com",
'category': 'Hidden',
'version': '0.1',
Expand Down
3 changes: 2 additions & 1 deletion viin_brand_common/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

'author': "Viindoo",
'website': " https://viindoo.com",
'live_test_url': "https://v13demo-int.erponline.vn",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",
'category': 'Hidden',
'version': '0.1',
Expand Down
3 changes: 2 additions & 1 deletion viin_brand_im_livechat/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

'author': "Viindoo",
'website': "https://viindoo.com",
'live_test_url': "https://v13demo-int.erponline.vn",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",

# Categories can be used to filter modules in modules listing
Expand Down
3 changes: 2 additions & 1 deletion viin_brand_mail/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

'author': "Viindoo",
'website': "https://viindoo.com",
'live_test_url': "https://v13demo-int.erponline.vn",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",
'category': 'Hidden',
'version': '0.1.0',
Expand Down
8 changes: 8 additions & 0 deletions viin_brand_mail/static/src/scss/discuss_sidebar_item.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.o-unread {
color: $white;
}
.o_DiscussSidebarItem_activeIndicator {
&.o-item-active {
background-color: $brand-primary;
}
}
9 changes: 8 additions & 1 deletion viin_brand_mail/static/src/scss/message.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,12 @@
}
}
.o_Message_header {
padding-top: 10px;
color: $text-muted;
}
.o_Message_content {
*:not(li):not(li div) {
// Avoid vertical scroll caused by the following code in Odoo 14:
// https://github.com/odoo/odoo/blob/3e598a8014966e1a07a08d53bf85050b458e05a6/addons/mail/static/src/components/message/message.scss#L56
overflow-x: inherit;
}
}
13 changes: 13 additions & 0 deletions viin_brand_mail/static/src/scss/partner_im_status_icon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.o_PartnerImStatusIcon_icon {
&.o-bot {
color: $brand-primary;
}

&.o-offline {
color: gray('500');
}

&.o-online {
color: $brand-primary;
}
}
3 changes: 3 additions & 0 deletions viin_brand_mail/static/src/scss/thread_icon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.o_ThreadIcon_online {
color: $brand-primary;
}
18 changes: 18 additions & 0 deletions viin_brand_mail/views/assets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,29 @@
<link rel="stylesheet" type="text/scss"
href="/viin_brand_mail/static/src/scss/chat_window_header.scss" />
</xpath>
<xpath
expr="//link[@href='/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.scss']"
position="after">
<link rel="stylesheet" type="text/scss"
href="/viin_brand_mail/static/src/scss/discuss_sidebar_item.scss" />
</xpath>
<xpath
expr="//link[@href='/mail/static/src/components/message/message.scss']"
position="after">
<link rel="stylesheet" type="text/scss"
href="/viin_brand_mail/static/src/scss/message.scss" />
</xpath>
<xpath
expr="//link[@href='/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.scss']"
position="after">
<link rel="stylesheet" type="text/scss"
href="/viin_brand_mail/static/src/scss/partner_im_status_icon.scss" />
</xpath>
<xpath
expr="//link[@href='/mail/static/src/components/thread_icon/thread_icon.scss']"
position="after">
<link rel="stylesheet" type="text/scss"
href="/viin_brand_mail/static/src/scss/thread_icon.scss" />
</xpath>
</template>
</data>
Expand Down
Empty file.
59 changes: 59 additions & 0 deletions viin_brand_sale_quotation_builder/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# -*- coding: utf-8 -*-
{
'name': "Quotation Builder Debranding for Viindoo",
'name_vi_VN': "",

'summary': """
Debranding Quotation Builder for Viindoo""",

'summary_vi_VN': """
Làm lại màu sắc Quotation Builder theo thương hiệu Viindoo
""",

'description': """
Editions Supported
==================
1. Community Edition
""",

'description_vi_VN': """
Ấn bản được Hỗ trợ
==================
1. Ấn bản Community
""",

'author': "Viindoo",
'website': "https://viindoo.com",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",

# Categories can be used to filter modules in modules listing
# Check https://github.com/tvtma/odoo/blob/13.0/odoo/addons/base/data/ir_module_category_data.xml
# for the full list
'category': 'Hidden',
'version': '0.1',

# any module necessary for this one to work correctly
'depends': ['sale_quotation_builder'],

# always loaded
'data': [
# 'security/ir.model.access.csv',
'views/templates.xml',
],

'images': [
# 'static/description/main_screenshot.png'
],
'installable': False,
'application': False,
'auto_install': False, # Set this True after upgrade for v15
'price': 0.0,
'currency': 'EUR',
'license': 'OPL-1',
}
26 changes: 26 additions & 0 deletions viin_brand_sale_quotation_builder/i18n/vi_VN.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * viin_brand_sale_quotation_builder
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-15 02:05+0000\n"
"PO-Revision-Date: 2022-02-15 02:05+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: viin_brand_sale_quotation_builder
#: model_terms:ir.ui.view,arch_db:viin_brand_sale_quotation_builder.brand_promotion
msgid "An"
msgstr "Một"

#. module: viin_brand_sale_quotation_builder
#: model_terms:ir.ui.view,arch_db:viin_brand_sale_quotation_builder.brand_promotion
msgid "awesome Open Source CRM"
msgstr "phần mềm CRM Mã nguồn mở tuyệt vời"
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * viin_brand_sale_quotation_builder
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-02-15 02:05+0000\n"
"PO-Revision-Date: 2022-02-15 02:05+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: viin_brand_sale_quotation_builder
#: model_terms:ir.ui.view,arch_db:viin_brand_sale_quotation_builder.brand_promotion
msgid "An"
msgstr ""

#. module: viin_brand_sale_quotation_builder
#: model_terms:ir.ui.view,arch_db:viin_brand_sale_quotation_builder.brand_promotion
msgid "awesome Open Source CRM"
msgstr ""
19 changes: 19 additions & 0 deletions viin_brand_sale_quotation_builder/views/templates.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<odoo>
<data>
<template id="brand_promotion"
inherit_id="sale_quotation_builder.brand_promotion">
<xpath
expr="//t[@t-call='web.brand_promotion_message']"
position="replace">
<t t-call="web.brand_promotion_message">
<t t-set="_message">
An
<a target="_blank"
href="https://viindoo.com/intro/crm?utm_source=db&amp;utm_medium=portal">awesome Open Source CRM</a>
</t>
<t t-set="_utm_medium" t-valuef="portal" />
</t>
</xpath>
</template>
</data>
</odoo>
Empty file.
62 changes: 62 additions & 0 deletions viin_brand_web_unsplash/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
'name': "Unsplash Image Library Branding For Viindoo",
'name_vi_VN': "Giao diện Viindoo cho module Unsplash Image Library ",

'summary': """
Theme branding Viindoo for module Unsplash Image Library""",
'summary_vi_VN': """
Giao diện brand Viindoo cho module Point Of Sale
""",

'description': """
What it does
============
This module will change color in navigate bar, button and logo,v.v following Viindoo's brand
Editions Supported
==================
1. Community Edition
2. Enterprise Edition
""",

'description_vi_VN': """
Ứng dụng này làm gì
===================
Module này sẽ thay đổi giao diện theo thương hiệu Viindoo
Ấn bản được Hỗ trợ
==================
1. Ấn bản Community
2. Ấn bản Enterprise
""",

'author': "Viindoo",
'website': "https://viindoo.com",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",

# Categories can be used to filter modules in modules listing
# Check https://github.com/odoo/odoo/blob/14.0/odoo/addons/base/data/ir_module_category_data.xml
# for the full list
'category': 'Hidden',
'version': '0.1',

# any module necessary for this one to work correctly
'depends': ['web_unsplash'],

# always loaded
'data': [
'views/res_config_settings_view.xml',
],
'installable': False,
'application': False,
'auto_install': False, # Set this True after upgrade for v15
'price': 0.0,
'currency': 'EUR',
'license': 'OPL-1',
}
17 changes: 17 additions & 0 deletions viin_brand_web_unsplash/views/res_config_settings_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<odoo>
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="name">res.config.settings.view.form</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="web_unsplash.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@id='web_unsplash_settings']/a[hasclass('o_doc_link')]"
position="attributes">
<attribute name="href">https://viindoo.com/documentation/14.0/applications/websites/website/optimize/how-to-intergrate-with-free-image-libruary-at-unsplash.html</attribute>
</xpath>
<xpath expr="//div[@id='web_unsplash_settings']/div/div/a[hasclass('oe_link')]"
position="attributes">
<attribute name="href">https://viindoo.com/documentation/14.0/applications/websites/website/optimize/how-to-intergrate-with-free-image-libruary-at-unsplash.html</attribute>
</xpath>
</field>
</record>
</odoo>
Empty file added viin_brand_website/__init__.py
Empty file.
59 changes: 59 additions & 0 deletions viin_brand_website/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# -*- coding: utf-8 -*-
{
'name': "Website Debranding for Viindoo",
'name_vi_VN': "",

'summary': """
Debranding Website Builder for Viindoo""",

'summary_vi_VN': """
Làm lại màu sắc Bộ công cụ dựng website theo thương hiệu Viindoo
""",

'description': """
Editions Supported
==================
1. Community Edition
""",

'description_vi_VN': """
Ấn bản được Hỗ trợ
==================
1. Ấn bản Community
""",

'author': "Viindoo",
'website': "https://viindoo.com",
'live_test_url': "https://v14demo-int.viindoo.com",
'live_test_url_vi_VN': "https://v14demo-vn.viindoo.com",
'support': "apps.support@viindoo.com",

# Categories can be used to filter modules in modules listing
# Check https://github.com/tvtma/odoo/blob/13.0/odoo/addons/base/data/ir_module_category_data.xml
# for the full list
'category': 'Hidden',
'version': '0.1',

# any module necessary for this one to work correctly
'depends': ['website'],

# always loaded
'data': [
# 'security/ir.model.access.csv',
'views/templates.xml',
],

'images': [
# 'static/description/main_screenshot.png'
],
'installable': False,
'application': False,
'auto_install': False, # Set this True after upgrade for v15
'price': 0.0,
'currency': 'EUR',
'license': 'OPL-1',
}

0 comments on commit 698f945

Please sign in to comment.