From 625def8ef9fbc6c26a74c5fa32114bc5f87cdc1d Mon Sep 17 00:00:00 2001 From: Quentin Dupont Date: Mon, 20 Nov 2023 16:44:58 +0100 Subject: [PATCH 1/4] [IMP] Labels : font standardization, Organic info standardization --- grap_change_views_product/i18n/fr.po | 71 ++++++++++--------- .../views/view_product_product_form.xml | 26 +++---- grap_qweb_report/i18n/fr.po | 53 ++++++++------ .../report/qweb_pricetag_normal_large.xml | 18 ++--- .../report/qweb_pricetag_normal_small.xml | 16 +++-- .../report/qweb_pricetag_square_large.xml | 21 +++--- .../report/qweb_pricetag_square_small.xml | 51 +++++++------ .../static/css/pricetag_normal_large.scss | 6 +- .../static/css/pricetag_square_large.scss | 4 +- .../static/css/pricetag_square_small.scss | 69 ++++++++++-------- 10 files changed, 191 insertions(+), 144 deletions(-) diff --git a/grap_change_views_product/i18n/fr.po b/grap_change_views_product/i18n/fr.po index 4f3238db..0557436e 100644 --- a/grap_change_views_product/i18n/fr.po +++ b/grap_change_views_product/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-03 22:14+0000\n" -"PO-Revision-Date: 2022-11-03 22:14+0000\n" +"POT-Creation-Date: 2023-11-10 16:19+0000\n" +"PO-Revision-Date: 2023-11-10 16:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,11 +30,6 @@ msgstr "Prévisions" msgid "On Hand" msgstr "Disponible" -#. module: grap_change_views_product -#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid " minutes" -msgstr "" - #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Accounting Fields" @@ -61,6 +56,7 @@ msgid "Allergens" msgstr "Allergènes" #. module: grap_change_views_product +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price msgid "Apply Margin" msgstr "Appliquer la marge" @@ -80,17 +76,17 @@ msgstr "Catégorie" msgid "Category in POS" msgstr "Catégorie de PdV" -#. module: grap_change_views_product -#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "Changing this value will change all BoM containing this product." -msgstr "Changer cette valeur entraînera le changement de toutes les fiches techniques contenant ce produit." - #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree msgid "Code" msgstr "" +#. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__standard_price +msgid "Cost" +msgstr "Coût" + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree msgid "Cost P." @@ -106,6 +102,11 @@ msgstr "Coût HT" msgid "Cost Price (VAT Incl.)" msgstr "Coût TTC" +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__standard_price +msgid "Cost used for stock valuation in standard price and as a first price to set in average/fifo. Also used as a base price for pricelists. Expressed in the default unit of measure of the product." +msgstr "Également utilisé comme prix de base pour les listes. Exprimé dans l'unité de mesure par défaut du produit." + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Create an automatic trigram. Change its BoM references with this trigram." @@ -113,10 +114,17 @@ msgstr "Générer un trigramme automatiquement. Cela change les codes référenc #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price msgid "Decrease the Sale Price down to Theoretical Price" msgstr "Baisser le prix de vente pour atteindre le prix théorique" +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__seller_ids +#: model:ir.model.fields,help:grap_change_views_product.field_product_template__seller_ids +msgid "Define vendor pricelists." +msgstr "Définissez les listes de prix des fournisseurs." + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Description" @@ -207,6 +215,7 @@ msgstr "TI - Article chez l'acti" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_price msgid "Increase the Sale Price up to Theoretical Price" msgstr "Augmenter le prix de vente pour atteindre le prix théorique" @@ -372,6 +381,7 @@ msgstr "Impression des étiquettes" #. module: grap_change_views_product #: model:ir.model,name:grap_change_views_product.model_product_product +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree msgid "Product" msgstr "Article" @@ -479,11 +489,6 @@ msgstr "Articles (eBoutique)" msgid "Products - Update Margin and Sale Price" msgstr "Articles - Mettre à jour les prix de vente et marges 💶" -#. module: grap_change_views_product -#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree -msgid "Product price" -msgstr "Prix de l'article" - #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Purchase Invoicing Fields" @@ -510,6 +515,11 @@ msgstr "Matières premières 🥕" msgid "Ref" msgstr "Réf" +#. module: grap_change_views_product +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_tree_mrp +msgid "Ref." +msgstr "Réf." + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Replenish" @@ -595,12 +605,12 @@ msgstr "Nom chez frs." #. module: grap_change_views_product #: model:ir.ui.menu,name:grap_change_views_product.menu_grap_mrp_handle_prices_1b_supplierinfos msgid "Suppliers Informations" -msgstr "Prix fournisseur·es" +msgstr "Prix fournisseur·e·s" #. module: grap_change_views_product #: model:ir.actions.act_window,name:grap_change_views_product.action_product_supplierinfo_tree msgid "Suppliers informations" -msgstr "Prix fournisseur·es" +msgstr "Prix fournisseur·e·s" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree @@ -712,6 +722,8 @@ msgid "Valuation of Virtual Quantity" msgstr "Valorisation du stock virtuel" #. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__seller_ids +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_template__seller_ids #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Vendors" msgstr "Fournisseurs" @@ -736,11 +748,6 @@ msgstr "⇒ Générer trigramme" msgid "⇒ Increase Price" msgstr "⇒ Augmenter le prix" -#. module: grap_change_views_product -#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "⌛ Handling time" -msgstr "⌛ Gestion du temps" - #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "✅ Notations" @@ -748,23 +755,23 @@ msgstr "" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "🌱 Organic informations" -msgstr "🌱 Informations bio" +msgid "🌱 Organic informations - Labels" +msgstr "🌱 Infos réglementaires bio - labels" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "🍴 Alimentary informations" -msgstr "🍴 Informations alimentaire" +msgid "🌱 Organic informations - Raw materials origin 🥕" +msgstr "🌱 Infos réglementaires bio - origine matières premières 🥕" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "📜 Market price list" -msgstr "📜 Mercuriale" +msgid "🍴 Alimentary and production informations 🚩" +msgstr "🍴 Infos alimentaires et de production 🚩" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form -msgid "🚩 Production place" -msgstr "🚩 Lieu de production" +msgid "📜 Market price list" +msgstr "📜 Mercuriale" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form diff --git a/grap_change_views_product/views/view_product_product_form.xml b/grap_change_views_product/views/view_product_product_form.xml index ce3b65db..8fe508cf 100644 --- a/grap_change_views_product/views/view_product_product_form.xml +++ b/grap_change_views_product/views/view_product_product_form.xml @@ -281,22 +281,24 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - - - - - - - + + + + + - + - - - + + + + +
- + + +
diff --git a/grap_qweb_report/i18n/fr.po b/grap_qweb_report/i18n/fr.po index 996663d0..31dc4b2f 100644 --- a/grap_qweb_report/i18n/fr.po +++ b/grap_qweb_report/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-10-11 21:14+0000\n" -"PO-Revision-Date: 2022-10-11 21:14+0000\n" +"POT-Creation-Date: 2023-11-20 13:58+0000\n" +"PO-Revision-Date: 2023-11-20 13:58+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large msgid "- Code:" -msgstr "- Code :" +msgstr "- Code : " #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.grap_external_layout @@ -32,8 +32,8 @@ msgstr "" #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large -msgid "Origine : " -msgstr "Lieu de prod. : " +msgid "Origine : " +msgstr "" #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.grap_external_layout @@ -52,9 +52,19 @@ msgid "
\n" " est une activité de
" msgstr "" +#. module: grap_qweb_report +#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small +msgid "
Origin:" +msgstr "
Origine : " + +#. module: grap_qweb_report +#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large +msgid "
Origine :" +msgstr "" + #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large -msgid "Ingrédients
" +msgid "Ingrédients
" msgstr "" #. module: grap_qweb_report @@ -146,9 +156,14 @@ msgstr "Montant (avec ou sans taxes)" msgid "Anonymous" msgstr "Anonyme" +#. module: grap_qweb_report +#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_square_large +msgid "Barcode:" +msgstr "Code barre :" + #. module: grap_qweb_report #. openerp-web -#: code:addons/grap_qweb_report/static/src/xml/pos.xml:109 +#: code:addons/grap_qweb_report/static/src/xml/pos.xml:90 #, python-format msgid "Base" msgstr "" @@ -181,7 +196,7 @@ msgstr "Sociétés" #. module: grap_qweb_report #: model:ir.model.fields,field_description:grap_qweb_report.field_report_custom_message__company_id msgid "Company" -msgstr "Société" +msgstr "" #. module: grap_qweb_report #: model:ir.model.fields,field_description:grap_qweb_report.field_report_custom_message__create_uid @@ -266,6 +281,11 @@ msgstr "Afficher sur" msgid "Document Template" msgstr "Modèle de document" +#. module: grap_qweb_report +#: model_terms:ir.ui.view,arch_db:grap_qweb_report.template_account_invoice +msgid "Document d'origine" +msgstr "" + #. module: grap_qweb_report #: code:addons/grap_qweb_report/models/account_invoice.py:18 #, python-format @@ -319,8 +339,8 @@ msgstr "" #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small -msgid "Internal code:" -msgstr "Code :" +msgid "Internal code: [" +msgstr "Code : [" #. module: grap_qweb_report #: model:ir.model,name:grap_qweb_report.model_account_invoice @@ -381,17 +401,6 @@ msgstr "" msgid "Normal (small) - 76x33mm" msgstr "" -#. module: grap_qweb_report -#: model_terms:ir.ui.view,arch_db:grap_qweb_report.template_account_invoice -msgid "Document d'origine" -msgstr "" - -#. module: grap_qweb_report -#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large -#: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small -msgid "Origine :" -msgstr "Lieu de prod. :" - #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small @@ -517,7 +526,7 @@ msgstr "" #. module: grap_qweb_report #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_large #: model_terms:ir.ui.view,arch_db:grap_qweb_report.qweb_template_pricetag_normal_small -msgid "kg" +msgid "kg
" msgstr "" #. module: grap_qweb_report diff --git a/grap_qweb_report/report/qweb_pricetag_normal_large.xml b/grap_qweb_report/report/qweb_pricetag_normal_large.xml index 207f66cd..dea30223 100644 --- a/grap_qweb_report/report/qweb_pricetag_normal_large.xml +++ b/grap_qweb_report/report/qweb_pricetag_normal_large.xml @@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + @@ -20,7 +21,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -
+
@@ -31,10 +32,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- Internal code:
- Origine :
+ Internal code: [] + +
Origine :

