From fd62c26017e730d0701da71995161b3c59dddcec Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Tue, 22 Jun 2021 16:39:53 +0200 Subject: [PATCH 01/14] Add product_brand_tag --- product_brand_tag/README.rst | 75 ++++ product_brand_tag/__init__.py | 1 + product_brand_tag/__manifest__.py | 21 + product_brand_tag/i18n/product_brand_tag.pot | 112 +++++ product_brand_tag/models/__init__.py | 2 + product_brand_tag/models/product_brand.py | 18 + product_brand_tag/models/product_brand_tag.py | 71 +++ product_brand_tag/readme/CONTRIBUTORS.rst | 1 + product_brand_tag/readme/DESCRIPTION.rst | 3 + .../security/ir.model.access.csv | 3 + product_brand_tag/security/ir_rule.xml | 16 + product_brand_tag/static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 420 ++++++++++++++++++ product_brand_tag/tests/__init__.py | 1 + product_brand_tag/tests/test_product_brand.py | 52 +++ .../views/product_brand_tag_view.xml | 30 ++ .../views/product_brand_view.xml | 25 ++ 17 files changed, 851 insertions(+) create mode 100644 product_brand_tag/README.rst create mode 100644 product_brand_tag/__init__.py create mode 100644 product_brand_tag/__manifest__.py create mode 100644 product_brand_tag/i18n/product_brand_tag.pot create mode 100644 product_brand_tag/models/__init__.py create mode 100644 product_brand_tag/models/product_brand.py create mode 100644 product_brand_tag/models/product_brand_tag.py create mode 100644 product_brand_tag/readme/CONTRIBUTORS.rst create mode 100644 product_brand_tag/readme/DESCRIPTION.rst create mode 100644 product_brand_tag/security/ir.model.access.csv create mode 100644 product_brand_tag/security/ir_rule.xml create mode 100644 product_brand_tag/static/description/icon.png create mode 100644 product_brand_tag/static/description/index.html create mode 100644 product_brand_tag/tests/__init__.py create mode 100644 product_brand_tag/tests/test_product_brand.py create mode 100644 product_brand_tag/views/product_brand_tag_view.xml create mode 100644 product_brand_tag/views/product_brand_view.xml diff --git a/product_brand_tag/README.rst b/product_brand_tag/README.rst new file mode 100644 index 000000000..5367842e7 --- /dev/null +++ b/product_brand_tag/README.rst @@ -0,0 +1,75 @@ +================== +Product brand tags +================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbrand-lightgray.png?logo=github + :target: https://github.com/OCA/brand/tree/14.0/product_brand_tag + :alt: OCA/brand +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/brand-14-0/brand-14-0-product_brand_tag + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/284/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Add tags to product brands. + +Inspired by `product_template_tags` by ACSONE. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* Simone Orsi + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/brand `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_brand_tag/__init__.py b/product_brand_tag/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/product_brand_tag/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/product_brand_tag/__manifest__.py b/product_brand_tag/__manifest__.py new file mode 100644 index 000000000..0f18c21fb --- /dev/null +++ b/product_brand_tag/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2021 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "Product brand tags", + "summary": "Add tags to product brand", + "version": "14.0.1.0.0", + "author": "Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "category": "Product", + "depends": [ + "product_brand", + ], + "website": "https://github.com/OCA/brand", + "data": [ + "security/ir.model.access.csv", + "security/ir_rule.xml", + "views/product_brand_view.xml", + "views/product_brand_tag_view.xml", + ], + "installable": True, +} diff --git a/product_brand_tag/i18n/product_brand_tag.pot b/product_brand_tag/i18n/product_brand_tag.pot new file mode 100644 index 000000000..15f90a772 --- /dev/null +++ b/product_brand_tag/i18n/product_brand_tag.pot @@ -0,0 +1,112 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \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: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__brands_count +msgid "# of brands" +msgstr "" + +#. module: product_brand_tag +#: model:ir.actions.act_window,name:product_brand_tag.action_product_brand_tags +msgid "Brand tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__product_brand_ids +msgid "Brands" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__code +msgid "Code" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__color +msgid "Color Index" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__company_id +msgid "Company" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_uid +msgid "Created by" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_date +msgid "Created on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__display_name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__display_name +msgid "Display Name" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__id +msgid "ID" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand____last_update +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag____last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__name +msgid "Name" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand +msgid "Product Brand" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand_tag +msgid "Product Brand Tag" +msgstr "" + +#. module: product_brand_tag +#: model:ir.ui.menu,name:product_brand_tag.menu_product_brand_tags +msgid "Product Brands Tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_tag_code_uniq +msgid "Tag code must be unique inside a company" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__tag_ids +msgid "Tags" +msgstr "" diff --git a/product_brand_tag/models/__init__.py b/product_brand_tag/models/__init__.py new file mode 100644 index 000000000..85cb5f80b --- /dev/null +++ b/product_brand_tag/models/__init__.py @@ -0,0 +1,2 @@ +from . import product_brand +from . import product_brand_tag diff --git a/product_brand_tag/models/product_brand.py b/product_brand_tag/models/product_brand.py new file mode 100644 index 000000000..bff841bdb --- /dev/null +++ b/product_brand_tag/models/product_brand.py @@ -0,0 +1,18 @@ +# Copyright 2021 Camptocamp SA +# @author: Simone Orsi +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import fields, models + + +class ProductBrand(models.Model): + _inherit = "product.brand" + + tag_ids = fields.Many2many( + string="Tags", + comodel_name="product.brand.tag", + relation="product_brand_tag_rel", + column1="brand_id", + column2="tag_id", + ) diff --git a/product_brand_tag/models/product_brand_tag.py b/product_brand_tag/models/product_brand_tag.py new file mode 100644 index 000000000..88ebc5c28 --- /dev/null +++ b/product_brand_tag/models/product_brand_tag.py @@ -0,0 +1,71 @@ +# Copyright 2021 Camptocamp SA +# @author: Simone Orsi +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import api, fields, models + +from odoo.addons.http_routing.models.ir_http import slugify + + +class ProductBrandTag(models.Model): + _name = "product.brand.tag" + _description = "Product Brand Tag" + + name = fields.Char(string="Name", required=True, translate=True) + code = fields.Char( + compute="_compute_code", inverse="_inverse_code", readonly=False, store=True + ) + color = fields.Integer(string="Color Index") + product_brand_ids = fields.Many2many( + comodel_name="product.brand", + string="Brands", + relation="product_brand_tag_rel", + column1="tag_id", + column2="brand_id", + ) + brands_count = fields.Integer(string="# of brands", compute="_compute_brands_count") + company_id = fields.Many2one( + comodel_name="res.company", + string="Company", + default=lambda self: self.env.company.id, + ) + + _sql_constraints = [ + ( + "tag_code_uniq", + "unique(code, company_id)", + "Tag code must be unique inside a company", + ), + ] + + @api.depends("name") + def _compute_code(self): + for rec in self: + rec.code = slugify(rec.name) + + def _inverse_code(self): + for rec in self: + # Make sure is always normalized + rec.code = slugify(rec.code) + + @api.depends("product_brand_ids") + def _compute_brands_count(self): + count = {} + if self.ids: + self.env.cr.execute( + """ + SELECT + tag_id, COUNT(*) + FROM + product_brand_tag_rel + WHERE + tag_id IN %s + GROUP BY + tag_id + """, + (tuple(self.ids),), + ) + count = dict(self.env.cr.fetchall()) + for rec in self: + rec.brands_count = count.get(rec.id, 0) diff --git a/product_brand_tag/readme/CONTRIBUTORS.rst b/product_brand_tag/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f1c71bce1 --- /dev/null +++ b/product_brand_tag/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Simone Orsi diff --git a/product_brand_tag/readme/DESCRIPTION.rst b/product_brand_tag/readme/DESCRIPTION.rst new file mode 100644 index 000000000..53a114ce3 --- /dev/null +++ b/product_brand_tag/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Add tags to product brands. + +Inspired by `product_template_tags` by ACSONE. diff --git a/product_brand_tag/security/ir.model.access.csv b/product_brand_tag/security/ir.model.access.csv new file mode 100644 index 000000000..f08fed27f --- /dev/null +++ b/product_brand_tag/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_product_brand_tag_product_manager,product.brand.tag,model_product_brand_tag,base.group_partner_manager,1,1,1,1 +access_product_brand_tag_public,product.brand.tag.public,model_product_brand_tag,,1,0,0,0 diff --git a/product_brand_tag/security/ir_rule.xml b/product_brand_tag/security/ir_rule.xml new file mode 100644 index 000000000..208392d3d --- /dev/null +++ b/product_brand_tag/security/ir_rule.xml @@ -0,0 +1,16 @@ + + + + product.brand.tag company (product_brand_tags) + + + + + + + + ['|', ('company_id', '=', False), ('company_id', 'child_of', + [user.company_id.id])] + + + diff --git a/product_brand_tag/static/description/icon.png b/product_brand_tag/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/product_brand_tag/static/description/index.html b/product_brand_tag/static/description/index.html new file mode 100644 index 000000000..dcee618e0 --- /dev/null +++ b/product_brand_tag/static/description/index.html @@ -0,0 +1,420 @@ + + + + + + +Product brand tags + + + +
+

