Merge PR #344 into 12.0

Signed-off-by legalsylvain

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-21 11:20+0000\n"
+"PO-Revision-Date: 2023-11-21 11:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,11 +30,6 @@ msgstr "<span class=\"o_stat_text\">Prévisions</span>"
 msgid "<span class=\"o_stat_text\">On Hand</span>"
 msgstr "<span class=\"o_stat_text\">Disponible</span>"
 
-#. module: grap_change_views_product
-#: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
-msgid "<span class=\"unity_for_time_to_produce\"> minutes</span>"
-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,17 +102,44 @@ 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:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_id
+msgid "Country (Ingredients)"
+msgstr "Pays (ingrédients)"
+
+#. module: grap_change_views_product
+#: model:ir.model.fields,field_description:grap_change_views_product.field_product_product__country_group_id
+msgid "Country Group (Ingredients)"
+msgstr "Groupe de pays (ingrédients)"
+
 #. 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."
 msgstr "Générer un trigramme automatiquement. Cela change les codes références des fiches techniques du 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_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:ir.model.fields,field_description:grap_change_views_product.field_product_product__department_id
+msgid "Department (Ingredients)"
+msgstr "Département (ingrédients)"
+
 #. module: grap_change_views_product
 #: model_terms:ir.ui.view,arch_db:grap_change_views_product.view_product_product_form
 msgid "Description"
@@ -163,6 +186,18 @@ msgstr "Informations complémentaires"
 msgid "Fields only configurable for raw materials."
 msgstr "Champs modifiables seulement pour les articles de matières premières"
 
+#. module: grap_change_views_product
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_group_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__country_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__department_id
+#: model:ir.model.fields,help:grap_change_views_product.field_product_product__state_id
+msgid "Fill in the origin of the ingredients. \n"
+" If it has several ingredients, take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because the chocolate comes from South America. Example 2 coelslaw with local products: choose the Puy-de-dôme department. \n"
+" Mandatory for Fruits & Vegetables, and meat."
+msgstr "Remplir l'origine des ingrédients. \n"
+" S'il a plusieurs ingrédients, prendre le dénominateur d'origine le plus large. Exemple 1 pour du crunchy : UE / non UE car le chocolat vient d'Amérique du sud. Exemple 2 coelslaw avec des produits locaux : choisir le département du Puy-de-dôme. \n"
+" Obligatoire pour les Fruits & Légumes et la viande."
+
 #. module: grap_change_views_product
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_mrp_handle_prices_standard_prices_3a_finished
 msgid "Finished Products"
@@ -207,6 +242,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"
@@ -349,6 +385,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 brut 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
@@ -372,6 +413,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"
@@ -431,18 +473,18 @@ msgstr "Articles (Catégories)"
 msgid "Products (Food)"
 msgstr "Articles (Alimentaire)"
 
+#. 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 (Ingredients origin)"
+msgstr "Articles (origine ingrédients)"
+
 #. module: grap_change_views_product
 #: model:ir.actions.act_window,name:grap_change_views_product.action_product_product_joint_buying
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_joint_buying
 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
@@ -479,11 +521,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 +547,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"
@@ -566,6 +608,11 @@ 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 (Ingredients)"
+msgstr "Région (Ingrédients)"
+
 #. module: grap_change_views_product
 #: model:ir.ui.menu,name:grap_change_views_product.menu_product_product_stock
 msgid "Stock Situation"
@@ -595,12 +642,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
@@ -688,13 +735,13 @@ msgstr "Mettre à jour le stock disponible"
 #: 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 for product standard price"
-msgstr "Utiliser ce prix pour le coût de l'article"
+msgstr "Utiliser ce montant pour le coût de l'article"
 
 #. 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 "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
@@ -712,6 +759,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,35 +785,30 @@ 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"
 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 - Ingredients origin"
+msgstr "🌱 Infos réglementaires bio - origine des ingrédients"
 
 #. 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

grap_change_views_product/models/product_product.py

@@ -26,6 +26,38 @@ class ProductProduct(models.Model):
 
     # Overload Column Section
     standard_price = fields.Float(copy=True)
+    country_group_id = fields.Many2one(
+        string="Country Group (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    country_id = fields.Many2one(
+        string="Country (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    state_id = fields.Many2one(
+        string="State (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
+    department_id = fields.Many2one(
+        string="Department (Ingredients)",
+        help="Fill in the origin of the ingredients. \n If it has several ingredients, "
+        "take the widest denominator of origin. Example 1 for crunchy: EU / non-EU because"
+        " the chocolate comes from South America. Example 2 coelslaw"
+        " with local products: choose the Puy-de-dôme department. \n"
+        " Mandatory for Fruits & Vegetables, and meat.",
+    )
 
     # Compute Section
     @api.multi

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)]}"/>
                                             <field name="multiplier_qty" string="Multiplier Qty"/>
                                             <field name="min_qty" string="Min Qty"/>
-                                            <field name="price" widget="monetary" options="{'field_digits': True}"/>
+                                            <field name="price" string="Price Supp UoM" widget="monetary" options="{'field_digits': True}"/>
                                             <field name="product_uom" string="UoM"/>
                                             <field name="discount" string="Disc. 1 %"/>
                                             <field name="discount2"  string="Disc. 2 %"/>
@@ -281,22 +281,24 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                             </group>
                         </page>
                         <page string="Extra Informations">
-                                <group>
-                                <group string="🚩 Production place">
-                                    <field name="maker_description"/>
-                                    <field name="department_id"/>
-                                    <field name="state_id"/>
-                                    <field name="country_id"/>
-                                    <field name="origin_description"/>
+                            <group>
+                                <group string="🌱 Organic informations - Labels">
+                                  <field name="is_uncertifiable" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
+                                  <field name="label_ids" widget="many2many_tags"/>
+                                  <field name="organic_type"/>
                                 </group>
-                                <group string="🌱 Organic informations">
+                                <group string="🌱 Organic informations - Ingredients origin">
                                     <field name="country_group_id"/>
-                                    <field name="label_ids" widget="many2many_tags"/>
-                                    <field name="is_uncertifiable" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
-                                    <field name="organic_type"/>
+                                    <field name="country_id"/>
+                                    <field name="state_id"/>
+                                    <field name="department_id"/>
+                                    <field name="origin_description"/>
                                     <field name="pricetag_origin"/>
+                                    <br/>
                                 </group>
-                                <group string="🍴 Alimentary informations">
+                                <group string="🍴 Alimentary and production informations 🚩">
+                                    <field name="maker_description"/>
+                                    <br/>
                                     <field name="is_vegan"/>
                                     <field name="is_alcohol" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>
                                     <field name="best_before_date_day" attrs="{'invisible': [('is_alimentary', '=', False)]}"/>