- Producteur·rice :
+ Producteur·rice :

@@ -62,7 +64,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- € + €
le kilo
 @@ -70,14 +72,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- Volume
L
 - Poids net
kg
 + Volume
L
 + Poids net
kg

- € + €
diff --git a/grap_qweb_report/report/qweb_pricetag_normal_small.xml b/grap_qweb_report/report/qweb_pricetag_normal_small.xml index 6713db7c..72d907cc 100644 --- a/grap_qweb_report/report/qweb_pricetag_normal_small.xml +++ b/grap_qweb_report/report/qweb_pricetag_normal_small.xml @@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + @@ -20,7 +21,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -
+
@@ -31,10 +32,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- Internal code:
- Origine :
+ Internal code: [] + +
Origin:

- Producteur·rice :
+ Producteur·rice :

@@ -76,14 +78,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- Volume
L
 - Poids net
kg
 + Volume
L
 + Poids net
kg

- € + €
diff --git a/grap_qweb_report/report/qweb_pricetag_square_large.xml b/grap_qweb_report/report/qweb_pricetag_square_large.xml index 73a1d13b..80022c9a 100644 --- a/grap_qweb_report/report/qweb_pricetag_square_large.xml +++ b/grap_qweb_report/report/qweb_pricetag_square_large.xml @@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + @@ -19,7 +20,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -
+
@@ -52,14 +57,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
+
- €le litre
 @@ -74,7 +79,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). : -  € +  € @@ -83,7 +88,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- €