Product brand tags

+ + +

Beta License: AGPL-3 OCA/brand Translate me on Weblate Try me on Runbot

+

Add tags to product brands.

+

Inspired by product_template_tags by ACSONE.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/brand project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/product_brand_tag/tests/__init__.py b/product_brand_tag/tests/__init__.py new file mode 100644 index 000000000..3b72ef1f2 --- /dev/null +++ b/product_brand_tag/tests/__init__.py @@ -0,0 +1 @@ +from . import test_product_brand diff --git a/product_brand_tag/tests/test_product_brand.py b/product_brand_tag/tests/test_product_brand.py new file mode 100644 index 000000000..247f4de53 --- /dev/null +++ b/product_brand_tag/tests/test_product_brand.py @@ -0,0 +1,52 @@ +# Copyright 2021 Camptocamp SA +# @author: Simone Orsi +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +from psycopg2 import IntegrityError + +from odoo.tools import mute_logger + +from odoo.addons.product_brand.tests.common import CommonCase + + +class TestBrandTags(CommonCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product_brand2 = cls.product_brand.copy({"name": "Test Brand 2"}) + cls.tag = cls.env["product.brand.tag"].create( + { + "name": "Test Tag", + "product_brand_ids": [ + (6, 0, [cls.product_brand.id, cls.product_brand2.id]) + ], + } + ) + + def test_brand_rel(self): + self.assertEqual(self.product_brand.tag_ids, self.tag) + self.assertEqual(self.product_brand2.tag_ids, self.tag) + + def test_count(self): + self.assertEqual(self.tag.brands_count, 2) + self.tag.product_brand_ids -= self.product_brand2 + self.assertEqual(self.tag.brands_count, 1) + + def test_code(self): + self.assertEqual(self.tag.code, "test-tag") + self.tag.code = "SomeThing wëird!" + self.assertEqual(self.tag.code, "something-weird") + + @mute_logger("odoo.sql_db") + def test_product_template_tag_uniq(self): + with self.assertRaises(IntegrityError): + with self.cr.savepoint(): + self.env["product.brand.tag"].create({"name": "Test Tag"}) + + self.env["product.brand.tag"].create( + { + "name": "Test Tag", + "company_id": self.env.company.create({"name": "Foo"}).id, + } + ) diff --git a/product_brand_tag/views/product_brand_tag_view.xml b/product_brand_tag/views/product_brand_tag_view.xml new file mode 100644 index 000000000..fbad011bd --- /dev/null +++ b/product_brand_tag/views/product_brand_tag_view.xml @@ -0,0 +1,30 @@ + + + + + product.brand.tag.tree + product.brand.tag + + + + + + + + + + + + Brand tags + product.brand.tag + tree + + + + + diff --git a/product_brand_tag/views/product_brand_view.xml b/product_brand_tag/views/product_brand_view.xml new file mode 100644 index 000000000..0f3e41c3c --- /dev/null +++ b/product_brand_tag/views/product_brand_view.xml @@ -0,0 +1,25 @@ + + + + product.brand.search.form + product.brand + + + + + + + + + + product.brand.form + product.brand + + + + + + + + + From bff843a6833bcfcc37a72f4c580bcc5fbe225e77 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Wed, 23 Jun 2021 08:38:19 +0200 Subject: [PATCH 02/14] product_brand_tag: make count compute reusable --- product_brand_tag/i18n/product_brand_tag.pot | 20 +++++++++--------- product_brand_tag/models/product_brand_tag.py | 21 +++++++++++++------ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/product_brand_tag/i18n/product_brand_tag.pot b/product_brand_tag/i18n/product_brand_tag.pot index 15f90a772..ae8fe3a7c 100644 --- a/product_brand_tag/i18n/product_brand_tag.pot +++ b/product_brand_tag/i18n/product_brand_tag.pot @@ -23,11 +23,6 @@ msgstr "" msgid "Brand tags" msgstr "" -#. module: product_brand_tag -#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__product_brand_ids -msgid "Brands" -msgstr "" - #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__code msgid "Code" @@ -86,6 +81,16 @@ msgstr "" msgid "Name" msgstr "" +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__tag_ids +msgid "Primary Tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__product_brand_ids +msgid "Primary for brands" +msgstr "" + #. module: product_brand_tag #: model:ir.model,name:product_brand_tag.model_product_brand msgid "Product Brand" @@ -105,8 +110,3 @@ msgstr "" #: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_tag_code_uniq msgid "Tag code must be unique inside a company" msgstr "" - -#. module: product_brand_tag -#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__tag_ids -msgid "Tags" -msgstr "" diff --git a/product_brand_tag/models/product_brand_tag.py b/product_brand_tag/models/product_brand_tag.py index 88ebc5c28..86300a528 100644 --- a/product_brand_tag/models/product_brand_tag.py +++ b/product_brand_tag/models/product_brand_tag.py @@ -2,6 +2,7 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from psycopg2.extensions import AsIs from odoo import api, fields, models @@ -51,21 +52,29 @@ def _inverse_code(self): @api.depends("product_brand_ids") def _compute_brands_count(self): - count = {} + count = self._get_brands_count("product_brand_ids") + for rec in self: + rec.brands_count = count.get(rec.id, 0) + + def _get_brands_count(self, rel_field_name): + res = {} if self.ids: + table = self._fields[rel_field_name].relation self.env.cr.execute( """ SELECT tag_id, COUNT(*) FROM - product_brand_tag_rel + %s WHERE tag_id IN %s GROUP BY tag_id """, - (tuple(self.ids),), + ( + AsIs(table), + tuple(self.ids), + ), ) - count = dict(self.env.cr.fetchall()) - for rec in self: - rec.brands_count = count.get(rec.id, 0) + res = dict(self.env.cr.fetchall()) + return res From f6ef5eafea4c389709d647b9af443f8558c05950 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Wed, 23 Jun 2021 10:25:47 +0200 Subject: [PATCH 03/14] product_brand_tag: add mixin --- product_brand_tag/__manifest__.py | 2 +- product_brand_tag/i18n/product_brand_tag.pot | 20 +++++ product_brand_tag/models/__init__.py | 1 + product_brand_tag/models/product_brand_tag.py | 73 +---------------- .../models/product_brand_tag_mixin.py | 80 +++++++++++++++++++ 5 files changed, 104 insertions(+), 72 deletions(-) create mode 100644 product_brand_tag/models/product_brand_tag_mixin.py diff --git a/product_brand_tag/__manifest__.py b/product_brand_tag/__manifest__.py index 0f18c21fb..200c39df3 100644 --- a/product_brand_tag/__manifest__.py +++ b/product_brand_tag/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product brand tags", "summary": "Add tags to product brand", - "version": "14.0.1.0.0", + "version": "14.0.1.1.0", "author": "Camptocamp, Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Product", diff --git a/product_brand_tag/i18n/product_brand_tag.pot b/product_brand_tag/i18n/product_brand_tag.pot index ae8fe3a7c..e513c8009 100644 --- a/product_brand_tag/i18n/product_brand_tag.pot +++ b/product_brand_tag/i18n/product_brand_tag.pot @@ -15,6 +15,7 @@ msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__brands_count +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__brands_count msgid "# of brands" msgstr "" @@ -23,18 +24,26 @@ msgstr "" msgid "Brand tags" msgstr "" +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__product_brand_ids +msgid "Brands" +msgstr "" + #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__code +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__code msgid "Code" msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__color +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__color msgid "Color Index" msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__company_id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__company_id msgid "Company" msgstr "" @@ -51,18 +60,21 @@ msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__display_name #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__display_name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__display_name msgid "Display Name" msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__id #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__id msgid "ID" msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand____last_update #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag____last_update +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin____last_update msgid "Last Modified on" msgstr "" @@ -78,6 +90,7 @@ msgstr "" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__name msgid "Name" msgstr "" @@ -101,12 +114,19 @@ msgstr "" msgid "Product Brand Tag" msgstr "" +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand_tag_mixin +msgid "Product Brand Tag Mixin" +msgstr "" + #. module: product_brand_tag #: model:ir.ui.menu,name:product_brand_tag.menu_product_brand_tags msgid "Product Brands Tags" msgstr "" #. module: product_brand_tag +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_csr_tag_code_uniq +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_mixin_tag_code_uniq #: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_tag_code_uniq msgid "Tag code must be unique inside a company" msgstr "" diff --git a/product_brand_tag/models/__init__.py b/product_brand_tag/models/__init__.py index 85cb5f80b..734b03960 100644 --- a/product_brand_tag/models/__init__.py +++ b/product_brand_tag/models/__init__.py @@ -1,2 +1,3 @@ from . import product_brand +from . import product_brand_tag_mixin from . import product_brand_tag diff --git a/product_brand_tag/models/product_brand_tag.py b/product_brand_tag/models/product_brand_tag.py index 86300a528..bdb22467b 100644 --- a/product_brand_tag/models/product_brand_tag.py +++ b/product_brand_tag/models/product_brand_tag.py @@ -2,79 +2,10 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from psycopg2.extensions import AsIs - -from odoo import api, fields, models - -from odoo.addons.http_routing.models.ir_http import slugify +from odoo import models class ProductBrandTag(models.Model): _name = "product.brand.tag" + _inherit = "product.brand.tag.mixin" _description = "Product Brand Tag" - - name = fields.Char(string="Name", required=True, translate=True) - code = fields.Char( - compute="_compute_code", inverse="_inverse_code", readonly=False, store=True - ) - color = fields.Integer(string="Color Index") - product_brand_ids = fields.Many2many( - comodel_name="product.brand", - string="Brands", - relation="product_brand_tag_rel", - column1="tag_id", - column2="brand_id", - ) - brands_count = fields.Integer(string="# of brands", compute="_compute_brands_count") - company_id = fields.Many2one( - comodel_name="res.company", - string="Company", - default=lambda self: self.env.company.id, - ) - - _sql_constraints = [ - ( - "tag_code_uniq", - "unique(code, company_id)", - "Tag code must be unique inside a company", - ), - ] - - @api.depends("name") - def _compute_code(self): - for rec in self: - rec.code = slugify(rec.name) - - def _inverse_code(self): - for rec in self: - # Make sure is always normalized - rec.code = slugify(rec.code) - - @api.depends("product_brand_ids") - def _compute_brands_count(self): - count = self._get_brands_count("product_brand_ids") - for rec in self: - rec.brands_count = count.get(rec.id, 0) - - def _get_brands_count(self, rel_field_name): - res = {} - if self.ids: - table = self._fields[rel_field_name].relation - self.env.cr.execute( - """ - SELECT - tag_id, COUNT(*) - FROM - %s - WHERE - tag_id IN %s - GROUP BY - tag_id - """, - ( - AsIs(table), - tuple(self.ids), - ), - ) - res = dict(self.env.cr.fetchall()) - return res diff --git a/product_brand_tag/models/product_brand_tag_mixin.py b/product_brand_tag/models/product_brand_tag_mixin.py new file mode 100644 index 000000000..93c2add0e --- /dev/null +++ b/product_brand_tag/models/product_brand_tag_mixin.py @@ -0,0 +1,80 @@ +# Copyright 2021 Camptocamp SA +# @author: Simone Orsi +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from psycopg2.extensions import AsIs + +from odoo import api, fields, models + +from odoo.addons.http_routing.models.ir_http import slugify + + +class ProductBrandTag(models.AbstractModel): + _name = "product.brand.tag.mixin" + _description = "Product Brand Tag Mixin" + + name = fields.Char(string="Name", required=True, translate=True) + code = fields.Char( + compute="_compute_code", inverse="_inverse_code", readonly=False, store=True + ) + color = fields.Integer(string="Color Index") + product_brand_ids = fields.Many2many( + comodel_name="product.brand", + string="Brands", + relation="product_brand_tag_rel", + column1="tag_id", + column2="brand_id", + ) + brands_count = fields.Integer(string="# of brands", compute="_compute_brands_count") + company_id = fields.Many2one( + comodel_name="res.company", + string="Company", + default=lambda self: self.env.company.id, + ) + + _sql_constraints = [ + ( + "tag_code_uniq", + "unique(code, company_id)", + "Tag code must be unique inside a company", + ), + ] + + @api.depends("name") + def _compute_code(self): + for rec in self: + rec.code = slugify(rec.name) + + def _inverse_code(self): + for rec in self: + # Make sure is always normalized + rec.code = slugify(rec.code) + + @api.depends("product_brand_ids") + def _compute_brands_count(self): + count = self._get_brands_count("product_brand_ids") + for rec in self: + rec.brands_count = count.get(rec.id, 0) + + def _get_brands_count(self, rel_field_name): + res = {} + if self.ids: + table = self._fields[rel_field_name].relation + self.env.cr.execute( + """ + SELECT + tag_id, COUNT(*) + FROM + %s + WHERE + tag_id IN %s + GROUP BY + tag_id + """, + ( + AsIs(table), + tuple(self.ids), + ), + ) + res = dict(self.env.cr.fetchall()) + return res From f44e9b28160492882fbb21dbe63682fcf416f5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Thu, 12 Aug 2021 11:15:27 -0300 Subject: [PATCH 04/14] [FIX] product_brand_tag: Mixins shouldn't hardcode m2m relations Without this fix, it's impossible to use this mixing to define new/custom tags. Odoo would fail with this error: TypeError: Many2many fields product.brand.custom.tag.product_brand_ids and product.brand.tag.product_brand_ids use the same table and columns --- product_brand_tag/models/product_brand_tag.py | 4 ++- .../models/product_brand_tag_mixin.py | 29 ++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/product_brand_tag/models/product_brand_tag.py b/product_brand_tag/models/product_brand_tag.py index bdb22467b..9092449b2 100644 --- a/product_brand_tag/models/product_brand_tag.py +++ b/product_brand_tag/models/product_brand_tag.py @@ -2,10 +2,12 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models +from odoo import models, fields class ProductBrandTag(models.Model): _name = "product.brand.tag" _inherit = "product.brand.tag.mixin" _description = "Product Brand Tag" + + product_brand_ids = fields.Many2many(relation="product_brand_tag_rel") diff --git a/product_brand_tag/models/product_brand_tag_mixin.py b/product_brand_tag/models/product_brand_tag_mixin.py index 93c2add0e..9a7bd0030 100644 --- a/product_brand_tag/models/product_brand_tag_mixin.py +++ b/product_brand_tag/models/product_brand_tag_mixin.py @@ -2,7 +2,7 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from psycopg2.extensions import AsIs +from psycopg2 import sql from odoo import api, fields, models @@ -21,7 +21,6 @@ class ProductBrandTag(models.AbstractModel): product_brand_ids = fields.Many2many( comodel_name="product.brand", string="Brands", - relation="product_brand_tag_rel", column1="tag_id", column2="brand_id", ) @@ -59,22 +58,18 @@ def _compute_brands_count(self): def _get_brands_count(self, rel_field_name): res = {} if self.ids: - table = self._fields[rel_field_name].relation - self.env.cr.execute( + field = self._fields[rel_field_name] + query = sql.SQL( """ - SELECT - tag_id, COUNT(*) - FROM - %s - WHERE - tag_id IN %s - GROUP BY - tag_id - """, - ( - AsIs(table), - tuple(self.ids), - ), + SELECT {column1}, COUNT(*) + FROM {relation} + WHERE {column1} IN %s + GROUP BY {column1} + """ + ).format( + relation=sql.Identifier(field.relation), + column1=sql.Identifier(field.column1), ) + self.env.cr.execute(query, (tuple(self.ids),)) res = dict(self.env.cr.fetchall()) return res From b7f187168e0e8586d144a4f7e015e9e00ada5953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Thu, 12 Aug 2021 11:17:10 -0300 Subject: [PATCH 05/14] [FIX] product_brand_tag: multicompany security rule --- product_brand_tag/security/ir_rule.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/product_brand_tag/security/ir_rule.xml b/product_brand_tag/security/ir_rule.xml index 208392d3d..8b7a65320 100644 --- a/product_brand_tag/security/ir_rule.xml +++ b/product_brand_tag/security/ir_rule.xml @@ -9,8 +9,7 @@ - ['|', ('company_id', '=', False), ('company_id', 'child_of', - [user.company_id.id])] + ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)] From ff38d9fa3cfc509e9044acbf82b54beb27e2a9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Thu, 12 Aug 2021 11:31:48 -0300 Subject: [PATCH 06/14] [IMP] product_brand_tag: Add form view and improve ux --- product_brand_tag/__manifest__.py | 2 +- product_brand_tag/i18n/product_brand_tag.pot | 5 ++++ product_brand_tag/models/product_brand_tag.py | 2 +- .../views/product_brand_tag_view.xml | 29 ++++++++++++++++++- .../views/product_brand_view.xml | 8 +++-- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/product_brand_tag/__manifest__.py b/product_brand_tag/__manifest__.py index 200c39df3..c4bdbc945 100644 --- a/product_brand_tag/__manifest__.py +++ b/product_brand_tag/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Product brand tags", "summary": "Add tags to product brand", - "version": "14.0.1.1.0", + "version": "14.0.1.1.1", "author": "Camptocamp, Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Product", diff --git a/product_brand_tag/i18n/product_brand_tag.pot b/product_brand_tag/i18n/product_brand_tag.pot index e513c8009..69efc2dbe 100644 --- a/product_brand_tag/i18n/product_brand_tag.pot +++ b/product_brand_tag/i18n/product_brand_tag.pot @@ -35,6 +35,11 @@ msgstr "" msgid "Code" msgstr "" +#. module: product_brand_tag +#: model_terms:ir.ui.view,arch_db:product_brand_tag.view_product_brand_tag_form +msgid "Color" +msgstr "" + #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__color #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__color diff --git a/product_brand_tag/models/product_brand_tag.py b/product_brand_tag/models/product_brand_tag.py index 9092449b2..4dd5599d1 100644 --- a/product_brand_tag/models/product_brand_tag.py +++ b/product_brand_tag/models/product_brand_tag.py @@ -2,7 +2,7 @@ # @author: Simone Orsi # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models class ProductBrandTag(models.Model): diff --git a/product_brand_tag/views/product_brand_tag_view.xml b/product_brand_tag/views/product_brand_tag_view.xml index fbad011bd..7d09c9581 100644 --- a/product_brand_tag/views/product_brand_tag_view.xml +++ b/product_brand_tag/views/product_brand_tag_view.xml @@ -9,11 +9,38 @@ - + + + product.brand.tag.form + product.brand.tag + +
+ +
+
+ + + + + + + + +
+ + + Brand tags product.brand.tag diff --git a/product_brand_tag/views/product_brand_view.xml b/product_brand_tag/views/product_brand_view.xml index 0f3e41c3c..f57211938 100644 --- a/product_brand_tag/views/product_brand_view.xml +++ b/product_brand_tag/views/product_brand_view.xml @@ -6,7 +6,7 @@ - + @@ -17,7 +17,11 @@ - + From fd22af98c6e1b44c61d46ce2ade12cab2f56ac7f Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 25 May 2023 13:09:16 +0000 Subject: [PATCH 07/14] Added translation using Weblate (Italian) --- product_brand_tag/i18n/it.po | 138 +++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 product_brand_tag/i18n/it.po diff --git a/product_brand_tag/i18n/it.po b/product_brand_tag/i18n/it.po new file mode 100644 index 000000000..5eb901cf2 --- /dev/null +++ b/product_brand_tag/i18n/it.po @@ -0,0 +1,138 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__brands_count +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__brands_count +msgid "# of brands" +msgstr "" + +#. module: product_brand_tag +#: model:ir.actions.act_window,name:product_brand_tag.action_product_brand_tags +msgid "Brand tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__product_brand_ids +msgid "Brands" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__code +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__code +msgid "Code" +msgstr "" + +#. module: product_brand_tag +#: model_terms:ir.ui.view,arch_db:product_brand_tag.view_product_brand_tag_form +msgid "Color" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__color +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__color +msgid "Color Index" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__company_id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__company_id +msgid "Company" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_uid +msgid "Created by" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_date +msgid "Created on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__display_name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__display_name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__display_name +msgid "Display Name" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__id +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__id +msgid "ID" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand____last_update +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag____last_update +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin____last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__name +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__name +msgid "Name" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__tag_ids +msgid "Primary Tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__product_brand_ids +msgid "Primary for brands" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand +msgid "Product Brand" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand_tag +msgid "Product Brand Tag" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model,name:product_brand_tag.model_product_brand_tag_mixin +msgid "Product Brand Tag Mixin" +msgstr "" + +#. module: product_brand_tag +#: model:ir.ui.menu,name:product_brand_tag.menu_product_brand_tags +msgid "Product Brands Tags" +msgstr "" + +#. module: product_brand_tag +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_csr_tag_code_uniq +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_mixin_tag_code_uniq +#: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_tag_code_uniq +msgid "Tag code must be unique inside a company" +msgstr "" From 8ebee1bb7548118b3106f4c82fc1791dcdc61558 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 25 May 2023 13:09:42 +0000 Subject: [PATCH 08/14] Translated using Weblate (Italian) Currently translated at 100.0% (22 of 22 strings) Translation: brand-14.0/brand-14.0-product_brand_tag Translate-URL: https://translation.odoo-community.org/projects/brand-14-0/brand-14-0-product_brand_tag/it/ --- product_brand_tag/README.rst | 15 +++--- product_brand_tag/i18n/it.po | 48 ++++++++++--------- .../static/description/index.html | 34 ++++++------- 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/product_brand_tag/README.rst b/product_brand_tag/README.rst index 5367842e7..f658bf5cb 100644 --- a/product_brand_tag/README.rst +++ b/product_brand_tag/README.rst @@ -2,10 +2,13 @@ Product brand tags ================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:3e6b8397c2b71e8ebb5625cb1bc24dc4f915400dce41b05a7d2f303bb894b367 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Product brand tags .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/brand-14-0/brand-14-0-product_brand_tag :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/284/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/brand&target_branch=14.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Add tags to product brands. @@ -39,7 +42,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. diff --git a/product_brand_tag/i18n/it.po b/product_brand_tag/i18n/it.po index 5eb901cf2..d509e69d3 100644 --- a/product_brand_tag/i18n/it.po +++ b/product_brand_tag/i18n/it.po @@ -6,133 +6,135 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-05-25 16:08+0000\n" +"Last-Translator: Francesco Foresti \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__brands_count #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__brands_count msgid "# of brands" -msgstr "" +msgstr "# di marche" #. module: product_brand_tag #: model:ir.actions.act_window,name:product_brand_tag.action_product_brand_tags msgid "Brand tags" -msgstr "" +msgstr "Etichette marche" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__product_brand_ids msgid "Brands" -msgstr "" +msgstr "Marche" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__code #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__code msgid "Code" -msgstr "" +msgstr "Codice" #. module: product_brand_tag #: model_terms:ir.ui.view,arch_db:product_brand_tag.view_product_brand_tag_form msgid "Color" -msgstr "" +msgstr "Colore" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__color #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__color msgid "Color Index" -msgstr "" +msgstr "Indice colore" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__company_id #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__company_id msgid "Company" -msgstr "" +msgstr "Azienda" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_uid msgid "Created by" -msgstr "" +msgstr "Creato da" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__create_date msgid "Created on" -msgstr "" +msgstr "Creato il" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__display_name #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__display_name #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__id #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__id #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__id msgid "ID" -msgstr "" +msgstr "ID" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand____last_update #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag____last_update #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Ultimo aggiornamento di" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__write_date msgid "Last Updated on" -msgstr "" +msgstr "Ultimo aggiornamento il" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__name #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag_mixin__name msgid "Name" -msgstr "" +msgstr "Nome" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand__tag_ids msgid "Primary Tags" -msgstr "" +msgstr "Etichette primarie" #. module: product_brand_tag #: model:ir.model.fields,field_description:product_brand_tag.field_product_brand_tag__product_brand_ids msgid "Primary for brands" -msgstr "" +msgstr "Primaria per marche" #. module: product_brand_tag #: model:ir.model,name:product_brand_tag.model_product_brand msgid "Product Brand" -msgstr "" +msgstr "Marca del prodotto" #. module: product_brand_tag #: model:ir.model,name:product_brand_tag.model_product_brand_tag msgid "Product Brand Tag" -msgstr "" +msgstr "Etichetta marca del prodotto" #. module: product_brand_tag #: model:ir.model,name:product_brand_tag.model_product_brand_tag_mixin msgid "Product Brand Tag Mixin" -msgstr "" +msgstr "Product Brand Tag Mixin" #. module: product_brand_tag #: model:ir.ui.menu,name:product_brand_tag.menu_product_brand_tags msgid "Product Brands Tags" -msgstr "" +msgstr "Etichette marche prodotto" #. module: product_brand_tag #: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_csr_tag_code_uniq #: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_mixin_tag_code_uniq #: model:ir.model.constraint,message:product_brand_tag.constraint_product_brand_tag_tag_code_uniq msgid "Tag code must be unique inside a company" -msgstr "" +msgstr "Il codice dell'etichetta dev'essere univoca per la stessa azienda" diff --git a/product_brand_tag/static/description/index.html b/product_brand_tag/static/description/index.html index dcee618e0..d15a03f98 100644 --- a/product_brand_tag/static/description/index.html +++ b/product_brand_tag/static/description/index.html @@ -1,20 +1,20 @@ - + - + Product brand tags