[REF] Move certifier.organization from product_food to product_food_c…

…ertification [REF] product_food : move organic_type into product_food_certification [UPD] French translation [REM] Remove obsolete mass editing button for is_alimentary field.
grap · Apr 8, 2024 · 6d1da49 · 6d1da49
1 parent 7273fd4
commit 6d1da49
Show file tree

Hide file tree

Showing 48 changed files with 1,126 additions and 303 deletions.
diff --git a/product_food/__manifest__.py b/product_food/__manifest__.py
@@ -9,30 +9,23 @@
     "author": "GRAP",
     "website": "https://github.com/grap/grap-odoo-business",
     "license": "AGPL-3",
-    "depends": ["product_label", "product_net_weight", "product_origin"],
+    "depends": ["product_label"],
     "data": [
         "security/res_groups.xml",
         "security/ir_rule.xml",
         "security/ir.model.access.csv",
-        "views/view_certifier_organization.xml",
         "views/view_product_label.xml",
         "views/view_product_allergen.xml",
         "views/view_product_category.xml",
         "views/view_product_product.xml",
         "views/view_product_template.xml",
-        "views/view_res_company.xml",
     ],
     "demo": [
-        "demo/res_groups.xml",
-        "demo/certifier_organization.xml",
         "demo/product_label.xml",
         "demo/product_allergen.xml",
         "demo/product_category.xml",
         "demo/product_product.xml",
     ],
-    "images": [
-        "static/description/certifier_organization_form.png",
-        "static/description/product_allergen_form.png",
-    ],
+    "external_dependencies": {"python": ["unidecode", "bs4"]},
     "installable": True,
 }
diff --git a/product_food/demo/product_label.xml b/product_food/demo/product_label.xml
@@ -7,10 +7,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
 
-    <record id="product_label.label_agriculture_biologique" model="product.label">
-        <field name="organic_type">01_organic</field>
-    </record>
-
     <record id="label_alcool_grossesse" model="product.label">
         <field name="name">Alcool and Pregnancy</field>
         <field name="code">ALC</field>
@@ -23,7 +19,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="name">Demeter</field>
         <field name="code">DEM</field>
         <field name="website">https://www.demeter.fr/</field>
-        <field name="organic_type">02_agroecological</field>
         <field name="image" type="base64" file="product_food/static/img/label_demeter-image.png"/>
     </record>
 

diff --git a/product_food/demo/product_product.xml b/product_food/demo/product_product.xml
@@ -19,6 +19,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="label_ids" eval="[
             (4, ref('product_label.label_agriculture_biologique')),
         ]"/>
+        <field name="ingredients">Arachides de Chine issues de l'agriculture biologique</field>
+        <field name="best_before_date_day">365</field>
     </record>
 
 

diff --git a/product_food/i18n/fr.po b/product_food/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: 2021-08-04 13:57+0000\n"
-"PO-Revision-Date: 2021-08-04 13:57+0000\n"
+"POT-Creation-Date: 2024-04-08 13:57+0000\n"
+"PO-Revision-Date: 2024-04-08 13:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,45 +22,21 @@ msgid "'Is Alimentary' should be checked for categories set as 'Contain Alcohol'
 msgstr "'Est alimentaire' doit être coché pour les categories 'contient de l'alcool'"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__active
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__active
 msgid "Active"
 msgstr "Actif"
 
-#. module: product_food
-#: selection:product.label,organic_type:0
-#: selection:product.product,organic_type:0
-msgid "Agroecological"
-msgstr "Agro-écologique"
-
 #. module: product_food
 #: model:ir.model.fields,field_description:product_food.field_product_product__alcohol_by_volume
 #: model:ir.model.fields,field_description:product_food.field_product_template__alcohol_by_volume
 msgid "Alcohol by Volume"
 msgstr "Degré d'alcool"
 
-#. module: product_food
-#: selection:product.product,organic_type:0
-msgid "Aliment Not Certified"
-msgstr "Aliment non certifié"
-
-#. module: product_food
-#: selection:product.product,organic_type:0
-msgid "Aliment Uncertifiable"
-msgstr "Aliment non certifiable"
-
 #. module: product_food
 #: model:product.category,name:product_food.alimentary_category
 msgid "Alimentary"
 msgstr "Alimentaire"
 
-#. module: product_food
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form_variant
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_template_form
-msgid "Alimentary Composition"
-msgstr "Composition alimentaire"
-
 #. module: product_food
 #: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form
 #: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form_variant
