From 6dd2f5a8d201a437a203b234909f05ae649a27df Mon Sep 17 00:00:00 2001 From: Benoit Guillot Date: Tue, 27 Mar 2012 14:45:50 +0200 Subject: [PATCH 01/74] [INIT] init module product_brand extract from trunk-addons-community. Thanks to NetAndCo who starts the module --- product_brand/__init__.py | 27 ++++++ product_brand/__openerp__.py | 49 ++++++++++ product_brand/i18n/fr.po | 105 +++++++++++++++++++++ product_brand/i18n/fr_FR.po | 105 +++++++++++++++++++++ product_brand/i18n/product_brand.pot | 102 ++++++++++++++++++++ product_brand/product_brand.py | 43 +++++++++ product_brand/product_brand_view.xml | 72 ++++++++++++++ product_brand/security/ir.model.access.csv | 2 + 8 files changed, 505 insertions(+) create mode 100755 product_brand/__init__.py create mode 100644 product_brand/__openerp__.py create mode 100644 product_brand/i18n/fr.po create mode 100644 product_brand/i18n/fr_FR.po create mode 100644 product_brand/i18n/product_brand.pot create mode 100755 product_brand/product_brand.py create mode 100755 product_brand/product_brand_view.xml create mode 100644 product_brand/security/ir.model.access.csv diff --git a/product_brand/__init__.py b/product_brand/__init__.py new file mode 100755 index 000000000..0e1e42dc2 --- /dev/null +++ b/product_brand/__init__.py @@ -0,0 +1,27 @@ +# -*- encoding: utf-8 -*- +################################################################################# +# # +# product_brand for OpenERP # +# Copyright (C) 2009 NetAndCo (). # +# Authors, Mathieu Lemercier, mathieu@netandco.net, # +# Franck Bret, franck@netandco.net # +# Copyright (C) 2011 Akretion Benoît Guillot # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +# # +################################################################################# +################################################################################### +# Product Brand is an Openobject module wich enable Brand management for products # +################################################################################### +import product_brand diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py new file mode 100644 index 000000000..593e051cc --- /dev/null +++ b/product_brand/__openerp__.py @@ -0,0 +1,49 @@ +# -*- encoding: utf-8 -*- +################################################################################# +# # +# product_brand for OpenERP # +# Copyright (C) 2009 NetAndCo (). # +# Authors, Mathieu Lemercier, mathieu@netandco.net, # +# Franck Bret, franck@netandco.net # +# Copyright (C) 2011 Akretion Benoît Guillot # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +# # +################################################################################# +################################################################################### +# Product Brand is an Openobject module wich enable Brand management for products # +################################################################################### +{ + 'name': 'Product Brand Manager', + 'version': '0.1', + 'category': 'Product', + 'description': """This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description. + It also allows to attach a partner to a brand. + One installed check the menu Product/configuration/brand + To do / To come : + - A view to seeing products by brand. + """, + 'author': 'NetAndCo', + 'website': 'http://ww.netandco.net', + 'depends': ['product'], + 'init_xml': [], + 'update_xml': [ + 'product_brand_view.xml', + 'security/ir.model.access.csv' + ], + 'demo_xml': [], + 'installable': True, + 'certificate': '', +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po new file mode 100644 index 000000000..11c1e3e2a --- /dev/null +++ b/product_brand/i18n/fr.po @@ -0,0 +1,105 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.7\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" +"PO-Revision-Date: 2010-01-25 17:15:23+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: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: product_brand +#: help:product.product,product_brand_id:0 +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product" +msgstr "Sélectionnez une marque pour ce produit" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "Gestion des marques" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "Description" + +#. module: product_brand +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: field:product.product,product_brand_id:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "Le nom de l'objet doit commencer par x_ et ne pas contenir de caractères spéciaux !" + +#. module: product_brand +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom de modèle invalide dans la définition de l'action" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "Partenaire" + +#. module: product_brand +#: model:ir.module.module,description:product_brand.module_meta_information +msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" +" It also allows to attach a partner to a brand.\n" +" One installed check the menu Product/configuration/brand\n" +" To do / To come :\n" +" - A view to seeing products by brand.\n" +" " +msgstr "Ce module permet à vos utilisateurs de gérer des marques pour leurs produits. Vous pouvez définir une marque, lui attacher un logo et une description. \n" +" Vous pouvez également attacher un partenaire à une marque.\n" +" Une fois installé allez dans le menu Produit/configuration/Marques\n" +" A faire / a venir :\n" +" - Une vue pour voir tous les produits par marque.\n" +#. module: product_brand +#: field:product.brand,logo_id:0 +msgid "Logo" +msgstr "Logo" + +#. module: product_brand +#: help:product.brand,logo_id:0 +msgid "Select picture file" +msgstr "Sélectionnez une image" + +#. module: product_brand +#: model:ir.module.module,shortdesc:product_brand.module_meta_information +msgid "Product Brand Manager" +msgstr "Gestionnaire de marques" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exist" +msgstr "Sélectionnez un partenaire pour cette marque" + diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po new file mode 100644 index 000000000..11c1e3e2a --- /dev/null +++ b/product_brand/i18n/fr_FR.po @@ -0,0 +1,105 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.7\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" +"PO-Revision-Date: 2010-01-25 17:15:23+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: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: product_brand +#: help:product.product,product_brand_id:0 +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product" +msgstr "Sélectionnez une marque pour ce produit" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "Gestion des marques" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "Description" + +#. module: product_brand +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: field:product.product,product_brand_id:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "Le nom de l'objet doit commencer par x_ et ne pas contenir de caractères spéciaux !" + +#. module: product_brand +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom de modèle invalide dans la définition de l'action" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "Partenaire" + +#. module: product_brand +#: model:ir.module.module,description:product_brand.module_meta_information +msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" +" It also allows to attach a partner to a brand.\n" +" One installed check the menu Product/configuration/brand\n" +" To do / To come :\n" +" - A view to seeing products by brand.\n" +" " +msgstr "Ce module permet à vos utilisateurs de gérer des marques pour leurs produits. Vous pouvez définir une marque, lui attacher un logo et une description. \n" +" Vous pouvez également attacher un partenaire à une marque.\n" +" Une fois installé allez dans le menu Produit/configuration/Marques\n" +" A faire / a venir :\n" +" - Une vue pour voir tous les produits par marque.\n" +#. module: product_brand +#: field:product.brand,logo_id:0 +msgid "Logo" +msgstr "Logo" + +#. module: product_brand +#: help:product.brand,logo_id:0 +msgid "Select picture file" +msgstr "Sélectionnez une image" + +#. module: product_brand +#: model:ir.module.module,shortdesc:product_brand.module_meta_information +msgid "Product Brand Manager" +msgstr "Gestionnaire de marques" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exist" +msgstr "Sélectionnez un partenaire pour cette marque" + diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot new file mode 100644 index 000000000..5ea216a36 --- /dev/null +++ b/product_brand/i18n/product_brand.pot @@ -0,0 +1,102 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.7\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" +"PO-Revision-Date: 2010-01-25 17:15:23+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: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: product_brand +#: help:product.product,product_brand_id:0 +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "" + +#. module: product_brand +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: field:product.product,product_brand_id:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "" + +#. module: product_brand +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: product_brand +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "" + +#. module: product_brand +#: model:ir.module.module,description:product_brand.module_meta_information +msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" +" It also allows to attach a partner to a brand.\n" +" One installed check the menu Product/configuration/brand\n" +" To do / To come :\n" +" - A view to seeing products by brand.\n" +" " +msgstr "" + +#. module: product_brand +#: field:product.brand,logo_id:0 +msgid "Logo" +msgstr "" + +#. module: product_brand +#: help:product.brand,logo_id:0 +msgid "Select picture file" +msgstr "" + +#. module: product_brand +#: model:ir.module.module,shortdesc:product_brand.module_meta_information +msgid "Product Brand Manager" +msgstr "" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exist" +msgstr "" + diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py new file mode 100755 index 000000000..8c38cf638 --- /dev/null +++ b/product_brand/product_brand.py @@ -0,0 +1,43 @@ +# -*- encoding: utf-8 -*- +################################################################################# +# # +# product_brand for OpenERP # +# Copyright (C) 2009 NetAndCo (). # +# Authors, Mathieu Lemercier, mathieu@netandco.net, # +# Franck Bret, franck@netandco.net # +# Copyright (C) 2011 Akretion Benoît Guillot # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +# # +################################################################################# +from openerp.osv.orm import Model +from openerp.osv import fields + +class product_brand(Model): + _name = 'product.brand' + _columns = { + 'name': fields.char('Brand Name',size=32), + 'description': fields.text('Description',translate=True), + 'partner_id' : fields.many2one('res.partner','partner', help='Select a partner for this brand if it exist'), + 'logo': fields.binary('Logo File') + } + + +class product_template(Model): + _name = 'product.template' + _inherit = 'product.template' + _columns = { + 'product_brand_id' : fields.many2one('product.brand','Brand', help='Select a brand for this product'), + } + diff --git a/product_brand/product_brand_view.xml b/product_brand/product_brand_view.xml new file mode 100755 index 000000000..7acd13c44 --- /dev/null +++ b/product_brand/product_brand_view.xml @@ -0,0 +1,72 @@ + + + + + + product.brand.form + product.brand + form + +
+ + + + + + + +
+ + + product.brand.tree + product.brand + tree + + + + + + + + + + + product.normal.form + product.product + form + + + + + + + + + + product.template.product.form + product.template + form + + + + + + + + + + Brand + product.brand + form + tree,form + + + + + diff --git a/product_brand/security/ir.model.access.csv b/product_brand/security/ir.model.access.csv new file mode 100644 index 000000000..892147b47 --- /dev/null +++ b/product_brand/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_product_brand_product_manager","product.brand","model_product_brand","base.group_partner_manager",1,1,1,1 From c1a0756fb9d5de7017d5bf231e2ef3f5e823c631 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Fri, 14 Mar 2014 13:36:03 +0100 Subject: [PATCH 02/74] migration of product_brand for version 7.0 --- product_brand/__init__.py | 2 +- product_brand/__openerp__.py | 24 +++--- product_brand/i18n/fr.po | 81 ++++++++------------- product_brand/i18n/fr_FR.po | 105 --------------------------- product_brand/i18n/product_brand.pot | 66 ++++++----------- product_brand/product_brand.py | 26 ++++--- product_brand/product_brand_view.xml | 74 ++++++++++++++----- 7 files changed, 137 insertions(+), 241 deletions(-) mode change 100755 => 100644 product_brand/__init__.py delete mode 100644 product_brand/i18n/fr_FR.po mode change 100755 => 100644 product_brand/product_brand.py mode change 100755 => 100644 product_brand/product_brand_view.xml diff --git a/product_brand/__init__.py b/product_brand/__init__.py old mode 100755 new mode 100644 index 0e1e42dc2..7055491f5 --- a/product_brand/__init__.py +++ b/product_brand/__init__.py @@ -24,4 +24,4 @@ ################################################################################### # Product Brand is an Openobject module wich enable Brand management for products # ################################################################################### -import product_brand +from . import product_brand diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py index 593e051cc..666dcfff0 100644 --- a/product_brand/__openerp__.py +++ b/product_brand/__openerp__.py @@ -28,22 +28,26 @@ 'name': 'Product Brand Manager', 'version': '0.1', 'category': 'Product', - 'description': """This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description. - It also allows to attach a partner to a brand. - One installed check the menu Product/configuration/brand - To do / To come : - - A view to seeing products by brand. + 'description': """ +Product Brand Manager +===================== + +This module allows your user to easily manage product brands. You can +define brands, attach a logo and a description to them. It also allows to +attach a partner to a brand. Once installed, check the menu +Product/configuration/brand + +To do / To come: + +- A view to seeing products by brand. + """, 'author': 'NetAndCo', 'website': 'http://ww.netandco.net', 'depends': ['product'], - 'init_xml': [], - 'update_xml': [ + 'data': [ 'product_brand_view.xml', 'security/ir.model.access.csv' ], - 'demo_xml': [], 'installable': True, - 'certificate': '', } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 11c1e3e2a..1c5274c2e 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.7\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" -"PO-Revision-Date: 2010-01-25 17:15:23+0000\n" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 12:59+0000\n" +"PO-Revision-Date: 2014-03-14 12:59+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -19,18 +19,12 @@ msgstr "" #: model:ir.model,name:product_brand.model_product_brand #: view:product.brand:0 msgid "product.brand" -msgstr "" - -#. module: product_brand -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "product.brand" #. module: product_brand -#: help:product.product,product_brand_id:0 -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product" -msgstr "Sélectionnez une marque pour ce produit" +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Modèle de produit" #. module: product_brand #: model:ir.ui.menu,name:product_brand.menu_product_brand @@ -44,26 +38,37 @@ msgid "Description" msgstr "Description" #. module: product_brand +#: view:product.brand:0 #: field:product.brand,name:0 msgid "Brand Name" msgstr "Marque" +#. module: product_brand +#: view:product.brand:0 +msgid "Product Brand" +msgstr "Marque d'article" + +#. module: product_brand +#: field:product.brand,logo:0 +msgid "Logo File" +msgstr "Logo" + #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: field:product.product,product_brand_id:0 +#: view:product.product:0 #: field:product.template,product_brand_id:0 msgid "Brand" msgstr "Marque" #. module: product_brand -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer par x_ et ne pas contenir de caractères spéciaux !" +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." +msgstr "Sélectionnez un partenaire pour cette marque." #. module: product_brand -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Nom de modèle invalide dans la définition de l'action" +#: view:product.product:0 +msgid "Group by..." +msgstr "Regrouper par..." #. module: product_brand #: field:product.brand,partner_id:0 @@ -71,35 +76,7 @@ msgid "partner" msgstr "Partenaire" #. module: product_brand -#: model:ir.module.module,description:product_brand.module_meta_information -msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" -" It also allows to attach a partner to a brand.\n" -" One installed check the menu Product/configuration/brand\n" -" To do / To come :\n" -" - A view to seeing products by brand.\n" -" " -msgstr "Ce module permet à vos utilisateurs de gérer des marques pour leurs produits. Vous pouvez définir une marque, lui attacher un logo et une description. \n" -" Vous pouvez également attacher un partenaire à une marque.\n" -" Une fois installé allez dans le menu Produit/configuration/Marques\n" -" A faire / a venir :\n" -" - Une vue pour voir tous les produits par marque.\n" -#. module: product_brand -#: field:product.brand,logo_id:0 -msgid "Logo" -msgstr "Logo" - -#. module: product_brand -#: help:product.brand,logo_id:0 -msgid "Select picture file" -msgstr "Sélectionnez une image" - -#. module: product_brand -#: model:ir.module.module,shortdesc:product_brand.module_meta_information -msgid "Product Brand Manager" -msgstr "Gestionnaire de marques" - -#. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exist" -msgstr "Sélectionnez un partenaire pour cette marque" +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." +msgstr "Sélectionnez une marque pour ce produit." diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po deleted file mode 100644 index 11c1e3e2a..000000000 --- a/product_brand/i18n/fr_FR.po +++ /dev/null @@ -1,105 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * product_brand -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.7\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" -"PO-Revision-Date: 2010-01-25 17:15:23+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: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" -msgstr "" - -#. module: product_brand -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: product_brand -#: help:product.product,product_brand_id:0 -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product" -msgstr "Sélectionnez une marque pour ce produit" - -#. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "Gestion des marques" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 -msgid "Description" -msgstr "Description" - -#. module: product_brand -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "Marque" - -#. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: field:product.product,product_brand_id:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "Marque" - -#. module: product_brand -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "Le nom de l'objet doit commencer par x_ et ne pas contenir de caractères spéciaux !" - -#. module: product_brand -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Nom de modèle invalide dans la définition de l'action" - -#. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "Partenaire" - -#. module: product_brand -#: model:ir.module.module,description:product_brand.module_meta_information -msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" -" It also allows to attach a partner to a brand.\n" -" One installed check the menu Product/configuration/brand\n" -" To do / To come :\n" -" - A view to seeing products by brand.\n" -" " -msgstr "Ce module permet à vos utilisateurs de gérer des marques pour leurs produits. Vous pouvez définir une marque, lui attacher un logo et une description. \n" -" Vous pouvez également attacher un partenaire à une marque.\n" -" Une fois installé allez dans le menu Produit/configuration/Marques\n" -" A faire / a venir :\n" -" - Une vue pour voir tous les produits par marque.\n" -#. module: product_brand -#: field:product.brand,logo_id:0 -msgid "Logo" -msgstr "Logo" - -#. module: product_brand -#: help:product.brand,logo_id:0 -msgid "Select picture file" -msgstr "Sélectionnez une image" - -#. module: product_brand -#: model:ir.module.module,shortdesc:product_brand.module_meta_information -msgid "Product Brand Manager" -msgstr "Gestionnaire de marques" - -#. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exist" -msgstr "Sélectionnez un partenaire pour cette marque" - diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot index 5ea216a36..9dddf3599 100644 --- a/product_brand/i18n/product_brand.pot +++ b/product_brand/i18n/product_brand.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.7\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-01-25 17:15:23+0000\n" -"PO-Revision-Date: 2010-01-25 17:15:23+0000\n" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-03-14 12:55+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -22,14 +22,8 @@ msgid "product.brand" msgstr "" #. module: product_brand -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: product_brand -#: help:product.product,product_brand_id:0 -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product" +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" msgstr "" #. module: product_brand @@ -44,59 +38,45 @@ msgid "Description" msgstr "" #. module: product_brand +#: view:product.brand:0 #: field:product.brand,name:0 msgid "Brand Name" msgstr "" #. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: field:product.product,product_brand_id:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "" - -#. module: product_brand -#: constraint:ir.model:0 -msgid "The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: product_brand -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." +#: view:product.brand:0 +msgid "Product Brand" msgstr "" #. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" +#: field:product.brand,logo:0 +msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.module.module,description:product_brand.module_meta_information -msgid "This module allows your user to easily manage product brand. You can define brand, attach it a logo and a description.\n" -" It also allows to attach a partner to a brand.\n" -" One installed check the menu Product/configuration/brand\n" -" To do / To come :\n" -" - A view to seeing products by brand.\n" -" " +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: view:product.product:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" msgstr "" #. module: product_brand -#: field:product.brand,logo_id:0 -msgid "Logo" +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." msgstr "" #. module: product_brand -#: help:product.brand,logo_id:0 -msgid "Select picture file" +#: view:product.product:0 +msgid "Group by..." msgstr "" #. module: product_brand -#: model:ir.module.module,shortdesc:product_brand.module_meta_information -msgid "Product Brand Manager" +#: field:product.brand,partner_id:0 +msgid "partner" msgstr "" #. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exist" +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." msgstr "" diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py old mode 100755 new mode 100644 index 8c38cf638..9e3c7f9f9 --- a/product_brand/product_brand.py +++ b/product_brand/product_brand.py @@ -21,23 +21,29 @@ # along with this program. If not, see . # # # ################################################################################# -from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import orm, fields -class product_brand(Model): + +class product_brand(orm.Model): _name = 'product.brand' _columns = { - 'name': fields.char('Brand Name',size=32), - 'description': fields.text('Description',translate=True), - 'partner_id' : fields.many2one('res.partner','partner', help='Select a partner for this brand if it exist'), + 'name': fields.char('Brand Name'), + 'description': fields.text('Description', translate=True), + 'partner_id': fields.many2one( + 'res.partner', + 'partner', + help='Select a partner for this brand if it exists.', + ondelete='restrict'), 'logo': fields.binary('Logo File') } -class product_template(Model): - _name = 'product.template' +class product_template(orm.Model): _inherit = 'product.template' _columns = { - 'product_brand_id' : fields.many2one('product.brand','Brand', help='Select a brand for this product'), + 'product_brand_id': fields.many2one( + 'product.brand', + 'Brand', + help='Select a brand for this product.', + ondelete='restrict') } - diff --git a/product_brand/product_brand_view.xml b/product_brand/product_brand_view.xml old mode 100755 new mode 100644 index 7acd13c44..66a23ec35 --- a/product_brand/product_brand_view.xml +++ b/product_brand/product_brand_view.xml @@ -6,27 +6,48 @@ Copyright (C) 2011 Akretion Benoît Guillot The licence is in the file __openerp__.py --> - + + + product.brand.search.form + product.brand + + + + + + + + product.brand.form product.brand - form -
- - - - - + + + +
+
+
+