@@ -97,11 +102,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
- Origine :
+ Origine :
- Ingrédients
 + Ingrédients
diff --git a/grap_qweb_report/report/qweb_pricetag_square_small.xml b/grap_qweb_report/report/qweb_pricetag_square_small.xml index 42be46ed..daf1fac6 100644 --- a/grap_qweb_report/report/qweb_pricetag_square_small.xml +++ b/grap_qweb_report/report/qweb_pricetag_square_small.xml @@ -12,6 +12,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + @@ -19,7 +20,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -
+
@@ -59,32 +60,40 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). €
-
le kilo
 -
la pièce
 +
+ le kilo + la pièce +
- -
- - : - € - -
- - -
- +
+ + + : + € + + +
-
-
- - - - - +
+ + [] + + + +
+ +
+ + + + + +
+
diff --git a/grap_qweb_report/static/css/pricetag_normal_large.scss b/grap_qweb_report/static/css/pricetag_normal_large.scss index 09f27d6a..68ae7c94 100644 --- a/grap_qweb_report/static/css/pricetag_normal_large.scss +++ b/grap_qweb_report/static/css/pricetag_normal_large.scss @@ -3,10 +3,10 @@ padding: 0.8cm 5px; .pricetag_left { - width : 5.8cm; + width : 5.5cm; } .pricetag_right { - width : 3.05cm; + width : 3.1cm; height: 3.6cm; padding-top: 30px; } @@ -20,7 +20,7 @@ font-size: 13px; } .product_price { - font-size: 30px; + font-size: 29px; height: 1cm; line-height: 1cm; white-space: nowrap; } diff --git a/grap_qweb_report/static/css/pricetag_square_large.scss b/grap_qweb_report/static/css/pricetag_square_large.scss index 3accd530..67b77d6f 100644 --- a/grap_qweb_report/static/css/pricetag_square_large.scss +++ b/grap_qweb_report/static/css/pricetag_square_large.scss @@ -38,6 +38,9 @@ padding-top: 0.2cm; font-size: 12px; } + .info_underline { + text-decoration: underline; + } .product_price { position: relative; text-align: center; @@ -57,7 +60,6 @@ word-wrap: normal; } .product_price_big { - font-family: Open Sans; font-weight: lighter; font-size: 38px; margin: 0.1cm 0; diff --git a/grap_qweb_report/static/css/pricetag_square_small.scss b/grap_qweb_report/static/css/pricetag_square_small.scss index 4e09bcb3..71766863 100644 --- a/grap_qweb_report/static/css/pricetag_square_small.scss +++ b/grap_qweb_report/static/css/pricetag_square_small.scss @@ -11,68 +11,77 @@ } .product_labels{ float:left; - width: 0.88cm; max-height: 1cm; - padding-top: 0.25cm; + width: 0.88cm; + min-width: 0.55cm; + min-height: 1px; // to have width and height even if empty + max-height: 1cm; } img.product_label{ width:0.5cm; height:0.5cm; - } - .price_area { - display: initial; position: relative; - bottom: 0.2cm; - width: 2.7cm; + bottom: 0.15cm; } .product_name{ - font-size:12px; font-weight:bold; - padding-bottom : 6px; padding-top : 5px; + font-size:12px; + padding-bottom : 6px; padding-top : 3px; margin-top: 0.1cm; overflow: hidden; height: 1.1cm; text-align: center; } + // ========== Price + .price_area { + text-align: center; + position: relative; + right:0.28cm; + width:3.8cm; height:1.9cm; + } + // 1. With special quantity price .pricetag_second_product_price { - font-size: 25px; font-weight: bold; + font-size: 25px; text-align: center; overflow: hidden; + position: relative; right: 0.28cm; } .pricetag_second_price_uom_text { - font-size: 13px; font-weight: bold; + font-size: 13px; text-align: center; line-height: 0.5em; } + .product_price_per_uom_price_only { + font-size: 9px; line-height: 3em; + width: 100%; text-align: center; + } + // 2. With normal quantity .product_price { - font-size: 23px; font-weight: bold; + font-size: 23px; line-height: 1cm; overflow: hidden; white-space: nowrap; } + // 2.a Sell by weight or unit + .product_sell_by_weight { + font-size: 11px; + text-align: center; + position: relative; + bottom: 0.7em; + left: 0.2cm; + } + // 2.b Uom price .product_price_per_uom_price { text-align: center; font-size:9px; - height: 0.8cm; display: inline; - position : relative; left: 0.7cm; - overflow : hidden; - } - .product_price_per_uom_price_only { - font-size: 9px; line-height: 3em; - width: 100%; text-align: center; - } - .product_sell_by_weight { - font-size: 11px; - text-align: center; - position: relative; - bottom: 0.7em; - right: 0.5em; + position : relative; left: 0.25cm; bottom: 0.31cm; } - .option_print_code{ + + // ========== Codes + .option_print_codes{ text-align: center; font-size: 6px; - margin-bottom: 4px; } .wrap_barcode_image{ overflow: hidden; - position: relative; bottom: 0.17cm; - height: 0.35cm; + position: relative; bottom: 0.24cm; + height: 0.30cm; } .wrap_barcode_image > img{ width: 3.8cm; From b8614c7ee56ae6d6bcda71c6d152b03aa7b9ca3a Mon Sep 17 00:00:00 2001 From: Quentin Dupont Date: Tue, 21 Nov 2023 09:28:25 +0100 Subject: [PATCH 2/4] [IMP] fields name : add MP for components + change inline editable views name --- grap_change_views_product/i18n/fr.po | 63 ++++++++++++++++--- .../models/product_product.py | 12 ++++ .../views/view_product_product_form.xml | 2 +- .../views/view_product_product_tree.xml | 7 ++- 4 files changed, 71 insertions(+), 13 deletions(-) diff --git a/grap_change_views_product/i18n/fr.po b/grap_change_views_product/i18n/fr.po index 0557436e..ef627bd3 100644 --- a/grap_change_views_product/i18n/fr.po +++ b/grap_change_views_product/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-10 16:19+0000\n" -"PO-Revision-Date: 2023-11-10 16:19+0000\n" +"POT-Creation-Date: 2023-11-21 08:16+0000\n" +"PO-Revision-Date: 2023-11-21 08:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -107,6 +107,26 @@ msgstr "Coût TTC" msgid "Cost used for stock valuation in standard price and as a first price to set in average/fifo. Also used as a base price for pricelists. Expressed in the default unit of measure of the product." msgstr "Également utilisé comme prix de base pour les listes. Exprimé dans l'unité de mesure par défaut du produit." +#. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_id +msgid "Country (Components)" +msgstr "Pays (MP)" + +#. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_group_id +msgid "Country Group (Components)" +msgstr "Groupe de pays (MP)" + +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_group_id +msgid "Country group of production of the product" +msgstr "Groupe de pays de production du produit" + +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_id +msgid "Country of production of the product" +msgstr "Pays de production du pays" + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Create an automatic trigram. Change its BoM references with this trigram." @@ -125,6 +145,16 @@ msgstr "Baisser le prix de vente pour atteindre le prix théorique" msgid "Define vendor pricelists." msgstr "Définissez les listes de prix des fournisseurs." +#. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__department_id +msgid "Department (Components)" +msgstr "Département (MP)" + +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__department_id +msgid "Department of production of the product" +msgstr "Département de production de l'article" + #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form msgid "Description" @@ -358,6 +388,11 @@ msgstr "Prix" msgid "Price History" msgstr "Historique des coûts" +#. module: grap_change_views_product +#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form +msgid "Price Supp UoM" +msgstr "Prix UdM Frs" + #. module: grap_change_views_product #: model:ir.model.fields,help:grap_change_views_product.field_product_product__list_price #: model:ir.model.fields,help:grap_change_views_product.field_product_template__list_price @@ -435,6 +470,12 @@ msgstr "Articles (Alcool)" msgid "Products (Categories)" msgstr "Articles (Catégories)" +#. module: grap_change_views_product +#: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_origin +#: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_origin +msgid "Products (Components origin)" +msgstr "Articles (Origine Matières Premières)" + #. module: grap_change_views_product #: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_food #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_food @@ -447,12 +488,6 @@ msgstr "Articles (Alimentaire)" msgid "Products (Joint Buying)" msgstr "Articles (Commandes groupées)" -#. module: grap_change_views_product -#: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_origin -#: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_origin -msgid "Products (Origin)" -msgstr "Articles (Origine)" - #. module: grap_change_views_product #: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_pos #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_pos @@ -576,6 +611,16 @@ msgstr "Voir les marges par liste de prix" msgid "Standard Price" msgstr "Coût" +#. module: grap_change_views_product +#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__state_id +msgid "State (Components)" +msgstr "Région (MP)" + +#. module: grap_change_views_product +#: model:ir.model.fields,help:grap_change_views_product.field_product_product__state_id +msgid "State of production of the product" +msgstr "Région de production de l'article" + #. module: grap_change_views_product #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_stock msgid "Stock Situation" @@ -704,7 +749,7 @@ msgstr "Utiliser ce prix pour le coût de l'article" #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_supplierinfo_tree msgid "Use this price 🎯" -msgstr "Utiliser ce prix 🎯" +msgstr "Utiliser ce coût 🎯" #. module: grap_change_views_product #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form diff --git a/grap_change_views_product/models/product_product.py b/grap_change_views_product/models/product_product.py index 5c16e210..ff1db62d 100644 --- a/grap_change_views_product/models/product_product.py +++ b/grap_change_views_product/models/product_product.py @@ -26,6 +26,18 @@ class ProductProduct(models.Model): # Overload Column Section standard_price = fields.Float(copy=True) + country_group_id = fields.Many2one( + string="Country Group (Components)", + ) + country_id = fields.Many2one( + string="Country (Components)", + ) + state_id = fields.Many2one( + string="State (Components)", + ) + department_id = fields.Many2one( + string="Department (Components)", + ) # Compute Section @api.multi diff --git a/grap_change_views_product/views/view_product_product_form.xml b/grap_change_views_product/views/view_product_product_form.xml index 8fe508cf..51569e89 100644 --- a/grap_change_views_product/views/view_product_product_form.xml +++ b/grap_change_views_product/views/view_product_product_form.xml @@ -228,7 +228,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). attrs="{'readonly': [('is_intercompany_trade', '=', True)]}"/> - + diff --git a/grap_change_views_product/views/view_product_product_tree.xml b/grap_change_views_product/views/view_product_product_tree.xml index 1dd8d66c..7481c587 100644 --- a/grap_change_views_product/views/view_product_product_tree.xml +++ b/grap_change_views_product/views/view_product_product_tree.xml @@ -144,18 +144,19 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).