@@ -74,12 +50,15 @@ msgstr "Informations alimentaires"
 #: model:ir.model.fields,field_description:product_food.field_product_product__allergen_ids
 #: model:ir.model.fields,field_description:product_food.field_product_template__allergen_ids
 #: model:ir.ui.menu,name:product_food.menu_product_allergen
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_product_form_variant
-#: model_terms:ir.ui.view,arch_db:product_food.view_product_template_form
 msgid "Allergens"
 msgstr "Allergènes"
 
+#. module: product_food
+#: model:ir.model.fields,field_description:product_food.field_product_product__trace_allergen_ids
+#: model:ir.model.fields,field_description:product_food.field_product_template__trace_allergen_ids
+msgid "Allergens (Traces)"
+msgstr "Allergènes (Traces)"
+
 #. module: product_food
 #: model:res.groups,name:product_food.group_allergen_manager
 msgid "Allergens Creation"
@@ -108,47 +87,21 @@ msgstr "DLUO (j)"
 msgid "Bière Lammsbrau sans gluten 33cl"
 msgstr ""
 
-#. module: product_food
-#: model:ir.model,name:product_food.model_certifier_organization
-#: model:ir.model.fields,field_description:product_food.field_product_product__certifier_organization_id
-#: model:ir.model.fields,field_description:product_food.field_product_template__certifier_organization_id
-#: model:ir.model.fields,field_description:product_food.field_res_company__certifier_organization_id
-msgid "Certifier Organization"
-msgstr "Organisation certificatrice"
-
-#. module: product_food
-#: model:ir.actions.act_window,name:product_food.action_certifier_organization
-#: model:ir.ui.menu,name:product_food.menu_certifier_organization
-msgid "Certifier Organizations"
-msgstr "Organisations certificatrices"
-
 #. module: product_food
 #: model:res.groups,name:product_food.group_certifier_manager
 msgid "Certifier Organizations Creation"
 msgstr "Création d'organisations certificatrices"
 
-#. module: product_food
-#: model:ir.model.fields,help:product_food.field_product_product__is_uncertifiable
-#: model:ir.model.fields,help:product_food.field_product_template__is_uncertifiable
-msgid "Check this box for alimentary products that are uncertifiable by definition. For exemple: Products that comes from the sea"
-msgstr "cocher cette case pour les articles alimentaires qui sont non certifiable par définition. par exemple, les produits issues de la mer."
-
 #. module: product_food
 #: model:ir.model.fields,help:product_food.field_product_label__is_alcohol
 msgid "Check this box if this label is a label that mentions that products contain alcohol. If checked, the products that contains alcohol will have this label set automatically."
 msgstr "Cocher cette case si le label est un label qui mentionne que l'article contient de l'alcool. Si coché, les articles qui contiennent de l'alcool auront ce label automatiquement paramétré"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__code
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__code
 msgid "Code"
 msgstr ""
 
-#. module: product_food
-#: model:ir.model,name:product_food.model_res_company
-msgid "Companies"
-msgstr "Sociétés"
-
 #. module: product_food
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__company_id
 msgid "Company"
@@ -172,7 +125,7 @@ msgstr "Contient des articles alimentaires"
 
 #. module: product_food
 #: model:ir.model.fields,field_description:product_food.field_product_category__is_vegan
-msgid "Contain only vegan products"
+msgid "Contain Vegan Products"
 msgstr "Contient seulement des articles végan"
 
 #. module: product_food
@@ -181,19 +134,16 @@ msgid "Cool (< 4°)"
 msgstr "Froid (< 4°)"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__create_uid
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__create_date
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__display_name
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__display_name
 msgid "Display Name"
 msgstr "Nom affiché"
@@ -209,7 +159,11 @@ msgid "Frozen (< -18°)"
 msgstr "Congelé (<-18°)"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__id
+#: model:ir.model.fields,field_description:product_food.field_product_label__is_alcohol
+msgid "Has Alcohol"
+msgstr "Contient de l'alcool"
+
+#. module: product_food
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__id
 msgid "ID"
 msgstr ""
@@ -235,37 +189,36 @@ msgid "If this box is checked, the products that have this label will be set as
 msgstr "Si la case est cochée, les articles qui ont ce label seront marqués comme 'végan' par défaut"
 
 #. module: product_food
-#: code:addons/product_food/models/product_product.py:141
+#: code:addons/product_food/models/product_product.py:77
 #, python-format
 msgid "Incorrect Setting. Alcohol by volume should be between 0 and 100."
 msgstr "Paramétrage incorrect. Le degré d'alcool doit être compris entre 0 et 100."
 
 #. module: product_food