+ +

+
+ + + + + + +
- + product.brand.tree product.brand - tree @@ -35,38 +56,51 @@ - + + + product.search.form + product.product + + + + + + + + + + + product.normal.form product.product - form - - - +
+
- + product.template.product.form product.template - form - + - + Brand product.brand form tree,form - + From 2b374adb54e11132d7c380f37b863ff19c4650a2 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of product-core-editors Date: Wed, 9 Apr 2014 07:04:27 +0000 Subject: [PATCH 03/74] Launchpad automatic translations update. --- product_brand/i18n/fr.po | 12 +++--- product_brand/i18n/fr_FR.po | 82 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 product_brand/i18n/fr_FR.po diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 1c5274c2e..e5b244d75 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -6,14 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 12:59+0000\n" -"PO-Revision-Date: 2014-03-14 12:59+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-04-08 17:33+0000\n" +"Last-Translator: Guewen Baconnier @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" +"X-Generator: Launchpad (build 17007)\n" #. module: product_brand #: model:ir.model,name:product_brand.model_product_brand @@ -79,4 +80,3 @@ msgstr "Partenaire" #: help:product.template,product_brand_id:0 msgid "Select a brand for this product." msgstr "Sélectionnez une marque pour ce produit." - diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po new file mode 100644 index 000000000..9f9d41af9 --- /dev/null +++ b/product_brand/i18n/fr_FR.po @@ -0,0 +1,82 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.7\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-03-11 12:42+0000\n" +"Last-Translator: Graeme Gellatly \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" +"X-Generator: Launchpad (build 17007)\n" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "Gestion des marques" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "Description" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: view:product.brand:0 +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: field:product.brand,logo:0 +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: view:product.product:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." +msgstr "" + +#. module: product_brand +#: view:product.product:0 +msgid "Group by..." +msgstr "" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "Partenaire" + +#. module: product_brand +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." +msgstr "" From e12c133ff598ff62645b300edaeb6f5a4d1d505b Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Wed, 9 Jul 2014 11:16:48 +0200 Subject: [PATCH 04/74] Set all addons to uninstallable and move them into __unported__ folder --- product_brand/__init__.py | 27 ------ product_brand/__openerp__.py | 53 ----------- product_brand/i18n/fr.po | 82 ---------------- product_brand/i18n/fr_FR.po | 82 ---------------- product_brand/i18n/product_brand.pot | 82 ---------------- product_brand/product_brand.py | 49 ---------- product_brand/product_brand_view.xml | 106 --------------------- product_brand/security/ir.model.access.csv | 2 - 8 files changed, 483 deletions(-) delete mode 100644 product_brand/__init__.py delete mode 100644 product_brand/__openerp__.py delete mode 100644 product_brand/i18n/fr.po delete mode 100644 product_brand/i18n/fr_FR.po delete mode 100644 product_brand/i18n/product_brand.pot delete mode 100644 product_brand/product_brand.py delete mode 100644 product_brand/product_brand_view.xml delete mode 100644 product_brand/security/ir.model.access.csv diff --git a/product_brand/__init__.py b/product_brand/__init__.py deleted file mode 100644 index 7055491f5..000000000 --- a/product_brand/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- encoding: utf-8 -*- -################################################################################# -# # -# product_brand for OpenERP # -# Copyright (C) 2009 NetAndCo (). # -# Authors, Mathieu Lemercier, mathieu@netandco.net, # -# Franck Bret, franck@netandco.net # -# Copyright (C) 2011 Akretion Benoît Guillot # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see . # -# # -################################################################################# -################################################################################### -# Product Brand is an Openobject module wich enable Brand management for products # -################################################################################### -from . import product_brand diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py deleted file mode 100644 index 666dcfff0..000000000 --- a/product_brand/__openerp__.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- encoding: utf-8 -*- -################################################################################# -# # -# product_brand for OpenERP # -# Copyright (C) 2009 NetAndCo (). # -# Authors, Mathieu Lemercier, mathieu@netandco.net, # -# Franck Bret, franck@netandco.net # -# Copyright (C) 2011 Akretion Benoît Guillot # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see . # -# # -################################################################################# -################################################################################### -# Product Brand is an Openobject module wich enable Brand management for products # -################################################################################### -{ - 'name': 'Product Brand Manager', - 'version': '0.1', - 'category': 'Product', - 'description': """ -Product Brand Manager -===================== - -This module allows your user to easily manage product brands. You can -define brands, attach a logo and a description to them. It also allows to -attach a partner to a brand. Once installed, check the menu -Product/configuration/brand - -To do / To come: - -- A view to seeing products by brand. - - """, - 'author': 'NetAndCo', - 'website': 'http://ww.netandco.net', - 'depends': ['product'], - 'data': [ - 'product_brand_view.xml', - 'security/ir.model.access.csv' - ], - 'installable': True, -} diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po deleted file mode 100644 index e5b244d75..000000000 --- a/product_brand/i18n/fr.po +++ /dev/null @@ -1,82 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * product_brand -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-04-08 17:33+0000\n" -"Last-Translator: Guewen Baconnier @ Camptocamp \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" -"X-Generator: Launchpad (build 17007)\n" - -#. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" -msgstr "product.brand" - -#. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" -msgstr "Modèle de produit" - -#. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "Gestion des marques" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 -msgid "Description" -msgstr "Description" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "Marque" - -#. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" -msgstr "Marque d'article" - -#. module: product_brand -#: field:product.brand,logo:0 -msgid "Logo File" -msgstr "Logo" - -#. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "Marque" - -#. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." -msgstr "Sélectionnez un partenaire pour cette marque." - -#. module: product_brand -#: view:product.product:0 -msgid "Group by..." -msgstr "Regrouper par..." - -#. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "Partenaire" - -#. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." -msgstr "Sélectionnez une marque pour ce produit." diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po deleted file mode 100644 index 9f9d41af9..000000000 --- a/product_brand/i18n/fr_FR.po +++ /dev/null @@ -1,82 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * product_brand -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.7\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-03-11 12:42+0000\n" -"Last-Translator: Graeme Gellatly \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" -"X-Generator: Launchpad (build 17007)\n" - -#. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" -msgstr "" - -#. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" -msgstr "" - -#. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "Gestion des marques" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 -msgid "Description" -msgstr "Description" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "Marque" - -#. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" -msgstr "" - -#. module: product_brand -#: field:product.brand,logo:0 -msgid "Logo File" -msgstr "" - -#. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "Marque" - -#. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." -msgstr "" - -#. module: product_brand -#: view:product.product:0 -msgid "Group by..." -msgstr "" - -#. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "Partenaire" - -#. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." -msgstr "" diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot deleted file mode 100644 index 9dddf3599..000000000 --- a/product_brand/i18n/product_brand.pot +++ /dev/null @@ -1,82 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * product_brand -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-03-14 12:55+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: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" -msgstr "" - -#. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" -msgstr "" - -#. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 -msgid "Description" -msgstr "" - -#. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "" - -#. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" -msgstr "" - -#. module: product_brand -#: field:product.brand,logo:0 -msgid "Logo File" -msgstr "" - -#. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "" - -#. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." -msgstr "" - -#. module: product_brand -#: view:product.product:0 -msgid "Group by..." -msgstr "" - -#. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "" - -#. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." -msgstr "" - diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py deleted file mode 100644 index 9e3c7f9f9..000000000 --- a/product_brand/product_brand.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- encoding: utf-8 -*- -################################################################################# -# # -# product_brand for OpenERP # -# Copyright (C) 2009 NetAndCo (). # -# Authors, Mathieu Lemercier, mathieu@netandco.net, # -# Franck Bret, franck@netandco.net # -# Copyright (C) 2011 Akretion Benoît Guillot # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see . # -# # -################################################################################# -from openerp.osv import orm, fields - - -class product_brand(orm.Model): - _name = 'product.brand' - _columns = { - 'name': fields.char('Brand Name'), - 'description': fields.text('Description', translate=True), - 'partner_id': fields.many2one( - 'res.partner', - 'partner', - help='Select a partner for this brand if it exists.', - ondelete='restrict'), - 'logo': fields.binary('Logo File') - } - - -class product_template(orm.Model): - _inherit = 'product.template' - _columns = { - 'product_brand_id': fields.many2one( - 'product.brand', - 'Brand', - help='Select a brand for this product.', - ondelete='restrict') - } diff --git a/product_brand/product_brand_view.xml b/product_brand/product_brand_view.xml deleted file mode 100644 index 66a23ec35..000000000 --- a/product_brand/product_brand_view.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - product.brand.search.form - product.brand - - - - - - - - - - product.brand.form - product.brand - -
- - -
-
-
-

- -

-
- - - - - - - -
- - - - - product.brand.tree - product.brand - - - - - - - - - - - product.search.form - product.product - - - - - - - - - - - - - product.normal.form - product.product - - -
-
- - - - - product.template.product.form - product.template - - - - - - - - - - Brand - product.brand - form - tree,form - - - - - diff --git a/product_brand/security/ir.model.access.csv b/product_brand/security/ir.model.access.csv deleted file mode 100644 index 892147b47..000000000 --- a/product_brand/security/ir.model.access.csv +++ /dev/null @@ -1,2 +0,0 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_product_brand_product_manager","product.brand","model_product_brand","base.group_partner_manager",1,1,1,1 From 38ba583ba756f3eccf0b326e4e6682d38858ac5e Mon Sep 17 00:00:00 2001 From: Seraphine Lantible Date: Sun, 14 Dec 2014 09:51:56 +0800 Subject: [PATCH 05/74] portation of product_brand to 8.0 --- product_brand/README.rst | 64 +++++++++++++++ product_brand/__init__.py | 31 +++++++ product_brand/__openerp__.py | 46 +++++++++++ product_brand/i18n/fr.po | 82 +++++++++++++++++++ product_brand/i18n/fr_FR.po | 82 +++++++++++++++++++ product_brand/i18n/product_brand.pot | 82 +++++++++++++++++++ product_brand/product_brand.py | 55 +++++++++++++ product_brand/product_brand_view.xml | 94 ++++++++++++++++++++++ product_brand/security/ir.model.access.csv | 2 + 9 files changed, 538 insertions(+) create mode 100644 product_brand/README.rst create mode 100644 product_brand/__init__.py create mode 100644 product_brand/__openerp__.py create mode 100644 product_brand/i18n/fr.po create mode 100644 product_brand/i18n/fr_FR.po create mode 100644 product_brand/i18n/product_brand.pot create mode 100644 product_brand/product_brand.py create mode 100644 product_brand/product_brand_view.xml create mode 100644 product_brand/security/ir.model.access.csv diff --git a/product_brand/README.rst b/product_brand/README.rst new file mode 100644 index 000000000..4be5897ee --- /dev/null +++ b/product_brand/README.rst @@ -0,0 +1,64 @@ +Product Brand Manage [product_brand] +=========== + +This module allows odoo users to easily manage product brands. You can +define brands, attach a logo and a description to them. +It also allows to attach a partner to a brand. + +Installation +============ + +To install this module, you need to: + + * git clone https://github.com/OCA/product_attribute --branch 8.0 + * make it available to odoo by adding its location to the addons_path in + /etc/odoo-server.conf + +Configuration +============= + +To configure this module, you need to: + + * no configuration required + +Usage +===== + +To use this module, you need to: + + * go to ... + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + +* A view to list or sort products by brand +* add a field with brands assiciated to a Customer or Supplier on + the Customers/Suppliers Form View + +Credits +======= + +Contributors +------------ + +Mathieu Lemercier +Franck Bret +Seraphine Lantible +Gunnar Wagner + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/product_brand/__init__.py b/product_brand/__init__.py new file mode 100644 index 000000000..a58001c86 --- /dev/null +++ b/product_brand/__init__.py @@ -0,0 +1,31 @@ +# -*- encoding: utf-8 -*- +############################################################################### +# # # +# product_brand for Odoo # # +# Copyright (C) 2009 NetAndCo (). # # +# Copyright (C) 2011 Akretion Benoît Guillot # # +# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # +# Contributors # +# Mathieu Lemercier, mathieu@netandco.net, # # +# Franck Bret, franck@netandco.net # # +# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # +# # # +# This program is free software: you can redistribute it and/or modify # # +# it under the terms of the GNU Affero General Public License as # # +# published by the Free Software Foundation, either version 3 of the # # +# License, or (at your option) any later version. # # +# # # +# This program is distributed in the hope that it will be useful, # # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # +# GNU Affero General Public License for more details. # # +# # # +# You should have received a copy of the GNU Affero General Public License # # +# along with this program. If not, see . # # +# # # +############################################################################### +############################################################################### +# Product Brand is an Openobject module wich enable Brand management # +# for products # +############################################################################### +from . import product_brand diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py new file mode 100644 index 000000000..11e809468 --- /dev/null +++ b/product_brand/__openerp__.py @@ -0,0 +1,46 @@ +# -*- encoding: utf-8 -*- +############################################################################### +# # # +# product_brand for Odoo # # +# Copyright (C) 2009 NetAndCo (). # # +# Copyright (C) 2011 Akretion Benoît Guillot # # +# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # +# Contributors # +# Mathieu Lemercier, mathieu@netandco.net, # # +# Franck Bret, franck@netandco.net # # +# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # +# # # +# This program is free software: you can redistribute it and/or modify # # +# it under the terms of the GNU Affero General Public License as # # +# published by the Free Software Foundation, either version 3 of the # # +# License, or (at your option) any later version. # # +# # # +# This program is distributed in the hope that it will be useful, # # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # +# GNU Affero General Public License for more details. # # +# # # +# You should have received a copy of the GNU Affero General Public License # # +# along with this program. If not, see . # # +# # # +############################################################################### +############################################################################### +# Product Brand is an Openobject module wich enable Brand management for # +# products # +############################################################################### +{ + 'name': 'Product Brand Manager', + 'version': '0.1', + 'category': 'Product', + 'summary': ' brand', + 'author': "NetAndCo, Akretion," + "Prisnet Telecommunications SA," + "Odoo Community Association (OCA)", + 'license': 'AGPL-3', + 'depends': ['product'], + 'data': [ + 'product_brand_view.xml', + 'security/ir.model.access.csv' + ], + 'installable': True, +} diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po new file mode 100644 index 000000000..e5b244d75 --- /dev/null +++ b/product_brand/i18n/fr.po @@ -0,0 +1,82 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-04-08 17:33+0000\n" +"Last-Translator: Guewen Baconnier @ Camptocamp \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" +"X-Generator: Launchpad (build 17007)\n" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "product.brand" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Modèle de produit" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "Gestion des marques" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "Description" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: view:product.brand:0 +msgid "Product Brand" +msgstr "Marque d'article" + +#. module: product_brand +#: field:product.brand,logo:0 +msgid "Logo File" +msgstr "Logo" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: view:product.product:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." +msgstr "Sélectionnez un partenaire pour cette marque." + +#. module: product_brand +#: view:product.product:0 +msgid "Group by..." +msgstr "Regrouper par..." + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "Partenaire" + +#. module: product_brand +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." +msgstr "Sélectionnez une marque pour ce produit." diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po new file mode 100644 index 000000000..9f9d41af9 --- /dev/null +++ b/product_brand/i18n/fr_FR.po @@ -0,0 +1,82 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.7\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-03-11 12:42+0000\n" +"Last-Translator: Graeme Gellatly \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" +"X-Generator: Launchpad (build 17007)\n" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "Gestion des marques" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "Description" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: view:product.brand:0 +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: field:product.brand,logo:0 +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: view:product.product:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." +msgstr "" + +#. module: product_brand +#: view:product.product:0 +msgid "Group by..." +msgstr "" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "Partenaire" + +#. module: product_brand +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." +msgstr "" diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot new file mode 100644 index 000000000..9dddf3599 --- /dev/null +++ b/product_brand/i18n/product_brand.pot @@ -0,0 +1,82 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 12:55+0000\n" +"PO-Revision-Date: 2014-03-14 12:55+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: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: view:product.brand:0 +msgid "product.brand" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Brand management" +msgstr "" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,description:0 +msgid "Description" +msgstr "" + +#. module: product_brand +#: view:product.brand:0 +#: field:product.brand,name:0 +msgid "Brand Name" +msgstr "" + +#. module: product_brand +#: view:product.brand:0 +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: field:product.brand,logo:0 +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: view:product.product:0 +#: field:product.template,product_brand_id:0 +msgid "Brand" +msgstr "" + +#. module: product_brand +#: help:product.brand,partner_id:0 +msgid "Select a partner for this brand if it exists." +msgstr "" + +#. module: product_brand +#: view:product.product:0 +msgid "Group by..." +msgstr "" + +#. module: product_brand +#: field:product.brand,partner_id:0 +msgid "partner" +msgstr "" + +#. module: product_brand +#: help:product.template,product_brand_id:0 +msgid "Select a brand for this product." +msgstr "" + diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py new file mode 100644 index 000000000..18b83b347 --- /dev/null +++ b/product_brand/product_brand.py @@ -0,0 +1,55 @@ +# -*- encoding: utf-8 -*- +############################################################################### +# # # +# product_brand for Odoo # # +# Copyright (C) 2009 NetAndCo (). # # +# Copyright (C) 2011 Akretion Benoît Guillot # # +# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # +# Contributors # +# Mathieu Lemercier, mathieu@netandco.net, # # +# Franck Bret, franck@netandco.net # # +# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # +# # # +# This program is free software: you can redistribute it and/or modify # # +# it under the terms of the GNU Affero General Public License as # # +# published by the Free Software Foundation, either version 3 of the # # +# License, or (at your option) any later version. # # +# # # +# This program is distributed in the hope that it will be useful, # # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # +# GNU Affero General Public License for more details. # # +# # # +# You should have received a copy of the GNU Affero General Public License # # +# along with this program. If not, see . # # +# # # +############################################################################### +############################################################################### +# Product Brand is an Openobject module wich enable Brand management for # +# products # +############################################################################### +from openerp.osv import orm, fields + + +class product_brand(orm.Model): + _name = 'product.brand' + _columns = { + 'name': fields.char('Brand Name'), + 'description': fields.text('Description', translate=True), + 'partner_id': fields.many2one( + 'res.partner', 'partner', + help='Select a partner for this brand if it exists.', + ondelete='restrict' + ), + 'logo': fields.binary('Logo File'), + } + + +class product_template(orm.Model): + _inherit = 'product.template' + _columns = { + 'product_brand_id': fields.many2one( + 'product.brand', 'Brand', + help='Select a brand for this product.' + ), + } diff --git a/product_brand/product_brand_view.xml b/product_brand/product_brand_view.xml new file mode 100644 index 000000000..832d6b847 --- /dev/null +++ b/product_brand/product_brand_view.xml @@ -0,0 +1,94 @@ + + + + + + product.brand.search.form + product.brand + + + + + + + + + + product.brand.form + product.brand + +
+ + +
+
+
+

