diff --git a/addons/web/static/fonts/fonts.scss b/addons/web/static/fonts/fonts.scss index 1abe7d3ac42..20eb361b8b0 100644 --- a/addons/web/static/fonts/fonts.scss +++ b/addons/web/static/fonts/fonts.scss @@ -89,3 +89,4 @@ $google-font-path: './google'; @include google-font-pair('Oswald'); @include google-font-pair('Raleway'); @include google-font-pair('Roboto'); +@include google-font-pair('Tajawal'); diff --git a/addons/web/static/fonts/google/Tajawal/OFL.txt b/addons/web/static/fonts/google/Tajawal/OFL.txt new file mode 100644 index 00000000000..76c01b50a1d --- /dev/null +++ b/addons/web/static/fonts/google/Tajawal/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2018 Boutros International. (http://www.boutrosfonts.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-Black.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-Black.ttf new file mode 100644 index 00000000000..f9a40b5443e Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-Black.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-Bold.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-Bold.ttf new file mode 100644 index 00000000000..081ac580c33 Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-Bold.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraBold.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraBold.ttf new file mode 100644 index 00000000000..2904c3c14dc Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraBold.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraLight.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraLight.ttf new file mode 100644 index 00000000000..a3e2686ae1a Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-ExtraLight.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-Light.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-Light.ttf new file mode 100644 index 00000000000..dfc9d93fa66 Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-Light.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-Medium.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-Medium.ttf new file mode 100644 index 00000000000..4176ac15fb5 Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-Medium.ttf differ diff --git a/addons/web/static/fonts/google/Tajawal/Tajawal-Regular.ttf b/addons/web/static/fonts/google/Tajawal/Tajawal-Regular.ttf new file mode 100644 index 00000000000..747f56cfe31 Binary files /dev/null and b/addons/web/static/fonts/google/Tajawal/Tajawal-Regular.ttf differ diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py index a33ab9e1424..7804e9d0173 100644 --- a/odoo/addons/base/models/res_company.py +++ b/odoo/addons/base/models/res_company.py @@ -91,7 +91,7 @@ class Company(models.Model): base_onboarding_company_state = fields.Selection([ ('not_done', "Not done"), ('just_done', "Just done"), ('done', "Done")], string="State of the onboarding company step", default='not_done') favicon = fields.Binary(string="Company Favicon", help="This field holds the image used to display a favicon for a given company.", default=_get_default_favicon) - font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway")], default="Lato") + font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway"), ('Tajawal', 'Tajawal')], default="Lato") primary_color = fields.Char() secondary_color = fields.Char() layout_background = fields.Selection([('Blank', 'Blank'), ('Geometric', 'Geometric'), ('Custom', 'Custom')], default="Blank", required=True)