-#: code:addons/product_food/models/product_product.py:127
+#: code:addons/product_food/models/product_product.py:63
 #, python-format
 msgid "Incorrect Setting. The product %s could not have volume AND net weight at the same time."
 msgstr "Paramétrage incorrect. L'article %s ne peut pas être paramétré avec volume ET un poids net en même temps."
 
 #. module: product_food
-#: code:addons/product_food/models/product_product.py:168
+#: code:addons/product_food/models/product_product.py:104
 #, python-format
 msgid "Incorrect Setting. the product %s has a label that mentions that the product contains  alcohol, but the 'Contain Alcohol' is not checked."
 msgstr "Paramétrage incorrect. L'article %s a un label qui mentionne que le produit contient de l'alcool, mais la case 'Contient de l'alcool' n'est pas cochée"
 
 #. module: product_food
-#: code:addons/product_food/models/product_product.py:185
+#: code:addons/product_food/models/product_product.py:121
 #, python-format
 msgid "Incorrect Setting. the product %s has a label that mentions that the product is vegan but the 'Vegan product' is not checked."
 msgstr "Paramétrage incorrect. Le produit %s a un label qui mentionne que le produit est végan, mais case 'Est végan' n'est pas cochée"
 
 #. module: product_food
-#: code:addons/product_food/models/product_product.py:157
+#: code:addons/product_food/models/product_product.py:93
 #, python-format
 msgid "Incorrect Setting. the product %s is checked as 'Contain Alcohol' but some related labels are not set."
 msgstr "Paramétrage incorrect. Le produit %s est coché comme 'Contient de l'alcool', mais certains labels associés ne sont pas mis."
 
 #. module: product_food
-#: model_terms:ir.ui.view,arch_db:product_food.view_certifier_organization_form
 #: model_terms:ir.ui.view,arch_db:product_food.view_product_allergen_form
 msgid "Information"
 msgstr ""
@@ -279,78 +232,45 @@ msgstr ""
 msgid "Ingredients"
 msgstr "Ingrédients"
 
-#. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_product_label__is_alcohol
-msgid "Is Alcohol"
-msgstr "Contient de l'alcool"
-
 #. module: product_food
 #: model:ir.model.fields,field_description:product_food.field_product_product__is_alimentary
 #: model:ir.model.fields,field_description:product_food.field_product_template__is_alimentary
 msgid "Is Alimentary"
 msgstr "Est alimentaire"
 
 #. module: product_food
+#: model:ir.model.fields,field_description:product_food.field_product_label__is_vegan
 #: model:ir.model.fields,field_description:product_food.field_product_product__is_vegan
 #: model:ir.model.fields,field_description:product_food.field_product_template__is_vegan
 msgid "Is Vegan"
 msgstr "Végan"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization____last_update
 #: model:ir.model.fields,field_description:product_food.field_product_allergen____last_update
 msgid "Last Modified on"
 msgstr "Dernière modification le"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__write_uid
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__write_uid
 msgid "Last Updated by"
 msgstr "Dernière mise à jour par"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__write_date
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__write_date
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__name
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__name
 #: model_terms:ir.ui.view,arch_db:product_food.view_product_allergen_form
 msgid "Name"
 msgstr "Nom"
 
 #. module: product_food
-#: selection:product.product,organic_type:0
-msgid "Not Alimentary"
-msgstr "Non alimentaire"
-
-#. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_product_product__is_uncertifiable
-#: model:ir.model.fields,field_description:product_food.field_product_template__is_uncertifiable
-msgid "Not Certifiable"
-msgstr "Non certifiable"
-
-#. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__note
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__note
 msgid "Note"
 msgstr ""
 
-#. module: product_food
-#: selection:product.label,organic_type:0
-#: selection:product.product,organic_type:0
-msgid "Organic"
-msgstr "Biologique"
-
-#. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_product_label__organic_type
-#: model:ir.model.fields,field_description:product_food.field_product_product__organic_type
-#: model:ir.model.fields,field_description:product_food.field_product_template__organic_type
-msgid "Organic Category"
-msgstr "Catégorie biologique"
-
 #. module: product_food
 #: model:ir.model,name:product_food.model_product_product
 msgid "Product"
@@ -404,12 +324,6 @@ msgid "Use-by Date Day"
 msgstr "DLC (j)"
 
 #. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_product_label__is_vegan
-msgid "Vegan products"
-msgstr "Article végan"
-
-#. module: product_food
-#: model:ir.model.fields,field_description:product_food.field_certifier_organization__website
 #: model:ir.model.fields,field_description:product_food.field_product_allergen__website
 msgid "Website"
 msgstr "Site Web"