+ +

+
+ + + + + + + +
+ + + + + product.brand.tree + product.brand + + + + + + + + + + + product.search.form + product.product + + + + + + + + + + + + + product.template.product.form + product.template + + + + + + + + + + Brand + product.brand + form + tree,form + + + + + diff --git a/product_brand/security/ir.model.access.csv b/product_brand/security/ir.model.access.csv new file mode 100644 index 000000000..892147b47 --- /dev/null +++ b/product_brand/security/ir.model.access.csv @@ -0,0 +1,2 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_product_brand_product_manager","product.brand","model_product_brand","base.group_partner_manager",1,1,1,1 From fd8b4c31e2ba0a6600c96c2d05d223a3acc0e3aa Mon Sep 17 00:00:00 2001 From: Leonardo Donelli Date: Tue, 17 Feb 2015 12:48:37 +0100 Subject: [PATCH 06/74] [IMP]product_brand: Several improvements * add smart button, move menu to a more visible position. * show brand in product.template kanban and tree views. * show brand in product variant kanban and tree views. * add product_brand kanban view. * update module's README and manifest file. * Search and group by brand for both product.product and product.template. * Convert model to new APIs. * Refactor products_count computation using product_ids one2many field. * Add public read access to product.brand (fixes 403 error on webshop for public user). * Make brand name required. --- product_brand/README.rst | 24 ++- product_brand/__openerp__.py | 11 +- product_brand/product_brand.py | 96 ++++++---- product_brand/product_brand_view.xml | 201 ++++++++++++++++++--- product_brand/security/ir.model.access.csv | 1 + product_brand/static/description/icon.png | Bin 0 -> 9455 bytes 6 files changed, 252 insertions(+), 81 deletions(-) create mode 100644 product_brand/static/description/icon.png diff --git a/product_brand/README.rst b/product_brand/README.rst index 4be5897ee..595498cc2 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -1,5 +1,5 @@ -Product Brand Manage [product_brand] -=========== +Product Brand Manager [product_brand] +===================================== This module allows odoo users to easily manage product brands. You can define brands, attach a logo and a description to them. @@ -35,20 +35,30 @@ For further information, please visit: Known issues / Roadmap ====================== -* A view to list or sort products by brand * add a field with brands assiciated to a Customer or Supplier on the Customers/Suppliers Form View + +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 +`here `_. + + Credits ======= Contributors ------------ -Mathieu Lemercier -Franck Bret -Seraphine Lantible -Gunnar Wagner +* Mathieu Lemercier +* Franck Bret +* Seraphine Lantible +* Gunnar Wagner +* Leonardo Donelli Maintainer ---------- diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py index 11e809468..5f4dc405c 100644 --- a/product_brand/__openerp__.py +++ b/product_brand/__openerp__.py @@ -30,17 +30,16 @@ ############################################################################### { 'name': 'Product Brand Manager', - 'version': '0.1', + 'version': '8.0.0.1.0', 'category': 'Product', - 'summary': ' brand', - 'author': "NetAndCo, Akretion," - "Prisnet Telecommunications SA," - "Odoo Community Association (OCA)", + 'summary': 'Add brand to products', + 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' + ', MONK Software, Odoo Community Association (OCA)', 'license': 'AGPL-3', 'depends': ['product'], 'data': [ 'product_brand_view.xml', 'security/ir.model.access.csv' - ], + ], 'installable': True, } diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py index 18b83b347..d82617ef8 100644 --- a/product_brand/product_brand.py +++ b/product_brand/product_brand.py @@ -1,55 +1,71 @@ # -*- encoding: utf-8 -*- ############################################################################### -# # # -# product_brand for Odoo # # -# Copyright (C) 2009 NetAndCo (). # # -# Copyright (C) 2011 Akretion Benoît Guillot # # -# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # +# # +# product_brand for Odoo # +# Copyright (C) 2009 NetAndCo (). # +# Copyright (C) 2011 Akretion Benoît Guillot # +# Copyright (C) 2014 prisnet.ch Seraphine Lantible # +# Copyright (C) 2015 Leonardo Donelli # # Contributors # -# Mathieu Lemercier, mathieu@netandco.net, # # -# Franck Bret, franck@netandco.net # # +# Mathieu Lemercier, mathieu@netandco.net # +# Franck Bret, franck@netandco.net # # Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # -# # # -# This program is free software: you can redistribute it and/or modify # # -# it under the terms of the GNU Affero General Public License as # # -# published by the Free Software Foundation, either version 3 of the # # -# License, or (at your option) any later version. # # -# # # -# This program is distributed in the hope that it will be useful, # # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # -# GNU Affero General Public License for more details. # # -# # # -# You should have received a copy of the GNU Affero General Public License # # -# along with this program. If not, see . # # -# # # +# Leonardo Donelli, donelli@webmonks.it, http://www.wearemonk.com # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +# # ############################################################################### ############################################################################### # Product Brand is an Openobject module wich enable Brand management for # # products # ############################################################################### -from openerp.osv import orm, fields +from openerp import models, fields, api -class product_brand(orm.Model): +class ProductBrand(models.Model): _name = 'product.brand' - _columns = { - 'name': fields.char('Brand Name'), - 'description': fields.text('Description', translate=True), - 'partner_id': fields.many2one( - 'res.partner', 'partner', - help='Select a partner for this brand if it exists.', - ondelete='restrict' - ), - 'logo': fields.binary('Logo File'), - } + name = fields.Char('Brand Name', required=True) + description = fields.Text('Description', translate=True) + partner_id = fields.Many2one( + 'res.partner', + string='Partner', + help='Select a partner for this brand if it exists', + ondelete='restrict' + ) + logo = fields.Binary('Logo File') + product_ids = fields.One2many( + 'product.template', + 'product_brand_id', + string='Brand Products', + ) + products_count = fields.Integer( + string='Number of products', + compute='_get_products_count', + ) -class product_template(orm.Model): + @api.one + @api.depends('product_ids') + def _get_products_count(self): + self.products_count = len(self.product_ids) + + +class ProductTemplate(models.Model): _inherit = 'product.template' - _columns = { - 'product_brand_id': fields.many2one( - 'product.brand', 'Brand', - help='Select a brand for this product.' - ), - } + + product_brand_id = fields.Many2one( + 'product.brand', + string='Brand', + help='Select a brand for this product' + ) diff --git a/product_brand/product_brand_view.xml b/product_brand/product_brand_view.xml index 832d6b847..4fdf0f9fd 100644 --- a/product_brand/product_brand_view.xml +++ b/product_brand/product_brand_view.xml @@ -3,8 +3,13 @@ product_brand for Odoo Copyright (C) 2009 NetAndCo . Copyright (C) 2011 Akretion Benoît Guillot - Copyright (C) 2014 prisnet.ch Seraphine Lantible - Contributors, Mathieu Lemercier , Franck Bret , Seraphine Lantible + Copyright (C) 2014 prisnet.ch Seraphine Lantible + Copyright (C) 2015 Leonardo Donelli + Contributors: + Mathieu Lemercier + Franck Bret + Seraphine Lantible + Leonardo Donelli --> @@ -13,39 +18,65 @@ product.brand - - + + - + + + + + product.brand.form product.brand
- - -
-
-
- - - - - - - + + + + + + + - + product.brand.tree product.brand @@ -57,6 +88,47 @@ + + product.brand.kanban + product.brand + + + + + + + +
+ + + +
+

+ + + +

+ + + + + ... + + +
+
+ + + + + + product.search.form product.product @@ -66,29 +138,102 @@ - + - + + product.template.search.brand + product.template + + + + + + + + + + + + product.template.product.form product.template - + - + + + + + product kanban view: add brand + product.template + + + +
+ + + +
+ + + + + + product variant kanban view: add brand + product.product + + + +
+ + + +
+ + + + + + product tree view: add brand + product.template + + + + + + + + + + product variant tree view: add brand + product.product + + + + + + Brand product.brand form - tree,form + kanban,form,tree - + diff --git a/product_brand/security/ir.model.access.csv b/product_brand/security/ir.model.access.csv index 892147b47..899b0d21e 100644 --- a/product_brand/security/ir.model.access.csv +++ b/product_brand/security/ir.model.access.csv @@ -1,2 +1,3 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_product_brand_product_manager","product.brand","model_product_brand","base.group_partner_manager",1,1,1,1 +"access_product_brand_public","product.brand.public","model_product_brand",,1,0,0,0 diff --git a/product_brand/static/description/icon.png b/product_brand/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 z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From d6c50e339d1eb6eebdd431ccac22e12d155e8904 Mon Sep 17 00:00:00 2001 From: "Serpent Consulting Services Pvt. Ltd" Date: Wed, 20 Jan 2016 15:51:44 +0530 Subject: [PATCH 07/74] [MIG] product_brand :Updated module as per v9 --- product_brand/README.rst | 51 +++++++------ product_brand/__init__.py | 40 +++-------- product_brand/__openerp__.py | 50 ++++--------- product_brand/models/__init__.py | 9 +++ product_brand/models/product_brand.py | 47 ++++++++++++ product_brand/product_brand.py | 71 ------------------- .../{ => views}/product_brand_view.xml | 40 ++--------- 7 files changed, 116 insertions(+), 192 deletions(-) create mode 100644 product_brand/models/__init__.py create mode 100644 product_brand/models/product_brand.py delete mode 100644 product_brand/product_brand.py rename product_brand/{ => views}/product_brand_view.xml (86%) diff --git a/product_brand/README.rst b/product_brand/README.rst index 595498cc2..ec3fa2cce 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -1,32 +1,32 @@ -Product Brand Manager [product_brand] -===================================== +.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg + :target: https://www.gnu.org/licenses/agpl.html + :alt: License: AGPL-3 -This module allows odoo users to easily manage product brands. You can -define brands, attach a logo and a description to them. -It also allows to attach a partner to a brand. +===================== +Product Brand Manager +===================== -Installation -============ +This module introduce the following features: -To install this module, you need to: +* This module allows odoo users to easily manage product brands. - * git clone https://github.com/OCA/product_attribute --branch 8.0 - * make it available to odoo by adding its location to the addons_path in - /etc/odoo-server.conf +* You can define brands, attach a logo and a description to them. -Configuration +* It also allows to attach a partner to a brand. + +Installation ============= -To configure this module, you need to: + No external library is used. + +Configuration +============= - * no configuration required + No configuration is required. Usage ===== -To use this module, you need to: - - * go to ... For further information, please visit: @@ -35,22 +35,28 @@ For further information, please visit: Known issues / Roadmap ====================== -* add a field with brands assiciated to a Customer or Supplier on - the Customers/Suppliers Form View +* Add a field with brands assiciated to a Customer or Supplier on + the Customers/Suppliers Form View. 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 +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 `here `_. Credits ======= +Images +------ + +* Odoo Community Association: `Icon `_. + Contributors ------------ @@ -59,6 +65,7 @@ Contributors * Seraphine Lantible * Gunnar Wagner * Leonardo Donelli +* Serpent Consulting Services Pvt. Ltd. Maintainer ---------- diff --git a/product_brand/__init__.py b/product_brand/__init__.py index a58001c86..016a48c41 100644 --- a/product_brand/__init__.py +++ b/product_brand/__init__.py @@ -1,31 +1,9 @@ -# -*- encoding: utf-8 -*- -############################################################################### -# # # -# product_brand for Odoo # # -# Copyright (C) 2009 NetAndCo (). # # -# Copyright (C) 2011 Akretion Benoît Guillot # # -# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # -# Contributors # -# Mathieu Lemercier, mathieu@netandco.net, # # -# Franck Bret, franck@netandco.net # # -# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # -# # # -# This program is free software: you can redistribute it and/or modify # # -# it under the terms of the GNU Affero General Public License as # # -# published by the Free Software Foundation, either version 3 of the # # -# License, or (at your option) any later version. # # -# # # -# This program is distributed in the hope that it will be useful, # # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # -# GNU Affero General Public License for more details. # # -# # # -# You should have received a copy of the GNU Affero General Public License # # -# along with this program. If not, see . # # -# # # -############################################################################### -############################################################################### -# Product Brand is an Openobject module wich enable Brand management # -# for products # -############################################################################### -from . import product_brand +# -*- coding: utf-8 -*- +# © 2009 NetAndCo (). +# © 2011 Akretion Benoît Guillot +# © 2014 prisnet.ch Seraphine Lantible +# © 2016-Today Serpent Consulting Services Pvt. Ltd. +# () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from . import models diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py index 5f4dc405c..b82ca9ce6 100644 --- a/product_brand/__openerp__.py +++ b/product_brand/__openerp__.py @@ -1,45 +1,25 @@ -# -*- encoding: utf-8 -*- -############################################################################### -# # # -# product_brand for Odoo # # -# Copyright (C) 2009 NetAndCo (). # # -# Copyright (C) 2011 Akretion Benoît Guillot # # -# Copyright (C) 2014 prisnet.ch Seraphine Lantible # # -# Contributors # -# Mathieu Lemercier, mathieu@netandco.net, # # -# Franck Bret, franck@netandco.net # # -# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # -# # # -# This program is free software: you can redistribute it and/or modify # # -# it under the terms of the GNU Affero General Public License as # # -# published by the Free Software Foundation, either version 3 of the # # -# License, or (at your option) any later version. # # -# # # -# This program is distributed in the hope that it will be useful, # # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # -# GNU Affero General Public License for more details. # # -# # # -# You should have received a copy of the GNU Affero General Public License # # -# along with this program. If not, see . # # -# # # -############################################################################### -############################################################################### -# Product Brand is an Openobject module wich enable Brand management for # -# products # -############################################################################### +# -*- coding: utf-8 -*- +# © 2009 NetAndCo (). +# © 2011 Akretion Benoît Guillot +# © 2014 prisnet.ch Seraphine Lantible +# © 2016-Today Serpent Consulting Services Pvt. Ltd. +# () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + { 'name': 'Product Brand Manager', - 'version': '8.0.0.1.0', + 'version': '9.0.1.0.0', 'category': 'Product', - 'summary': 'Add brand to products', + 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' - ', MONK Software, Odoo Community Association (OCA)', + ', MONK Software, Odoo Community Association (OCA)' + ', SerpentCS Pvt. Ltd.', 'license': 'AGPL-3', 'depends': ['product'], 'data': [ - 'product_brand_view.xml', + 'views/product_brand_view.xml', 'security/ir.model.access.csv' ], - 'installable': True, + 'installable': False, + 'auto_install': False } diff --git a/product_brand/models/__init__.py b/product_brand/models/__init__.py new file mode 100644 index 000000000..31bb5f0dd --- /dev/null +++ b/product_brand/models/__init__.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# © 2009 NetAndCo (). +# © 2011 Akretion Benoît Guillot +# © 2014 prisnet.ch Seraphine Lantible +# © 2016-Today Serpent Consulting Services Pvt. Ltd. +# () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from . import product_brand diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py new file mode 100644 index 000000000..049976987 --- /dev/null +++ b/product_brand/models/product_brand.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# © 2009 NetAndCo (). +# © 2011 Akretion Benoît Guillot +# © 2014 prisnet.ch Seraphine Lantible +# © 2016-Today Serpent Consulting Services Pvt. Ltd. +# () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from openerp import api, fields, models + + +class ProductBrand(models.Model): + _name = 'product.brand' + + name = fields.Char('Brand Name', required=True) + description = fields.Text('Description', translate=True) + partner_id = fields.Many2one( + 'res.partner', + string='Partner', + help='Select a partner for this brand if any.', + ondelete='restrict' + ) + logo = fields.Binary('Logo File') + product_ids = fields.One2many( + 'product.template', + 'product_brand_id', + string='Brand Products', + ) + products_count = fields.Integer( + string='Number of products', + compute='_get_products_count', + ) + + @api.one + @api.depends('product_ids') + def _get_products_count(self): + self.products_count = len(self.product_ids) + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + product_brand_id = fields.Many2one( + 'product.brand', + string='Brand', + help='Select a brand for this product' + ) diff --git a/product_brand/product_brand.py b/product_brand/product_brand.py deleted file mode 100644 index d82617ef8..000000000 --- a/product_brand/product_brand.py +++ /dev/null @@ -1,71 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################### -# # -# product_brand for Odoo # -# Copyright (C) 2009 NetAndCo (). # -# Copyright (C) 2011 Akretion Benoît Guillot # -# Copyright (C) 2014 prisnet.ch Seraphine Lantible # -# Copyright (C) 2015 Leonardo Donelli # -# Contributors # -# Mathieu Lemercier, mathieu@netandco.net # -# Franck Bret, franck@netandco.net # -# Seraphine Lantible, s.lantible@gmail.com, http://www.prisnet.ch # -# Leonardo Donelli, donelli@webmonks.it, http://www.wearemonk.com # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU Affero General Public License for more details. # -# # -# You should have received a copy of the GNU Affero General Public License # -# along with this program. If not, see . # -# # -############################################################################### -############################################################################### -# Product Brand is an Openobject module wich enable Brand management for # -# products # -############################################################################### -from openerp import models, fields, api - - -class ProductBrand(models.Model): - _name = 'product.brand' - - name = fields.Char('Brand Name', required=True) - description = fields.Text('Description', translate=True) - partner_id = fields.Many2one( - 'res.partner', - string='Partner', - help='Select a partner for this brand if it exists', - ondelete='restrict' - ) - logo = fields.Binary('Logo File') - product_ids = fields.One2many( - 'product.template', - 'product_brand_id', - string='Brand Products', - ) - products_count = fields.Integer( - string='Number of products', - compute='_get_products_count', - ) - - @api.one - @api.depends('product_ids') - def _get_products_count(self): - self.products_count = len(self.product_ids) - - -class ProductTemplate(models.Model): - _inherit = 'product.template' - - product_brand_id = fields.Many2one( - 'product.brand', - string='Brand', - help='Select a brand for this product' - ) diff --git a/product_brand/product_brand_view.xml b/product_brand/views/product_brand_view.xml similarity index 86% rename from product_brand/product_brand_view.xml rename to product_brand/views/product_brand_view.xml index 4fdf0f9fd..e0a2c7242 100644 --- a/product_brand/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -1,18 +1,7 @@ - - + + product.brand.search.form product.brand @@ -129,21 +118,6 @@ - - product.search.form - product.product - - - - - - - - - - - product.template.search.brand product.template @@ -151,11 +125,10 @@ - - - + + @@ -175,7 +148,7 @@ product.template - +
@@ -191,7 +164,7 @@ product.product - +
@@ -235,5 +208,6 @@ id="menu_product_brand" action="action_product_brand" parent="base.menu_product"/> + From 1254a521a7aa6eddec2455b041b5f072ab0aca22 Mon Sep 17 00:00:00 2001 From: Marcelo Pickler Date: Wed, 28 Dec 2016 14:39:17 -0300 Subject: [PATCH 08/74] [MIG][10.0] product_brand (#191) Migration to 10.0 --- product_brand/README.rst | 4 +- product_brand/__openerp__.py | 8 +- product_brand/i18n/de.po | 134 ++++++++ product_brand/i18n/es.po | 134 ++++++++ product_brand/i18n/fr.po | 148 +++++--- product_brand/i18n/fr_FR.po | 138 +++++--- product_brand/i18n/hr.po | 135 ++++++++ product_brand/i18n/it.po | 135 ++++++++ product_brand/views/product_brand_view.xml | 380 ++++++++++----------- 9 files changed, 929 insertions(+), 287 deletions(-) create mode 100644 product_brand/i18n/de.po create mode 100644 product_brand/i18n/es.po create mode 100644 product_brand/i18n/hr.po create mode 100644 product_brand/i18n/it.po diff --git a/product_brand/README.rst b/product_brand/README.rst index ec3fa2cce..02f8ec79b 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -35,8 +35,9 @@ For further information, please visit: Known issues / Roadmap ====================== -* Add a field with brands assiciated to a Customer or Supplier on +* Add a field with brands associated to a Customer or Supplier on the Customers/Suppliers Form View. +* Fix smart button alignment in brand form view Bug Tracker @@ -66,6 +67,7 @@ Contributors * Gunnar Wagner * Leonardo Donelli * Serpent Consulting Services Pvt. Ltd. +* Marcelo Pickler Maintainer ---------- diff --git a/product_brand/__openerp__.py b/product_brand/__openerp__.py index b82ca9ce6..44f1e14fa 100644 --- a/product_brand/__openerp__.py +++ b/product_brand/__openerp__.py @@ -8,18 +8,20 @@ { 'name': 'Product Brand Manager', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' ', MONK Software, Odoo Community Association (OCA)' ', SerpentCS Pvt. Ltd.', 'license': 'AGPL-3', - 'depends': ['product'], + 'depends': [ + 'sale', + ], 'data': [ 'views/product_brand_view.xml', 'security/ir.model.access.csv' ], - 'installable': False, + 'installable': True, 'auto_install': False } diff --git a/product_brand/i18n/de.po b/product_brand/i18n/de.po new file mode 100644 index 000000000..18ba7e7ff --- /dev/null +++ b/product_brand/i18n/de.po @@ -0,0 +1,134 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# Niki Waibel , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-29 03:36+0000\n" +"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"Last-Translator: Niki Waibel , 2016\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Produktvorlage" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "" diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po new file mode 100644 index 000000000..e688f57be --- /dev/null +++ b/product_brand/i18n/es.po @@ -0,0 +1,134 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# Pedro M. Baeza , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-29 03:36+0000\n" +"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"Last-Translator: Pedro M. Baeza , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Marca" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Nombre de la marca" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "Productos de la marca" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "Creado el" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "Descripción" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "Nombre mostrado" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "ID" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "Última modificación el" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "Última modificación el" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "Logotipo" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "Número de productos" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "Empresa" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "Marca de producto" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "Marcas de producto" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Plantilla de producto" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "Productos" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "Seleccione una marca para este producto" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "Seleccione una empresa para este marca si la hay." + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "product.brand" diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index e5b244d75..0c4dd620f 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -1,82 +1,134 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: -# * product_brand -# +# * product_brand +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-04-08 17:33+0000\n" -"Last-Translator: Guewen Baconnier @ Camptocamp \n" -"Language-Team: \n" +"POT-Creation-Date: 2016-12-29 03:36+0000\n" +"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" -"X-Generator: Launchpad (build 17007)\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" -msgstr "product.brand" +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Marque" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" -msgstr "Modèle de produit" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Marque" #. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "Gestion des marques" +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Description" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "Marque" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "" #. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" -msgstr "Marque d'article" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "" #. module: product_brand -#: field:product.brand,logo:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo msgid "Logo File" msgstr "Logo" #. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "Marque" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "Marque d'article" #. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." -msgstr "Sélectionnez un partenaire pour cette marque." +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" #. module: product_brand -#: view:product.product:0 -msgid "Group by..." -msgstr "Regrouper par..." +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Modèle de produit" #. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "Partenaire" +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "" #. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." -msgstr "Sélectionnez une marque pour ce produit." +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "product.brand" diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po index 9f9d41af9..f0a06a2fc 100644 --- a/product_brand/i18n/fr_FR.po +++ b/product_brand/i18n/fr_FR.po @@ -1,82 +1,134 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: -# * product_brand -# +# * product_brand +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.7\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-03-11 12:42+0000\n" -"Last-Translator: Graeme Gellatly \n" -"Language-Team: \n" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-29 03:36+0000\n" +"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-05-17 07:08+0000\n" -"X-Generator: Launchpad (build 17007)\n" +"Content-Transfer-Encoding: \n" +"Language: fr_FR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Marque" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Marque" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" msgstr "" #. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" -msgstr "Gestion des marques" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Description" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" -msgstr "Marque" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "" #. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" msgstr "" #. module: product_brand -#: field:product.brand,logo:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" -msgstr "Marque" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "" #. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" msgstr "" #. module: product_brand -#: view:product.product:0 -msgid "Group by..." +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" msgstr "" #. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" -msgstr "Partenaire" +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" #. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" msgstr "" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po new file mode 100644 index 000000000..2b256987f --- /dev/null +++ b/product_brand/i18n/hr.po @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# OCA Transbot , 2016 +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-31 06:20+0000\n" +"PO-Revision-Date: 2016-12-31 06:20+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Brand" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Naziv branda" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "Proizvodi branda" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "Kreirao" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "Kreirano" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "Opis" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "Naziv" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "ID" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "Zadnje ažurirano" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "Zadnji ažurirao" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "Zadnje ažurirano" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "Logo sličica" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "Broj proizvoda" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "Partner" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "Brand proizvoda" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "Brandovi proizvoda" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Predložak proizvoda" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "Proizvodi" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "Odaberite brand za ovaj proizvod" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "Odaberite partnera za ovaj brand ako ga ima." + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "product.brand" diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po new file mode 100644 index 000000000..653110897 --- /dev/null +++ b/product_brand/i18n/it.po @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# OCA Transbot , 2017 +# Giuliano Lotta , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-28 04:31+0000\n" +"PO-Revision-Date: 2017-01-28 04:31+0000\n" +"Last-Translator: Giuliano Lotta , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Marca" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Marchio" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "Prodotti della Marca" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "Creato da" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "Creato il" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "Descrizione" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "Nome visualizzato" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "Ultima Modifica il" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "Ultimo Aggiornamento di" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "Ultimo Aggiornamento il" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "File del Logo" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "Numero di prodotti" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "Partner" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "Marca del prodotto" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "Marchi del prodotto" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "Prodotti" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "Scegliere una marca per questo prodotto" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "Scegliere un partner per questa marca ove presente." + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "" diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index e0a2c7242..ac7c5b448 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -1,213 +1,209 @@ - - + + + product.brand.search.form + product.brand + + + + + + + - - product.brand.search.form - product.brand - - - - - - - - - + - + - - product.brand.form - product.brand - -
- - -
-
-
-

- -

-
-
- + + product.brand.form + product.brand + + + + +
+
+
- - - - - - - - - - +

+ +

+
+
+ +
+ + + + + + + + + + - - product.brand.tree - product.brand - - - - - - - - + + product.brand.tree + product.brand + + + + + + + + - - product.brand.kanban - product.brand - - - - - - - -
- - - -
-

- - - -

- - - - - ... - - + + product.brand.kanban + product.brand + + + + + + + +
+ + + +
+

+ + + +

+ + + + + ... + +
- - - - - +
+ + + + + - - product.template.search.brand - product.template - - - - - - - + + product.template.search.brand + product.template + + + + + + - + + - - product.template.product.form - product.template - - - - - + + product.template.product.form + product.template + + + +
- + + - - product kanban view: add brand - product.template - - - -
- - - -
- - - + + product kanban view: add brand + product.template + + + +
+ + + +
+ + + - - product variant kanban view: add brand - product.product - - - -
- - - -
- - - + + product variant kanban view: add brand + product.product + + + +
+ + + +
+ + + - - product tree view: add brand - product.template - - - - - + + product tree view: add brand + product.template + + + + - + + - - product variant tree view: add brand - product.product - - - - - + + product variant tree view: add brand + product.product + + + + - - - - Brand - product.brand - form - kanban,form,tree - + + - + + Brand + product.brand + form + kanban,form,tree + - - + + From da17a93eeed4c1af5ae4d9380175fc7d44486f3e Mon Sep 17 00:00:00 2001 From: Andrea Piovesana Date: Mon, 27 Feb 2017 15:11:36 +0100 Subject: [PATCH 09/74] Update product_brand.py --- product_brand/i18n/es.po | 10 +- product_brand/i18n/fr.po | 20 ++-- product_brand/i18n/fr_FR.po | 6 +- product_brand/i18n/hr.po | 6 +- product_brand/i18n/it.po | 9 +- product_brand/i18n/nl_NL.po | 136 ++++++++++++++++++++++++++ product_brand/models/product_brand.py | 2 +- 7 files changed, 167 insertions(+), 22 deletions(-) create mode 100644 product_brand/i18n/nl_NL.po diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index e688f57be..98330ff10 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -3,14 +3,14 @@ # * product_brand # # Translators: -# Pedro M. Baeza , 2016 +# OCA Transbot , 2016 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-29 03:36+0000\n" -"PO-Revision-Date: 2016-12-29 03:36+0000\n" -"Last-Translator: Pedro M. Baeza , 2016\n" +"POT-Creation-Date: 2017-05-05 02:43+0000\n" +"PO-Revision-Date: 2017-05-05 02:43+0000\n" +"Last-Translator: OCA Transbot , 2016\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,6 +20,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -118,6 +119,7 @@ msgid "Products" msgstr "Productos" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "Seleccione una marca para este producto" diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 0c4dd620f..49fbd0d70 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-29 03:36+0000\n" -"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"POT-Creation-Date: 2017-05-23 02:40+0000\n" +"PO-Revision-Date: 2017-05-23 02:40+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" @@ -20,6 +20,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -41,12 +42,12 @@ msgstr "" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid msgid "Created by" -msgstr "" +msgstr "Créé par" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date msgid "Created on" -msgstr "" +msgstr "Créé le" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_description @@ -57,27 +58,27 @@ msgstr "Description" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name msgid "Display Name" -msgstr "" +msgstr "Nom affiché" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_id msgid "ID" -msgstr "" +msgstr "ID" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update msgid "Last Modified on" -msgstr "" +msgstr "Dernière Modification le" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid msgid "Last Updated by" -msgstr "" +msgstr "Dernière mise à jour par" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date msgid "Last Updated on" -msgstr "" +msgstr "Dernière mise à jour le" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_logo @@ -118,6 +119,7 @@ msgid "Products" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "" diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po index f0a06a2fc..d930b9115 100644 --- a/product_brand/i18n/fr_FR.po +++ b/product_brand/i18n/fr_FR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-29 03:36+0000\n" -"PO-Revision-Date: 2016-12-29 03:36+0000\n" +"POT-Creation-Date: 2017-05-05 02:43+0000\n" +"PO-Revision-Date: 2017-05-05 02:43+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/fr_FR/)\n" "MIME-Version: 1.0\n" @@ -20,6 +20,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -118,6 +119,7 @@ msgid "Products" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po index 2b256987f..74cf99da0 100644 --- a/product_brand/i18n/hr.po +++ b/product_brand/i18n/hr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-31 06:20+0000\n" -"PO-Revision-Date: 2016-12-31 06:20+0000\n" +"POT-Creation-Date: 2017-05-05 02:43+0000\n" +"PO-Revision-Date: 2017-05-05 02:43+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" @@ -21,6 +21,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -119,6 +120,7 @@ msgid "Products" msgstr "Proizvodi" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "Odaberite brand za ovaj proizvod" diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po index 653110897..2ac66df6a 100644 --- a/product_brand/i18n/it.po +++ b/product_brand/i18n/it.po @@ -4,14 +4,13 @@ # # Translators: # OCA Transbot , 2017 -# Giuliano Lotta , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-28 04:31+0000\n" -"PO-Revision-Date: 2017-01-28 04:31+0000\n" -"Last-Translator: Giuliano Lotta , 2017\n" +"POT-Creation-Date: 2017-05-05 02:43+0000\n" +"PO-Revision-Date: 2017-05-05 02:43+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,6 +20,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -119,6 +119,7 @@ msgid "Products" msgstr "Prodotti" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "Scegliere una marca per questo prodotto" diff --git a/product_brand/i18n/nl_NL.po b/product_brand/i18n/nl_NL.po new file mode 100644 index 000000000..606aa87b2 --- /dev/null +++ b/product_brand/i18n/nl_NL.po @@ -0,0 +1,136 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-27 04:44+0000\n" +"PO-Revision-Date: 2017-05-27 04:44+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "Merk" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "Merknaam" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "Merkproducten" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "Aangemaakt door" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "Aangemaakt op" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "Omschrijving" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "Weergavenaam" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "ID" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "Laatst aangepast door" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "Laatst aangepast op" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "Logo-bestand" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "Aantal producten" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Productsjabloon" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "Producten" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "product.brand" diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py index 049976987..5463e1be5 100644 --- a/product_brand/models/product_brand.py +++ b/product_brand/models/product_brand.py @@ -6,7 +6,7 @@ # () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import api, fields, models +from odoo import api, fields, models class ProductBrand(models.Model): From fdddbbf0790914995e2fe148f696c12582b87d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20Laukavi=C4=8Dius?= Date: Tue, 27 Jun 2017 12:12:47 +0300 Subject: [PATCH 10/74] [IMP] product_brand: update form view for 10.0 Old form view was out of order: form blocks misaligned, because it was not using Odoo 10 views styling and layout. --- product_brand/README.rst | 1 + .../{__openerp__.py => __manifest__.py} | 0 product_brand/views/product_brand_view.xml | 29 +++++++++---------- 3 files changed, 14 insertions(+), 16 deletions(-) rename product_brand/{__openerp__.py => __manifest__.py} (100%) diff --git a/product_brand/README.rst b/product_brand/README.rst index 02f8ec79b..6f66e1254 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -68,6 +68,7 @@ Contributors * Leonardo Donelli * Serpent Consulting Services Pvt. Ltd. * Marcelo Pickler +* Andrius Laukavičius (Boolit) Maintainer ---------- diff --git a/product_brand/__openerp__.py b/product_brand/__manifest__.py similarity index 100% rename from product_brand/__openerp__.py rename to product_brand/__manifest__.py diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index ac7c5b448..50f6955a3 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -32,28 +32,25 @@ product.brand.form product.brand -
+ - -
-
-
-

- -

-
-
-
+ +
+
- + + + From fc7248a65945b0126fb72ba70a1e1567fd505cf1 Mon Sep 17 00:00:00 2001 From: Daniel-CA Date: Tue, 6 Mar 2018 17:34:39 +0100 Subject: [PATCH 11/74] [MIG] : Migration to 11.0 + Test --- product_brand/README.rst | 7 +- product_brand/__init__.py | 4 +- product_brand/__manifest__.py | 6 +- product_brand/i18n/es.po | 5 +- product_brand/i18n/fr.po | 10 +- product_brand/i18n/hr.po | 5 +- product_brand/i18n/it.po | 5 +- product_brand/i18n/sl.po | 135 +++++++++++++++++++++ product_brand/models/__init__.py | 4 +- product_brand/models/product_brand.py | 9 +- product_brand/tests/__init__.py | 4 + product_brand/tests/test_product_brand.py | 24 ++++ product_brand/views/product_brand_view.xml | 7 +- 13 files changed, 194 insertions(+), 31 deletions(-) create mode 100644 product_brand/i18n/sl.po create mode 100644 product_brand/tests/__init__.py create mode 100644 product_brand/tests/test_product_brand.py diff --git a/product_brand/README.rst b/product_brand/README.rst index 6f66e1254..89581e55a 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -69,16 +69,17 @@ Contributors * Serpent Consulting Services Pvt. Ltd. * Marcelo Pickler * Andrius Laukavičius (Boolit) +* Daniel Campos Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. 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. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/product_brand/__init__.py b/product_brand/__init__.py index 016a48c41..bcaf18844 100644 --- a/product_brand/__init__.py +++ b/product_brand/__init__.py @@ -2,8 +2,8 @@ # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible -# © 2016-Today Serpent Consulting Services Pvt. Ltd. -# () +# © 2016 Serpent Consulting Services Pvt. Ltd. +# © 2018 Daniel Campos # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import models diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 44f1e14fa..b05701a55 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -2,13 +2,13 @@ # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible -# © 2016-Today Serpent Consulting Services Pvt. Ltd. -# () +# © 2016 Serpent Consulting Services Pvt. Ltd. +# © 2018 Daniel Campos # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) { 'name': 'Product Brand Manager', - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index 98330ff10..1b0b7e228 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-05 02:43+0000\n" -"PO-Revision-Date: 2017-05-05 02:43+0000\n" +"POT-Creation-Date: 2017-07-29 02:55+0000\n" +"PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" @@ -98,7 +98,6 @@ msgstr "Empresa" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "Marca de producto" diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 49fbd0d70..dee316504 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2016 +# guillaume bauer , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-23 02:40+0000\n" -"PO-Revision-Date: 2017-05-23 02:40+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-07-29 02:55+0000\n" +"PO-Revision-Date: 2017-07-29 02:55+0000\n" +"Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -93,12 +94,11 @@ msgstr "" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id msgid "Partner" -msgstr "" +msgstr "Partenaire" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "Marque d'article" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po index 74cf99da0..34dc7f872 100644 --- a/product_brand/i18n/hr.po +++ b/product_brand/i18n/hr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-05 02:43+0000\n" -"PO-Revision-Date: 2017-05-05 02:43+0000\n" +"POT-Creation-Date: 2017-07-29 02:55+0000\n" +"PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" @@ -99,7 +99,6 @@ msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "Brand proizvoda" diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po index 2ac66df6a..c390c8fb3 100644 --- a/product_brand/i18n/it.po +++ b/product_brand/i18n/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-05 02:43+0000\n" -"PO-Revision-Date: 2017-05-05 02:43+0000\n" +"POT-Creation-Date: 2017-07-29 02:55+0000\n" +"PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" "MIME-Version: 1.0\n" @@ -98,7 +98,6 @@ msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "Marca del prodotto" diff --git a/product_brand/i18n/sl.po b/product_brand/i18n/sl.po new file mode 100644 index 000000000..3159daad2 --- /dev/null +++ b/product_brand/i18n/sl.po @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +# Translators: +# OCA Transbot , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-27 03:49+0000\n" +"PO-Revision-Date: 2018-01-27 03:49+0000\n" +"Last-Translator: OCA Transbot , 2018\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" +msgstr "Ustvaril" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "Ustvarjeno" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" +msgstr "Prikazni naziv" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" +msgstr "ID" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "Zadnja sprememba" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "Zadnji posodobil" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "Zadnja posodobitev" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "Predloga proizvoda" + +#. module: product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "" diff --git a/product_brand/models/__init__.py b/product_brand/models/__init__.py index 31bb5f0dd..6d309e42a 100644 --- a/product_brand/models/__init__.py +++ b/product_brand/models/__init__.py @@ -2,8 +2,8 @@ # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible -# © 2016-Today Serpent Consulting Services Pvt. Ltd. -# () +# © 2016 Serpent Consulting Services Pvt. Ltd. +# © 2018 Daniel Campos # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import product_brand diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py index 5463e1be5..d97af1cbe 100644 --- a/product_brand/models/product_brand.py +++ b/product_brand/models/product_brand.py @@ -2,8 +2,8 @@ # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible -# © 2016-Today Serpent Consulting Services Pvt. Ltd. -# () +# © 2016 Serpent Consulting Services Pvt. Ltd. +# © 2018 Daniel Campos # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from odoo import api, fields, models @@ -31,10 +31,11 @@ class ProductBrand(models.Model): compute='_get_products_count', ) - @api.one + @api.multi @api.depends('product_ids') def _get_products_count(self): - self.products_count = len(self.product_ids) + for brand in self: + brand.products_count = len(brand.product_ids) class ProductTemplate(models.Model): diff --git a/product_brand/tests/__init__.py b/product_brand/tests/__init__.py new file mode 100644 index 000000000..7b93d7a9a --- /dev/null +++ b/product_brand/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright (c) 2018 Daniel Campos - Avanzosc S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_product_brand diff --git a/product_brand/tests/test_product_brand.py b/product_brand/tests/test_product_brand.py new file mode 100644 index 000000000..136b1de90 --- /dev/null +++ b/product_brand/tests/test_product_brand.py @@ -0,0 +1,24 @@ +# Copyright (c) 2018 Daniel Campos - Avanzosc S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo.tests import common + + +class TestProductBrand(common.TransactionCase): + + def setUp(self): + super(TestProductBrand, self).setUp() + self.product = self.env.ref('product.product_product_4') + self.supplier = self.ref('base.res_partner_2') + self.product_brand_obj = self.env['product.brand'] + self.product_brand = self.product_brand_obj.create( + {'name': 'Test Brand', + 'description': 'Test brand description', + 'partner_id': self.supplier + }) + + def test_products_count(self): + self.assertEqual(self.product_brand.products_count, 0, + 'Error product count does not match') + self.product.product_brand_id = self.product_brand.id + self.assertEqual(self.product_brand.products_count, 1, + 'Error product count does not match') diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index 50f6955a3..38bcdd869 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -77,6 +77,7 @@ product.brand + @@ -84,7 +85,7 @@
-
@@ -143,7 +144,7 @@ product.template - +
@@ -159,7 +160,7 @@ product.product - +
From 192129120ffbcb6d61a555773dad41770c6b6a7a Mon Sep 17 00:00:00 2001 From: Wesley Hansen Date: Wed, 30 May 2018 14:59:16 -0400 Subject: [PATCH 12/74] [FIX] product_brand: Don't format the ID (#355) Lookup fails when the ID is formatted. The unformatted version of the data is located under `raw_value`. --- product_brand/__manifest__.py | 2 +- product_brand/views/product_brand_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index b05701a55..42ee0758a 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Product Brand Manager', - 'version': '11.0.1.0.0', + 'version': '11.0.1.0.1', 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index 38bcdd869..d1bfae05b 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -85,7 +85,7 @@
-
From 0bccd60b132d533facba4632bfb2e3b2bfe0ed91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Fri, 15 Jun 2018 23:34:42 +0200 Subject: [PATCH 13/74] remove obsolete .pot files [ci skip] --- product_brand/i18n/de.po | 7 +- product_brand/i18n/es.po | 4 +- product_brand/i18n/fr.po | 4 +- product_brand/i18n/fr_FR.po | 8 +- product_brand/i18n/hr.po | 7 +- product_brand/i18n/it.po | 4 +- product_brand/i18n/nl_NL.po | 8 +- product_brand/i18n/product_brand.pot | 111 +++++++++++++++++++-------- product_brand/i18n/sl.po | 7 +- 9 files changed, 106 insertions(+), 54 deletions(-) diff --git a/product_brand/i18n/de.po b/product_brand/i18n/de.po index 18ba7e7ff..a96336867 100644 --- a/product_brand/i18n/de.po +++ b/product_brand/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # Niki Waibel , 2016 msgid "" @@ -12,14 +12,15 @@ msgstr "" "PO-Revision-Date: 2016-12-29 03:36+0000\n" "Last-Translator: Niki Waibel , 2016\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand @@ -97,7 +98,6 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "" @@ -118,6 +118,7 @@ msgid "Products" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" msgstr "" diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index 1b0b7e228..b56bf7890 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: product_brand diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index dee316504..716e60bea 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2016 # guillaume bauer , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: guillaume bauer , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: product_brand diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po index d930b9115..78ddab9e3 100644 --- a/product_brand/i18n/fr_FR.po +++ b/product_brand/i18n/fr_FR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-05-05 02:43+0000\n" "PO-Revision-Date: 2017-05-05 02:43+0000\n" "Last-Translator: OCA Transbot , 2016\n" -"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/fr_FR/)\n" +"Language-Team: French (France) (https://www.transifex.com/oca/teams/23907/" +"fr_FR/)\n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: product_brand @@ -98,7 +99,6 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po index 34dc7f872..4905a915a 100644 --- a/product_brand/i18n/hr.po +++ b/product_brand/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2016 # Bole , 2017 @@ -13,11 +13,12 @@ msgstr "" "PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po index c390c8fb3..2134e970f 100644 --- a/product_brand/i18n/it.po +++ b/product_brand/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-29 02:55+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: product_brand diff --git a/product_brand/i18n/nl_NL.po b/product_brand/i18n/nl_NL.po index 606aa87b2..f3d6a0bb8 100644 --- a/product_brand/i18n/nl_NL.po +++ b/product_brand/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-05-27 04:44+0000\n" "PO-Revision-Date: 2017-05-27 04:44+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: product_brand @@ -98,7 +99,6 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Product Brand" msgstr "" diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot index 9dddf3599..c8638f0f7 100644 --- a/product_brand/i18n/product_brand.pot +++ b/product_brand/i18n/product_brand.pot @@ -1,13 +1,11 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 12:55+0000\n" -"PO-Revision-Date: 2014-03-14 12:55+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,67 +14,118 @@ msgstr "" "Plural-Forms: \n" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: view:product.brand:0 -msgid "product.brand" +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_template -msgid "Product Template" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_name +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" msgstr "" #. module: product_brand -#: model:ir.ui.menu,name:product_brand.menu_product_brand -msgid "Brand management" +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +msgid "Brand Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +msgid "Created by" msgstr "" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,description:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +msgid "Created on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_description +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "" #. module: product_brand -#: view:product.brand:0 -#: field:product.brand,name:0 -msgid "Brand Name" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +msgid "Display Name" msgstr "" #. module: product_brand -#: view:product.brand:0 -msgid "Product Brand" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +msgid "ID" msgstr "" #. module: product_brand -#: field:product.brand,logo:0 +#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.actions.act_window,name:product_brand.action_product_brand -#: view:product.product:0 -#: field:product.template,product_brand_id:0 -msgid "Brand" +#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +msgid "Number of products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +msgid "Product Brand" msgstr "" #. module: product_brand -#: help:product.brand,partner_id:0 -msgid "Select a partner for this brand if it exists." +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" msgstr "" #. module: product_brand -#: view:product.product:0 -msgid "Group by..." +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" msgstr "" #. module: product_brand -#: field:product.brand,partner_id:0 -msgid "partner" +#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +msgid "Select a brand for this product" msgstr "" #. module: product_brand -#: help:product.template,product_brand_id:0 -msgid "Select a brand for this product." +#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" msgstr "" diff --git a/product_brand/i18n/sl.po b/product_brand/i18n/sl.po index 3159daad2..37b22ab82 100644 --- a/product_brand/i18n/sl.po +++ b/product_brand/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * product_brand -# +# # Translators: # OCA Transbot , 2018 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2018-01-27 03:49+0000\n" "Last-Translator: OCA Transbot , 2018\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand From de4229ca864d085ae2f3dd4168269037ff73ca85 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 3 Jul 2018 01:04:44 +0200 Subject: [PATCH 14/74] [IMP] product_branch: Order brands by name --- product_brand/__manifest__.py | 2 +- product_brand/models/product_brand.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 42ee0758a..75418335d 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Product Brand Manager', - 'version': '11.0.1.0.1', + 'version': '11.0.1.0.2', 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py index d97af1cbe..6fddc9870 100644 --- a/product_brand/models/product_brand.py +++ b/product_brand/models/product_brand.py @@ -11,6 +11,7 @@ class ProductBrand(models.Model): _name = 'product.brand' + _order = 'name' name = fields.Char('Brand Name', required=True) description = fields.Text('Description', translate=True) From b1dd2828701293ba1b1977a60300222d01ebcb0e Mon Sep 17 00:00:00 2001 From: Jordi Riera Date: Fri, 6 Jul 2018 10:18:23 -0400 Subject: [PATCH 15/74] product_brand: complete fr translation --- product_brand/i18n/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 716e60bea..3751cd759 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -38,7 +38,7 @@ msgstr "Marque" #: model:ir.actions.act_window,name:product_brand.action_open_brand_products #: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids msgid "Brand Products" -msgstr "" +msgstr "Produits de marque" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid @@ -89,7 +89,7 @@ msgstr "Logo" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count msgid "Number of products" -msgstr "" +msgstr "Nombre de produits" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id @@ -105,7 +105,7 @@ msgstr "Marque d'article" #. module: product_brand #: model:ir.ui.menu,name:product_brand.menu_product_brand msgid "Product Brands" -msgstr "" +msgstr "Marques de Produits" #. module: product_brand #: model:ir.model,name:product_brand.model_product_template @@ -116,18 +116,18 @@ msgstr "Modèle de produit" #: model:ir.ui.view,arch_db:product_brand.view_product_brand_form #: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" -msgstr "" +msgstr "Produits" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" -msgstr "" +msgstr "Selectionnez une marque pour ce produit" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_brand_partner_id msgid "Select a partner for this brand if any." -msgstr "" +msgstr "Selectionnez un partenaire pour cette marque si besoin." #. module: product_brand #: model:ir.model,name:product_brand.model_product_brand From 3fedeceba4b1a03144b9cc992be66951e987fac9 Mon Sep 17 00:00:00 2001 From: Axel-G Date: Sun, 26 Aug 2018 18:18:20 +0000 Subject: [PATCH 16/74] Translated using Weblate (German) Currently translated at 100,0% (21 of 21 strings) Translation: product-attribute-11.0/product-attribute-11.0-product_brand Translate-URL: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_brand/de/ --- product_brand/i18n/de.po | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/product_brand/i18n/de.po b/product_brand/i18n/de.po index a96336867..9b4fae1bf 100644 --- a/product_brand/i18n/de.po +++ b/product_brand/i18n/de.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-29 03:36+0000\n" -"PO-Revision-Date: 2016-12-29 03:36+0000\n" -"Last-Translator: Niki Waibel , 2016\n" +"PO-Revision-Date: 2018-08-26 18:25+0000\n" +"Last-Translator: Axel-G \n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "Language: de\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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.1.1\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand @@ -25,86 +26,86 @@ msgstr "" #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" -msgstr "" +msgstr "Marke" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_name #: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" -msgstr "" +msgstr "Markenname" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products #: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids msgid "Brand Products" -msgstr "" +msgstr "Markenprodukt" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid msgid "Created by" -msgstr "" +msgstr "Erstellt von" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date msgid "Created on" -msgstr "" +msgstr "Erstellt am" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_description #: model:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" -msgstr "" +msgstr "Beschreibung" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name msgid "Display Name" -msgstr "" +msgstr "Anzeigename" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_id msgid "ID" -msgstr "" +msgstr "ID" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update msgid "Last Modified on" -msgstr "" +msgstr "Zuletzt bearbeitet am" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid msgid "Last Updated by" -msgstr "" +msgstr "Letzte Aktualisierung von" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date msgid "Last Updated on" -msgstr "" +msgstr "Letzte Aktualisierung am" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_logo msgid "Logo File" -msgstr "" +msgstr "Logo-Datei" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count msgid "Number of products" -msgstr "" +msgstr "Anzahl Produkte" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id msgid "Partner" -msgstr "" +msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" -msgstr "" +msgstr "Produktmarke" #. module: product_brand #: model:ir.ui.menu,name:product_brand.menu_product_brand msgid "Product Brands" -msgstr "" +msgstr "Produktmarken" #. module: product_brand #: model:ir.model,name:product_brand.model_product_template @@ -115,21 +116,21 @@ msgstr "Produktvorlage" #: model:ir.ui.view,arch_db:product_brand.view_product_brand_form #: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" -msgstr "" +msgstr "Produkte" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id msgid "Select a brand for this product" -msgstr "" +msgstr "Wähle eine Marke für dieses Produkt" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_brand_partner_id msgid "Select a partner for this brand if any." -msgstr "" +msgstr "Falls vorhanden wähle einen Partner für diese Marke." #. module: product_brand #: model:ir.model,name:product_brand.model_product_brand #: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" -msgstr "" +msgstr "product.brand" From 5227fb1c468d1763453af2c6afbe088c17897260 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 12 Jul 2018 12:28:24 +0200 Subject: [PATCH 17/74] [MIG] Merge product_brand_sale_report into product_brand --- product_brand/README.rst | 96 ++++++++++++++-------- product_brand/__init__.py | 2 +- product_brand/__manifest__.py | 12 +-- product_brand/readme/CONTRIBUTORS.rst | 12 +++ product_brand/readme/DESCRIPTION.rst | 1 + product_brand/readme/ROADMAP.rst | 3 + product_brand/readme/USAGE.rst | 15 ++++ product_brand/reports/__init__.py | 1 + product_brand/reports/sale_report.py | 25 ++++++ product_brand/reports/sale_report_view.xml | 14 ++++ 10 files changed, 142 insertions(+), 39 deletions(-) create mode 100644 product_brand/readme/CONTRIBUTORS.rst create mode 100644 product_brand/readme/DESCRIPTION.rst create mode 100644 product_brand/readme/ROADMAP.rst create mode 100644 product_brand/readme/USAGE.rst create mode 100644 product_brand/reports/__init__.py create mode 100644 product_brand/reports/sale_report.py create mode 100644 product_brand/reports/sale_report_view.xml diff --git a/product_brand/README.rst b/product_brand/README.rst index 89581e55a..5859e5d47 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -1,36 +1,55 @@ -.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg - :target: https://www.gnu.org/licenses/agpl.html - :alt: License: AGPL-3 - ===================== Product Brand Manager ===================== -This module introduce the following features: - -* This module allows odoo users to easily manage product brands. - -* You can define brands, attach a logo and a description to them. +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -* It also allows to attach a partner to a brand. +.. |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%2Fproduct--attribute-lightgray.png?logo=github + :target: https://github.com/OCA/product-attribute/tree/11.0/product_brand + :alt: OCA/product-attribute +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_brand + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/135/11.0 + :alt: Try me on Runbot -Installation -============= +|badge1| |badge2| |badge3| |badge4| |badge5| - No external library is used. +This module allows odoo users to easily manage product brands. -Configuration -============= +**Table of contents** - No configuration is required. +.. contents:: + :local: Usage ===== +To create a new brand: + +#. Go to *Sales > Configuration > Products > Product Brands*. +#. You can set its logo, associate a partner and add a description. + +To add a product to a brand: + +#. Go to the product itself and edit. +#. Below the product's name there is a Brand field where you can pick the one + the product belongs to. -For further information, please visit: +To see the sales report based on brand dimension: - * https://www.odoo.com/forum/help-1 +#. Go to *Sales > Reporting > Sales*. +#. There you can *Group by* brand or add it as a dimension in the pivot view. Known issues / Roadmap ====================== @@ -39,27 +58,31 @@ Known issues / Roadmap the Customers/Suppliers Form View. * Fix smart button alignment in brand form view - 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 -`here `_. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* NetAndCo +* Akretion +* Prisnet Telecommunications SA +* MONK Software +* SerpentCS Pvt. Ltd. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ * Mathieu Lemercier * Franck Bret @@ -70,16 +93,23 @@ Contributors * Marcelo Pickler * Andrius Laukavičius (Boolit) * Daniel Campos +* `Tecnativa `_ + + * David Vidal -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. +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. -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/product-attribute `_ project on GitHub. -To contribute to this module, please visit https://odoo-community.org. +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_brand/__init__.py b/product_brand/__init__.py index bcaf18844..cf1ef7239 100644 --- a/product_brand/__init__.py +++ b/product_brand/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible @@ -7,3 +6,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from . import models +from . import reports diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 75418335d..650d74684 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -1,25 +1,27 @@ -# -*- coding: utf-8 -*- # © 2009 NetAndCo (). # © 2011 Akretion Benoît Guillot # © 2014 prisnet.ch Seraphine Lantible # © 2016 Serpent Consulting Services Pvt. Ltd. # © 2018 Daniel Campos +# Copyright 2018 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) { 'name': 'Product Brand Manager', - 'version': '11.0.1.0.2', + 'version': '11.0.1.1.0', 'category': 'Product', 'summary': "Product Brand Manager", - 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA' - ', MONK Software, Odoo Community Association (OCA)' - ', SerpentCS Pvt. Ltd.', + 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA, ' + 'MONK Software, SerpentCS Pvt. Ltd., Tecnativa, ' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/product-attribute', 'license': 'AGPL-3', 'depends': [ 'sale', ], 'data': [ 'views/product_brand_view.xml', + 'reports/sale_report_view.xml', 'security/ir.model.access.csv' ], 'installable': True, diff --git a/product_brand/readme/CONTRIBUTORS.rst b/product_brand/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..849082647 --- /dev/null +++ b/product_brand/readme/CONTRIBUTORS.rst @@ -0,0 +1,12 @@ +* Mathieu Lemercier +* Franck Bret +* Seraphine Lantible +* Gunnar Wagner +* Leonardo Donelli +* Serpent Consulting Services Pvt. Ltd. +* Marcelo Pickler +* Andrius Laukavičius (Boolit) +* Daniel Campos +* `Tecnativa `_ + + * David Vidal diff --git a/product_brand/readme/DESCRIPTION.rst b/product_brand/readme/DESCRIPTION.rst new file mode 100644 index 000000000..2c3805e6d --- /dev/null +++ b/product_brand/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows odoo users to easily manage product brands. diff --git a/product_brand/readme/ROADMAP.rst b/product_brand/readme/ROADMAP.rst new file mode 100644 index 000000000..4b1468108 --- /dev/null +++ b/product_brand/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +* Add a field with brands associated to a Customer or Supplier on + the Customers/Suppliers Form View. +* Fix smart button alignment in brand form view diff --git a/product_brand/readme/USAGE.rst b/product_brand/readme/USAGE.rst new file mode 100644 index 000000000..228228821 --- /dev/null +++ b/product_brand/readme/USAGE.rst @@ -0,0 +1,15 @@ +To create a new brand: + +#. Go to *Sales > Configuration > Products > Product Brands*. +#. You can set its logo, associate a partner and add a description. + +To add a product to a brand: + +#. Go to the product itself and edit. +#. Below the product's name there is a Brand field where you can pick the one + the product belongs to. + +To see the sales report based on brand dimension: + +#. Go to *Sales > Reporting > Sales*. +#. There you can *Group by* brand or add it as a dimension in the pivot view. diff --git a/product_brand/reports/__init__.py b/product_brand/reports/__init__.py new file mode 100644 index 000000000..cd23411b8 --- /dev/null +++ b/product_brand/reports/__init__.py @@ -0,0 +1 @@ +from . import sale_report diff --git a/product_brand/reports/sale_report.py b/product_brand/reports/sale_report.py new file mode 100644 index 000000000..d9daeb164 --- /dev/null +++ b/product_brand/reports/sale_report.py @@ -0,0 +1,25 @@ +# Copyright 2018 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from odoo import fields, models + + +class SaleReport(models.Model): + _inherit = "sale.report" + + product_brand_id = fields.Many2one( + 'product.brand', + string='Brand', + ) + + def _select(self): + select_str = super(SaleReport, self)._select() + select_str += """ + , t.product_brand_id + """ + return select_str + + def _group_by(self): + group_by_str = super(SaleReport, self)._group_by() + group_by_str += ", t.product_brand_id" + return group_by_str diff --git a/product_brand/reports/sale_report_view.xml b/product_brand/reports/sale_report_view.xml new file mode 100644 index 000000000..d7b35eb36 --- /dev/null +++ b/product_brand/reports/sale_report_view.xml @@ -0,0 +1,14 @@ + + + + + + sale.report + + + + + + + + From ae95556a03ca900da46535a10728b38f005fb11b Mon Sep 17 00:00:00 2001 From: David Date: Wed, 26 Sep 2018 13:56:45 +0200 Subject: [PATCH 18/74] [MIG] Merge product_brand_invoice_report into product_brand --- product_brand/README.rst | 5 + product_brand/__manifest__.py | 1 + product_brand/i18n/product_brand.pot | 14 + product_brand/readme/USAGE.rst | 5 + product_brand/reports/__init__.py | 1 + .../reports/account_invoice_report.py | 33 ++ .../reports/account_invoice_report_view.xml | 14 + product_brand/static/description/index.html | 470 ++++++++++++++++++ 8 files changed, 543 insertions(+) create mode 100644 product_brand/reports/account_invoice_report.py create mode 100644 product_brand/reports/account_invoice_report_view.xml create mode 100644 product_brand/static/description/index.html diff --git a/product_brand/README.rst b/product_brand/README.rst index 5859e5d47..9b163f192 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -51,6 +51,11 @@ To see the sales report based on brand dimension: #. Go to *Sales > Reporting > Sales*. #. There you can *Group by* brand or add it as a dimension in the pivot view. +To see the invoice report based on brand dimension: + +#. Go to *Invoicing > Reporting > Management > Invoices*. +#. There you can *Group by* brand or add it as a dimension in the pivot view. + Known issues / Roadmap ====================== diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 650d74684..57e28f79a 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -22,6 +22,7 @@ 'data': [ 'views/product_brand_view.xml', 'reports/sale_report_view.xml', + 'reports/account_invoice_report_view.xml', 'security/ir.model.access.csv' ], 'installable': True, diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot index c8638f0f7..593929af1 100644 --- a/product_brand/i18n/product_brand.pot +++ b/product_brand/i18n/product_brand.pot @@ -15,9 +15,13 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report_product_brand_id #: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model:ir.ui.view,arch_db:product_brand.view_order_product_search #: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "" @@ -60,6 +64,11 @@ msgstr "" msgid "ID" msgstr "" +#. module: product_brand +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update msgid "Last Modified on" @@ -112,6 +121,11 @@ msgstr "" msgid "Products" msgstr "" +#. module: product_brand +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Orders Statistics" +msgstr "" + #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id diff --git a/product_brand/readme/USAGE.rst b/product_brand/readme/USAGE.rst index 228228821..375ee4b20 100644 --- a/product_brand/readme/USAGE.rst +++ b/product_brand/readme/USAGE.rst @@ -13,3 +13,8 @@ To see the sales report based on brand dimension: #. Go to *Sales > Reporting > Sales*. #. There you can *Group by* brand or add it as a dimension in the pivot view. + +To see the invoice report based on brand dimension: + +#. Go to *Invoicing > Reporting > Management > Invoices*. +#. There you can *Group by* brand or add it as a dimension in the pivot view. diff --git a/product_brand/reports/__init__.py b/product_brand/reports/__init__.py index cd23411b8..fbeedbce1 100644 --- a/product_brand/reports/__init__.py +++ b/product_brand/reports/__init__.py @@ -1 +1,2 @@ +from . import account_invoice_report from . import sale_report diff --git a/product_brand/reports/account_invoice_report.py b/product_brand/reports/account_invoice_report.py new file mode 100644 index 000000000..01e5c4101 --- /dev/null +++ b/product_brand/reports/account_invoice_report.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +from openerp import fields, models + + +class AccountInvoiceReport(models.Model): + _inherit = "account.invoice.report" + + product_brand_id = fields.Many2one( + 'product.brand', + string='Brand', + ) + + def _select(self): + select_str = super(AccountInvoiceReport, self)._select() + select_str += """ + , sub.product_brand_id as product_brand_id + """ + return select_str + + def _sub_select(self): + select_str = super(AccountInvoiceReport, self)._sub_select() + select_str += """ + , pt.product_brand_id + """ + return select_str + + def _group_by(self): + group_by_str = super(AccountInvoiceReport, self)._group_by() + group_by_str += ", pt.product_brand_id" + return group_by_str diff --git a/product_brand/reports/account_invoice_report_view.xml b/product_brand/reports/account_invoice_report_view.xml new file mode 100644 index 000000000..8d4fa8663 --- /dev/null +++ b/product_brand/reports/account_invoice_report_view.xml @@ -0,0 +1,14 @@ + + + + + + account.invoice.report + + + + + + + + diff --git a/product_brand/static/description/index.html b/product_brand/static/description/index.html new file mode 100644 index 000000000..58d2000c5 --- /dev/null +++ b/product_brand/static/description/index.html @@ -0,0 +1,470 @@ + + + + + + +Product Brand Manager + + + +
+

Product Brand Manager

+ + +

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

+

This module allows odoo users to easily manage product brands.

+

Table of contents

+ +
+

Usage

+

To create a new brand:

+
    +
  1. Go to Sales > Configuration > Products > Product Brands.
    2. +
  2. You can set its logo, associate a partner and add a description.
    3. +
+

To add a product to a brand:

+
    +
  1. Go to the product itself and edit.
    2. +
  2. Below the product’s name there is a Brand field where you can pick the one +the product belongs to.
    3. +
+

To see the sales report based on brand dimension:

+
    +
  1. Go to Sales > Reporting > Sales.
    2. +
  2. There you can Group by brand or add it as a dimension in the pivot view.
    3. +
+

To see the invoice report based on brand dimension:

+
    +
  1. Go to Invoicing > Reporting > Management > Invoices.
    2. +
  2. There you can Group by brand or add it as a dimension in the pivot view.
    3. +
+
+
+

Known issues / Roadmap

+
    +
  • Add a field with brands associated to a Customer or Supplier on +the Customers/Suppliers Form View.
    • +
  • Fix smart button alignment in brand form view
    • +
+
+
+

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

+
    +
  • NetAndCo
    • +
  • Akretion
    • +
  • Prisnet Telecommunications SA
    • +
  • MONK Software
    • +
  • SerpentCS Pvt. Ltd.
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

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/product-attribute project on GitHub.

+

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

+
+
+
+ + From 5739b180ac0ac261eabeb9791c6fdfa1aaebc66f Mon Sep 17 00:00:00 2001 From: David Dufresne <27902736+ddufresne@users.noreply.github.com> Date: Fri, 12 Oct 2018 08:04:07 -0400 Subject: [PATCH 19/74] [IMP] product_brand: Make the kanban card of product.brand consistent with other odoo apps. (#364) * Make the logo always the same width (64px). * Remove the description (200 first caracters). Not relevant for a configuration model. * Move the brand name and product count beside the image. This is the way it is displayed in partners and products kanban views. --- product_brand/__manifest__.py | 2 +- product_brand/views/product_brand_view.xml | 22 ++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 57e28f79a..9c58da5dc 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -8,7 +8,7 @@ { 'name': 'Product Brand Manager', - 'version': '11.0.1.1.0', + 'version': '11.0.1.2.0', 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA, ' diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index d1bfae05b..f85792191 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -83,29 +83,19 @@ -
- - - +
+
+ +

- - - +

- - - - ... - -
From 5447a203c807c5f2725fe63d19867489167b2972 Mon Sep 17 00:00:00 2001 From: Thomas Binsfeld Date: Tue, 2 Oct 2018 13:51:38 +0200 Subject: [PATCH 20/74] [MIG] product_brand to 12.0 --- product_brand/README.rst | 14 ++-- product_brand/__init__.py | 7 -- product_brand/__manifest__.py | 17 ++--- product_brand/i18n/de.po | 72 ++++++++++++------- product_brand/i18n/es.po | 72 ++++++++++++------- product_brand/i18n/fr.po | 72 ++++++++++++------- product_brand/i18n/fr_FR.po | 71 +++++++++++------- product_brand/i18n/hr.po | 72 ++++++++++++------- product_brand/i18n/it.po | 72 ++++++++++++------- product_brand/i18n/nl_NL.po | 72 ++++++++++++------- product_brand/i18n/product_brand.pot | 71 +++++++++--------- product_brand/i18n/sl.po | 71 +++++++++++------- product_brand/models/__init__.py | 8 --- product_brand/models/product_brand.py | 18 ++--- .../reports/account_invoice_report.py | 11 ++- .../reports/account_invoice_report_view.xml | 19 ++--- product_brand/reports/sale_report.py | 33 +++++---- product_brand/reports/sale_report_view.xml | 19 ++--- product_brand/static/description/index.html | 6 +- product_brand/tests/__init__.py | 3 - product_brand/tests/test_product_brand.py | 3 +- product_brand/views/product_brand_view.xml | 2 +- 22 files changed, 473 insertions(+), 332 deletions(-) diff --git a/product_brand/README.rst b/product_brand/README.rst index 9b163f192..c35b9c073 100644 --- a/product_brand/README.rst +++ b/product_brand/README.rst @@ -7,20 +7,20 @@ Product Brand Manager !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png +.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png :target: https://odoo-community.org/page/development-status - :alt: Beta + :alt: Mature .. |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%2Fproduct--attribute-lightgray.png?logo=github - :target: https://github.com/OCA/product-attribute/tree/11.0/product_brand + :target: https://github.com/OCA/product-attribute/tree/12.0/product_brand :alt: OCA/product-attribute .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/product-attribute-11-0/product-attribute-11-0-product_brand + :target: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_brand :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/135/11.0 + :target: https://runbot.odoo-community.org/runbot/135/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -69,7 +69,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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -115,6 +115,6 @@ 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/product-attribute `_ project on GitHub. +This module is part of the `OCA/product-attribute `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/product_brand/__init__.py b/product_brand/__init__.py index cf1ef7239..55ec7fc9a 100644 --- a/product_brand/__init__.py +++ b/product_brand/__init__.py @@ -1,9 +1,2 @@ -# © 2009 NetAndCo (). -# © 2011 Akretion Benoît Guillot -# © 2014 prisnet.ch Seraphine Lantible -# © 2016 Serpent Consulting Services Pvt. Ltd. -# © 2018 Daniel Campos -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) - from . import models from . import reports diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 9c58da5dc..614afb8ec 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -1,14 +1,15 @@ -# © 2009 NetAndCo (). -# © 2011 Akretion Benoît Guillot -# © 2014 prisnet.ch Seraphine Lantible -# © 2016 Serpent Consulting Services Pvt. Ltd. -# © 2018 Daniel Campos +# Copyright 2009 NetAndCo (). +# Copyright 2011 Akretion Benoît Guillot +# Copyright 2014 prisnet.ch Seraphine Lantible +# Copyright 2016 Serpent Consulting Services Pvt. Ltd. +# Copyright 2018 Daniel Campos # Copyright 2018 Tecnativa - David Vidal -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { 'name': 'Product Brand Manager', - 'version': '11.0.1.2.0', + 'version': '12.0.1.0.0', + 'development_status': "Mature", 'category': 'Product', 'summary': "Product Brand Manager", 'author': 'NetAndCo, Akretion, Prisnet Telecommunications SA, ' @@ -20,10 +21,10 @@ 'sale', ], 'data': [ + 'security/ir.model.access.csv', 'views/product_brand_view.xml', 'reports/sale_report_view.xml', 'reports/account_invoice_report_view.xml', - 'security/ir.model.access.csv' ], 'installable': True, 'auto_install': False diff --git a/product_brand/i18n/de.po b/product_brand/i18n/de.po index 9b4fae1bf..102e9edd8 100644 --- a/product_brand/i18n/de.po +++ b/product_brand/i18n/de.po @@ -21,84 +21,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Marke" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Markenname" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Markenprodukt" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Erstellt von" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Erstellt am" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Beschreibung" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Anzeigename" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Zuletzt bearbeitet am" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Letzte Aktualisierung von" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Letzte Aktualisierung am" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "Logo-Datei" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "Logo-Datei" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Anzahl Produkte" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "Produktmarke" @@ -113,24 +128,27 @@ msgid "Product Template" msgstr "Produktvorlage" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Produkte" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Wähle eine Marke für dieses Produkt" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "Falls vorhanden wähle einen Partner für diese Marke." #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "product.brand" diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index b56bf7890..8776d4e1d 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -20,84 +20,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Marca" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Nombre de la marca" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Productos de la marca" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Creado por" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Creado el" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Descripción" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Nombre mostrado" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Última modificación el" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Última actualización por" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Última modificación el" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "Logotipo" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "Logotipo" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Número de productos" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "Empresa" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "Marca de producto" @@ -112,24 +127,27 @@ msgid "Product Template" msgstr "Plantilla de producto" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Productos" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Seleccione una marca para este producto" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "Seleccione una empresa para este marca si la hay." #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "product.brand" diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 3751cd759..181934c92 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -21,84 +21,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Marque" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Marque" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Produits de marque" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Créé par" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Créé le" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Description" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Nom affiché" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Dernière Modification le" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Dernière mise à jour par" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Dernière mise à jour le" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "Logo" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "Logo" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Nombre de produits" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "Partenaire" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "Marque d'article" @@ -113,24 +128,27 @@ msgid "Product Template" msgstr "Modèle de produit" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Produits" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Selectionnez une marque pour ce produit" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "Selectionnez un partenaire pour cette marque si besoin." #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "product.brand" diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po index 78ddab9e3..70b8e5df9 100644 --- a/product_brand/i18n/fr_FR.po +++ b/product_brand/i18n/fr_FR.po @@ -21,84 +21,98 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Marque" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Marque" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Description" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Logo" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "" @@ -113,24 +127,27 @@ msgid "Product Template" msgstr "" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po index 4905a915a..2cc07135b 100644 --- a/product_brand/i18n/hr.po +++ b/product_brand/i18n/hr.po @@ -22,84 +22,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Brand" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Naziv branda" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Proizvodi branda" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Kreirao" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Kreirano" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Opis" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Naziv" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Zadnje ažurirano" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Zadnji ažurirao" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Zadnje ažurirano" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "Logo sličica" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "Logo sličica" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Broj proizvoda" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "Brand proizvoda" @@ -114,24 +129,27 @@ msgid "Product Template" msgstr "Predložak proizvoda" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Proizvodi" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Odaberite brand za ovaj proizvod" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "Odaberite partnera za ovaj brand ako ga ima." #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "product.brand" diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po index 2134e970f..0ccf381e1 100644 --- a/product_brand/i18n/it.po +++ b/product_brand/i18n/it.po @@ -20,84 +20,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Marca" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Marchio" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Prodotti della Marca" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Creato da" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Creato il" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Descrizione" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Nome visualizzato" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Ultima Modifica il" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Ultimo Aggiornamento di" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Ultimo Aggiornamento il" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "File del Logo" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "File del Logo" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Numero di prodotti" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "Marca del prodotto" @@ -112,24 +127,27 @@ msgid "Product Template" msgstr "" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Prodotti" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Scegliere una marca per questo prodotto" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "Scegliere un partner per questa marca ove presente." #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "" diff --git a/product_brand/i18n/nl_NL.po b/product_brand/i18n/nl_NL.po index f3d6a0bb8..95221a3e7 100644 --- a/product_brand/i18n/nl_NL.po +++ b/product_brand/i18n/nl_NL.po @@ -21,84 +21,99 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "Merk" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "Merknaam" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "Merkproducten" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Aangemaakt door" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Aangemaakt op" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "Omschrijving" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Weergavenaam" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Laatst aangepast door" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Laatst aangepast op" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#, fuzzy +msgid "Logo" +msgstr "Logo-bestand" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "Logo-bestand" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "Aantal producten" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "" @@ -113,24 +128,27 @@ msgid "Product Template" msgstr "Productsjabloon" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "Producten" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "product.brand" diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot index 593929af1..14b0313d9 100644 --- a/product_brand/i18n/product_brand.pot +++ b/product_brand/i18n/product_brand.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -15,52 +15,52 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_sale_report_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search -#: model:ir.ui.view,arch_db:product_brand.view_order_product_search -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "" @@ -70,38 +70,44 @@ msgid "Invoices Statistics" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Logo" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "" @@ -116,30 +122,29 @@ msgid "Product Template" msgstr "" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "" #. module: product_brand #: model:ir.model,name:product_brand.model_sale_report -msgid "Sales Orders Statistics" +msgid "Sales Analysis Report" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "" diff --git a/product_brand/i18n/sl.po b/product_brand/i18n/sl.po index 37b22ab82..cc0ac10f1 100644 --- a/product_brand/i18n/sl.po +++ b/product_brand/i18n/sl.po @@ -21,84 +21,98 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,field_description:product_brand.field_product_template_product_brand_id -#: model:ir.ui.view,arch_db:product_brand.product_template_form_brand_add -#: model:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_name -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products -#: model:ir.model.fields,field_description:product_brand.field_product_brand_product_ids +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" msgstr "Ustvaril" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_create_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" msgstr "Ustvarjeno" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_description -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_display_name +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" msgstr "Prikazni naziv" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" msgstr "ID" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand___last_update +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" msgstr "Zadnja sprememba" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_uid +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" msgstr "Zadnji posodobil" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_write_date +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" msgstr "Zadnja posodobitev" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_logo +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Logo" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_products_count +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" msgstr "" #. module: product_brand -#: model:ir.model.fields,field_description:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand -#: model:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" msgstr "" @@ -113,24 +127,27 @@ msgid "Product Template" msgstr "Predloga proizvoda" #. module: product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_form -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_product_product_brand_id -#: model:ir.model.fields,help:product_brand.field_product_template_product_brand_id +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" #. module: product_brand -#: model:ir.model.fields,help:product_brand.field_product_brand_partner_id +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." msgstr "" #. module: product_brand -#: model:ir.model,name:product_brand.model_product_brand -#: model:ir.ui.view,arch_db:product_brand.view_product_brand_tree +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" msgstr "" diff --git a/product_brand/models/__init__.py b/product_brand/models/__init__.py index 6d309e42a..6cb55ac7f 100644 --- a/product_brand/models/__init__.py +++ b/product_brand/models/__init__.py @@ -1,9 +1 @@ -# -*- coding: utf-8 -*- -# © 2009 NetAndCo (). -# © 2011 Akretion Benoît Guillot -# © 2014 prisnet.ch Seraphine Lantible -# © 2016 Serpent Consulting Services Pvt. Ltd. -# © 2018 Daniel Campos -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) - from . import product_brand diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py index 6fddc9870..2703ef0a4 100644 --- a/product_brand/models/product_brand.py +++ b/product_brand/models/product_brand.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- -# © 2009 NetAndCo (). -# © 2011 Akretion Benoît Guillot -# © 2014 prisnet.ch Seraphine Lantible -# © 2016 Serpent Consulting Services Pvt. Ltd. -# © 2018 Daniel Campos +# Copyright 2009 NetAndCo (). +# Copyright 2011 Akretion Benoît Guillot +# Copyright 2014 prisnet.ch Seraphine Lantible +# Copyright 2016 Serpent Consulting Services Pvt. Ltd. +# Copyright 2018 Daniel Campos # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from odoo import api, fields, models @@ -11,10 +10,11 @@ class ProductBrand(models.Model): _name = 'product.brand' + _description = "Product Brand" _order = 'name' name = fields.Char('Brand Name', required=True) - description = fields.Text('Description', translate=True) + description = fields.Text(translate=True) partner_id = fields.Many2one( 'res.partner', string='Partner', @@ -29,12 +29,12 @@ class ProductBrand(models.Model): ) products_count = fields.Integer( string='Number of products', - compute='_get_products_count', + compute='_compute_products_count', ) @api.multi @api.depends('product_ids') - def _get_products_count(self): + def _compute_products_count(self): for brand in self: brand.products_count = len(brand.product_ids) diff --git a/product_brand/reports/account_invoice_report.py b/product_brand/reports/account_invoice_report.py index 01e5c4101..2ff32fbbc 100644 --- a/product_brand/reports/account_invoice_report.py +++ b/product_brand/reports/account_invoice_report.py @@ -1,33 +1,32 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) -from openerp import fields, models +from odoo import fields, models class AccountInvoiceReport(models.Model): _inherit = "account.invoice.report" product_brand_id = fields.Many2one( - 'product.brand', + comodel_name='product.brand', string='Brand', ) def _select(self): - select_str = super(AccountInvoiceReport, self)._select() + select_str = super()._select() select_str += """ , sub.product_brand_id as product_brand_id """ return select_str def _sub_select(self): - select_str = super(AccountInvoiceReport, self)._sub_select() + select_str = super()._sub_select() select_str += """ , pt.product_brand_id """ return select_str def _group_by(self): - group_by_str = super(AccountInvoiceReport, self)._group_by() + group_by_str = super()._group_by() group_by_str += ", pt.product_brand_id" return group_by_str diff --git a/product_brand/reports/account_invoice_report_view.xml b/product_brand/reports/account_invoice_report_view.xml index 8d4fa8663..0d7bb18e2 100644 --- a/product_brand/reports/account_invoice_report_view.xml +++ b/product_brand/reports/account_invoice_report_view.xml @@ -1,14 +1,15 @@ - - - account.invoice.report - - - - - - + + + account.invoice.report + + + + + + diff --git a/product_brand/reports/sale_report.py b/product_brand/reports/sale_report.py index d9daeb164..f6c483348 100644 --- a/product_brand/reports/sale_report.py +++ b/product_brand/reports/sale_report.py @@ -8,18 +8,27 @@ class SaleReport(models.Model): _inherit = "sale.report" product_brand_id = fields.Many2one( - 'product.brand', + comodel_name='product.brand', string='Brand', ) - def _select(self): - select_str = super(SaleReport, self)._select() - select_str += """ - , t.product_brand_id - """ - return select_str - - def _group_by(self): - group_by_str = super(SaleReport, self)._group_by() - group_by_str += ", t.product_brand_id" - return group_by_str + # pylint:disable=dangerous-default-value + def _query(self, with_clause='', fields={}, groupby='', from_clause=''): + query_str = super()._query( + with_clause=with_clause, fields=fields, groupby=groupby, + from_clause=from_clause) + # Split query + with_clause, following = query_str.split('SELECT') + select_clause, following = following.split('FROM') + from_clause, following = following.split('WHERE') + where_clause, following = following.split('GROUP BY') + groupby_clause = following.split(')')[0] + # Add in query + select_clause += """, t.product_brand_id""" + groupby_clause += ", t.product_brand_id" + # Recompose query + res = ("SELECT {select_clause} " + "FROM {from_clause} " + "WHERE {where_clause} " + "GROUP BY {groupby_clause}".format(**locals())) + return res diff --git a/product_brand/reports/sale_report_view.xml b/product_brand/reports/sale_report_view.xml index d7b35eb36..6be6e5c95 100644 --- a/product_brand/reports/sale_report_view.xml +++ b/product_brand/reports/sale_report_view.xml @@ -1,14 +1,15 @@ - - - sale.report - - - - - - + + + sale.report + + + + + + diff --git a/product_brand/static/description/index.html b/product_brand/static/description/index.html index 58d2000c5..b1ed2149f 100644 --- a/product_brand/static/description/index.html +++ b/product_brand/static/description/index.html @@ -367,7 +367,7 @@

Product Brand Manager

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

Mature License: AGPL-3 OCA/product-attribute Translate me on Weblate Try me on Runbot

This module allows odoo users to easily manage product brands.

Table of contents

@@ -420,7 +420,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 -feedback.

+feedback.

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

@@ -461,7 +461,7 @@

Maintainers

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/product-attribute project on GitHub.

+

This module is part of the OCA/product-attribute project on GitHub.

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

diff --git a/product_brand/tests/__init__.py b/product_brand/tests/__init__.py index 7b93d7a9a..3b72ef1f2 100644 --- a/product_brand/tests/__init__.py +++ b/product_brand/tests/__init__.py @@ -1,4 +1 @@ -# Copyright (c) 2018 Daniel Campos - Avanzosc S.L. -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - from . import test_product_brand diff --git a/product_brand/tests/test_product_brand.py b/product_brand/tests/test_product_brand.py index 136b1de90..bc0cc0c2c 100644 --- a/product_brand/tests/test_product_brand.py +++ b/product_brand/tests/test_product_brand.py @@ -1,12 +1,13 @@ # Copyright (c) 2018 Daniel Campos - Avanzosc S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from odoo.tests import common class TestProductBrand(common.TransactionCase): def setUp(self): - super(TestProductBrand, self).setUp() + super().setUp() self.product = self.env.ref('product.product_product_4') self.supplier = self.ref('base.res_partner_2') self.product_brand_obj = self.env['product.brand'] diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml index f85792191..6cef69750 100644 --- a/product_brand/views/product_brand_view.xml +++ b/product_brand/views/product_brand_view.xml @@ -85,7 +85,7 @@
- + Logo

From 9a48ce3b06692b0ee8336e842f0e029cf71c4dba Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Tue, 4 Dec 2018 10:02:12 +0200 Subject: [PATCH 21/74] [MIG] product_pricelist_direct_print: Migration to 12.0 --- product_brand/tests/test_product_brand.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_brand/tests/test_product_brand.py b/product_brand/tests/test_product_brand.py index bc0cc0c2c..826390749 100644 --- a/product_brand/tests/test_product_brand.py +++ b/product_brand/tests/test_product_brand.py @@ -1,5 +1,5 @@ # Copyright (c) 2018 Daniel Campos - Avanzosc S.L. -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from odoo.tests import common From 36a982d14d96a07c78afefcd8c826837f9bc26bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marta=20V=C3=A1zquez=20Rodr=C3=ADguez?= Date: Fri, 8 Feb 2019 11:16:09 +0000 Subject: [PATCH 22/74] Translated using Weblate (Spanish) Currently translated at 100.0% (24 of 24 strings) Translation: product-attribute-12.0/product-attribute-12.0-product_brand Translate-URL: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_brand/es/ --- product_brand/i18n/es.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index 8776d4e1d..acd1d4d62 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-07-29 02:55+0000\n" -"PO-Revision-Date: 2017-07-29 02:55+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"PO-Revision-Date: 2019-02-08 13:50+0000\n" +"Last-Translator: Marta Vázquez Rodríguez \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.4\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand @@ -71,7 +72,7 @@ msgstr "ID" #. module: product_brand #: model:ir.model,name:product_brand.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Estadísticas de facturas" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update @@ -90,7 +91,6 @@ msgstr "Última modificación el" #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban -#, fuzzy msgid "Logo" msgstr "Logotipo" @@ -135,7 +135,7 @@ msgstr "Productos" #. module: product_brand #: model:ir.model,name:product_brand.model_sale_report msgid "Sales Analysis Report" -msgstr "" +msgstr "Análisis de Ventas" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id From eeb5564182e5adf14d1cd4a25939f8f1c9917fdf Mon Sep 17 00:00:00 2001 From: Marius Stedjan Date: Mon, 11 Feb 2019 11:49:09 +0000 Subject: [PATCH 23/74] =?UTF-8?q?Added=20translation=20using=20Weblate=20(?= =?UTF-8?q?Norwegian=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- product_brand/i18n/nb_NO.po | 150 ++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 product_brand/i18n/nb_NO.po diff --git a/product_brand/i18n/nb_NO.po b/product_brand/i18n/nb_NO.po new file mode 100644 index 000000000..ba9e3f18c --- /dev/null +++ b/product_brand/i18n/nb_NO.po @@ -0,0 +1,150 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_brand +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: nb_NO\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 +#: model:ir.actions.act_window,name:product_brand.action_product_brand +#: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id +#: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add +#: model_terms:ir.ui.view,arch_db:product_brand.view_account_invoice_report_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand +msgid "Brand" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__name +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Brand Name" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_brand_products +#: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids +msgid "Brand Products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid +msgid "Created by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date +msgid "Created on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__description +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +msgid "Description" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name +msgid "Display Name" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__id +msgid "ID" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update +msgid "Last Modified on" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date +msgid "Last Updated on" +msgstr "" + +#. module: product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Logo" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__logo +msgid "Logo File" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count +msgid "Number of products" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id +msgid "Partner" +msgstr "" + +#. module: product_brand +#: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand +#: model:ir.model,name:product_brand.model_product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view +msgid "Product Brand" +msgstr "" + +#. module: product_brand +#: model:ir.ui.menu,name:product_brand.menu_product_brand +msgid "Product Brands" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban +msgid "Products" +msgstr "" + +#. module: product_brand +#: model:ir.model,name:product_brand.model_sale_report +msgid "Sales Analysis Report" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id +#: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id +msgid "Select a brand for this product" +msgstr "" + +#. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id +msgid "Select a partner for this brand if any." +msgstr "" + +#. module: product_brand +#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree +msgid "product.brand" +msgstr "" From 95e7d12e64ac2fb8d9045f892087c17877d0fa04 Mon Sep 17 00:00:00 2001 From: Marius Stedjan Date: Mon, 11 Feb 2019 12:59:17 +0100 Subject: [PATCH 24/74] [12.0] [FIX] Patch product_brand (#433) --- product_brand/reports/sale_report.py | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/product_brand/reports/sale_report.py b/product_brand/reports/sale_report.py index f6c483348..2cd20d02a 100644 --- a/product_brand/reports/sale_report.py +++ b/product_brand/reports/sale_report.py @@ -14,21 +14,8 @@ class SaleReport(models.Model): # pylint:disable=dangerous-default-value def _query(self, with_clause='', fields={}, groupby='', from_clause=''): - query_str = super()._query( - with_clause=with_clause, fields=fields, groupby=groupby, - from_clause=from_clause) - # Split query - with_clause, following = query_str.split('SELECT') - select_clause, following = following.split('FROM') - from_clause, following = following.split('WHERE') - where_clause, following = following.split('GROUP BY') - groupby_clause = following.split(')')[0] - # Add in query - select_clause += """, t.product_brand_id""" - groupby_clause += ", t.product_brand_id" - # Recompose query - res = ("SELECT {select_clause} " - "FROM {from_clause} " - "WHERE {where_clause} " - "GROUP BY {groupby_clause}".format(**locals())) - return res + fields['product_brand_id'] = ", t.product_brand_id as product_brand_id" + groupby += ', t.product_brand_id' + return super(SaleReport, self)._query( + with_clause, fields, groupby, from_clause + ) From 624f6d69aeddce75906e204d76628126c1101935 Mon Sep 17 00:00:00 2001 From: Marius Stedjan Date: Mon, 11 Feb 2019 11:50:59 +0000 Subject: [PATCH 25/74] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 37.5% (9 of 24 strings) Translation: product-attribute-12.0/product-attribute-12.0-product_brand Translate-URL: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_brand/nb_NO/ --- product_brand/i18n/nb_NO.po | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/product_brand/i18n/nb_NO.po b/product_brand/i18n/nb_NO.po index ba9e3f18c..e9b393ce6 100644 --- a/product_brand/i18n/nb_NO.po +++ b/product_brand/i18n/nb_NO.po @@ -6,13 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2019-02-11 11:59+0000\n" +"Last-Translator: Marius Stedjan \n" "Language-Team: none\n" "Language: nb_NO\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 3.4\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand @@ -25,50 +27,50 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:product_brand.view_order_product_search #: model_terms:ir.ui.view,arch_db:product_brand.view_product_template_search_brand msgid "Brand" -msgstr "" +msgstr "Merke" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__name #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Brand Name" -msgstr "" +msgstr "Merkenavn" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_brand_products #: model:ir.model.fields,field_description:product_brand.field_product_brand__product_ids msgid "Brand Products" -msgstr "" +msgstr "Merkeprodukter" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__create_uid msgid "Created by" -msgstr "" +msgstr "Opprettet av" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__create_date msgid "Created on" -msgstr "" +msgstr "Opprettet" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__description #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form msgid "Description" -msgstr "" +msgstr "Beskrivelse" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__display_name msgid "Display Name" -msgstr "" +msgstr "Visningsnavn" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__id msgid "ID" -msgstr "" +msgstr "ID" #. module: product_brand #: model:ir.model,name:product_brand.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Fakturastatistikk" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update From 5835f39bb5a34875c200f5fc939823a0783937bb Mon Sep 17 00:00:00 2001 From: Marius Stedjan Date: Mon, 11 Feb 2019 23:54:45 +0000 Subject: [PATCH 26/74] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (24 of 24 strings) Translation: product-attribute-12.0/product-attribute-12.0-product_brand Translate-URL: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_brand/nb_NO/ --- product_brand/i18n/de.po | 2 ++ product_brand/i18n/es.po | 2 ++ product_brand/i18n/fr.po | 2 ++ product_brand/i18n/fr_FR.po | 2 ++ product_brand/i18n/hr.po | 2 ++ product_brand/i18n/it.po | 2 ++ product_brand/i18n/nb_NO.po | 32 ++++++++++++++++---------------- product_brand/i18n/nl_NL.po | 2 ++ product_brand/i18n/sl.po | 2 ++ 9 files changed, 32 insertions(+), 16 deletions(-) diff --git a/product_brand/i18n/de.po b/product_brand/i18n/de.po index 102e9edd8..7d290dfc0 100644 --- a/product_brand/i18n/de.po +++ b/product_brand/i18n/de.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -139,6 +140,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Wähle eine Marke für dieses Produkt" diff --git a/product_brand/i18n/es.po b/product_brand/i18n/es.po index acd1d4d62..676a0de05 100644 --- a/product_brand/i18n/es.po +++ b/product_brand/i18n/es.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -138,6 +139,7 @@ msgid "Sales Analysis Report" msgstr "Análisis de Ventas" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Seleccione una marca para este producto" diff --git a/product_brand/i18n/fr.po b/product_brand/i18n/fr.po index 181934c92..918e46490 100644 --- a/product_brand/i18n/fr.po +++ b/product_brand/i18n/fr.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -139,6 +140,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Selectionnez une marque pour ce produit" diff --git a/product_brand/i18n/fr_FR.po b/product_brand/i18n/fr_FR.po index 70b8e5df9..397affb2d 100644 --- a/product_brand/i18n/fr_FR.po +++ b/product_brand/i18n/fr_FR.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -138,6 +139,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" diff --git a/product_brand/i18n/hr.po b/product_brand/i18n/hr.po index 2cc07135b..e4365a1da 100644 --- a/product_brand/i18n/hr.po +++ b/product_brand/i18n/hr.po @@ -23,6 +23,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -140,6 +141,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Odaberite brand za ovaj proizvod" diff --git a/product_brand/i18n/it.po b/product_brand/i18n/it.po index 0ccf381e1..82d263350 100644 --- a/product_brand/i18n/it.po +++ b/product_brand/i18n/it.po @@ -21,6 +21,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -138,6 +139,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "Scegliere una marca per questo prodotto" diff --git a/product_brand/i18n/nb_NO.po b/product_brand/i18n/nb_NO.po index e9b393ce6..09c0a8c17 100644 --- a/product_brand/i18n/nb_NO.po +++ b/product_brand/i18n/nb_NO.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2019-02-11 11:59+0000\n" +"PO-Revision-Date: 2019-02-12 02:50+0000\n" "Last-Translator: Marius Stedjan \n" "Language-Team: none\n" "Language: nb_NO\n" @@ -75,78 +75,78 @@ msgstr "Fakturastatistikk" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" -msgstr "" +msgstr "Sist modifisert" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Sist oppdatert av" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__write_date msgid "Last Updated on" -msgstr "" +msgstr "Sist oppdatert" #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Logo" -msgstr "" +msgstr "Logo" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__logo msgid "Logo File" -msgstr "" +msgstr "Logo-fil" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__products_count msgid "Number of products" -msgstr "" +msgstr "Antall produkter" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" -msgstr "" +msgstr "Partner" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.model,name:product_brand.model_product_brand #: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" -msgstr "" +msgstr "Produktmerke" #. module: product_brand #: model:ir.ui.menu,name:product_brand.menu_product_brand msgid "Product Brands" -msgstr "" +msgstr "Produktmerker" #. module: product_brand #: model:ir.model,name:product_brand.model_product_template msgid "Product Template" -msgstr "" +msgstr "Produktmal" #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_form #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban msgid "Products" -msgstr "" +msgstr "Produkter" #. module: product_brand #: model:ir.model,name:product_brand.model_sale_report msgid "Sales Analysis Report" -msgstr "" +msgstr "Salgsanalyse-rapport" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" -msgstr "" +msgstr "Velg et merke for produktet" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." -msgstr "" +msgstr "Velg en partner for produktet, om noen." #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree msgid "product.brand" -msgstr "" +msgstr "produkt.merke" diff --git a/product_brand/i18n/nl_NL.po b/product_brand/i18n/nl_NL.po index 95221a3e7..fcecef007 100644 --- a/product_brand/i18n/nl_NL.po +++ b/product_brand/i18n/nl_NL.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -139,6 +140,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" diff --git a/product_brand/i18n/sl.po b/product_brand/i18n/sl.po index cc0ac10f1..a524e8bf4 100644 --- a/product_brand/i18n/sl.po +++ b/product_brand/i18n/sl.po @@ -22,6 +22,7 @@ msgstr "" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand #: model:ir.model.fields,field_description:product_brand.field_account_invoice_report__product_brand_id +#: model:ir.model.fields,field_description:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_product_template__product_brand_id #: model:ir.model.fields,field_description:product_brand.field_sale_report__product_brand_id #: model_terms:ir.ui.view,arch_db:product_brand.product_template_form_brand_add @@ -138,6 +139,7 @@ msgid "Sales Analysis Report" msgstr "" #. module: product_brand +#: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" msgstr "" From ef0190e6195368c7e7ff518ac348d22a160b0279 Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Tue, 16 Apr 2019 11:51:57 +0000 Subject: [PATCH 27/74] Translated using Weblate (Dutch) Currently translated at 100.0% (24 of 24 strings) Translation: product-attribute-12.0/product-attribute-12.0-product_brand Translate-URL: https://translation.odoo-community.org/projects/product-attribute-12-0/product-attribute-12-0-product_brand/nl_NL/ --- product_brand/i18n/nl_NL.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/product_brand/i18n/nl_NL.po b/product_brand/i18n/nl_NL.po index fcecef007..aa2790312 100644 --- a/product_brand/i18n/nl_NL.po +++ b/product_brand/i18n/nl_NL.po @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-27 04:44+0000\n" -"PO-Revision-Date: 2017-05-27 04:44+0000\n" -"Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" -"teams/23907/nl_NL/)\n" +"PO-Revision-Date: 2019-04-16 14:15+0000\n" +"Last-Translator: Cas Vissers \n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/" +"23907/nl_NL/)\n" "Language: nl_NL\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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.5.1\n" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_product_brand @@ -73,12 +74,12 @@ msgstr "ID" #. module: product_brand #: model:ir.model,name:product_brand.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Factuur statistieken" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand____last_update msgid "Last Modified on" -msgstr "" +msgstr "Laatst bijgewerkt op" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__write_uid @@ -92,9 +93,8 @@ msgstr "Laatst aangepast op" #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_kanban -#, fuzzy msgid "Logo" -msgstr "Logo-bestand" +msgstr "Logo" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__logo @@ -109,19 +109,19 @@ msgstr "Aantal producten" #. module: product_brand #: model:ir.model.fields,field_description:product_brand.field_product_brand__partner_id msgid "Partner" -msgstr "" +msgstr "Relatie" #. module: product_brand #: model:ir.actions.act_window,name:product_brand.action_open_single_product_brand #: model:ir.model,name:product_brand.model_product_brand #: model_terms:ir.ui.view,arch_db:product_brand.product_brand_search_form_view msgid "Product Brand" -msgstr "" +msgstr "Product merk" #. module: product_brand #: model:ir.ui.menu,name:product_brand.menu_product_brand msgid "Product Brands" -msgstr "" +msgstr "Product merken" #. module: product_brand #: model:ir.model,name:product_brand.model_product_template @@ -137,18 +137,18 @@ msgstr "Producten" #. module: product_brand #: model:ir.model,name:product_brand.model_sale_report msgid "Sales Analysis Report" -msgstr "" +msgstr "Verkoop analyse rapport" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_product__product_brand_id #: model:ir.model.fields,help:product_brand.field_product_template__product_brand_id msgid "Select a brand for this product" -msgstr "" +msgstr "Selecteer een merk voor dit product" #. module: product_brand #: model:ir.model.fields,help:product_brand.field_product_brand__partner_id msgid "Select a partner for this brand if any." -msgstr "" +msgstr "Selecteer een relatie voor dit werk, wanneer beschikbaar." #. module: product_brand #: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree From 5201a855443c9f86ab11ac3b6c49bd339df9b745 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Mon, 15 Jul 2019 19:02:06 +0200 Subject: [PATCH 28/74] [IMP] product_brand: save logo as attachment (#493) --- product_brand/__manifest__.py | 3 ++- .../migrations/12.0.2.0.0/post-migration.py | 14 ++++++++++++++ .../migrations/12.0.2.0.0/pre-migration.py | 16 ++++++++++++++++ product_brand/models/product_brand.py | 2 +- product_brand/static/description/index.html | 2 +- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 product_brand/migrations/12.0.2.0.0/post-migration.py create mode 100644 product_brand/migrations/12.0.2.0.0/pre-migration.py diff --git a/product_brand/__manifest__.py b/product_brand/__manifest__.py index 614afb8ec..11ce78a78 100644 --- a/product_brand/__manifest__.py +++ b/product_brand/__manifest__.py @@ -4,11 +4,12 @@ # Copyright 2016 Serpent Consulting Services Pvt. Ltd. # Copyright 2018 Daniel Campos # Copyright 2018 Tecnativa - David Vidal +# Copyright 2019 Giovanni - GSLabIt # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { 'name': 'Product Brand Manager', - 'version': '12.0.1.0.0', + 'version': '12.0.2.0.0', 'development_status': "Mature", 'category': 'Product', 'summary': "Product Brand Manager", diff --git a/product_brand/migrations/12.0.2.0.0/post-migration.py b/product_brand/migrations/12.0.2.0.0/post-migration.py new file mode 100644 index 000000000..2d7bd8529 --- /dev/null +++ b/product_brand/migrations/12.0.2.0.0/post-migration.py @@ -0,0 +1,14 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openupgradelib import openupgrade +from openupgradelib import openupgrade_90 + + +@openupgrade.migrate(use_env=True) +def migrate(env, version): + column = openupgrade.get_legacy_name('logo') + if openupgrade.column_exists(env.cr, 'product_brand', column): + openupgrade_90.convert_binary_field_to_attachment( + env, {'product.brand': [('logo', None)]}, + ) diff --git a/product_brand/migrations/12.0.2.0.0/pre-migration.py b/product_brand/migrations/12.0.2.0.0/pre-migration.py new file mode 100644 index 000000000..0f6162b4b --- /dev/null +++ b/product_brand/migrations/12.0.2.0.0/pre-migration.py @@ -0,0 +1,16 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade + +column_renames = { + 'product_brand': [ + ('logo', None), + ], +} + + +@openupgrade.migrate() +def migrate(env, version): + if openupgrade.column_exists(env.cr, 'product_brand', 'logo'): + openupgrade.rename_columns(env.cr, column_renames) diff --git a/product_brand/models/product_brand.py b/product_brand/models/product_brand.py index 2703ef0a4..30e98c14b 100644 --- a/product_brand/models/product_brand.py +++ b/product_brand/models/product_brand.py @@ -21,7 +21,7 @@ class ProductBrand(models.Model): help='Select a partner for this brand if any.', ondelete='restrict' ) - logo = fields.Binary('Logo File') + logo = fields.Binary('Logo File', attachment=True) product_ids = fields.One2many( 'product.template', 'product_brand_id', diff --git a/product_brand/static/description/index.html b/product_brand/static/description/index.html index b1ed2149f..8d70db698 100644 --- a/product_brand/static/description/index.html +++ b/product_brand/static/description/index.html @@ -3,7 +3,7 @@ - + Product Brand Manager