Merge PR #355 into 12.0

Signed-off-by legalsylvain

grap_change_views_mrp/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-03 14:54+0000\n"
-"PO-Revision-Date: 2023-11-03 14:54+0000\n"
+"POT-Creation-Date: 2024-01-25 13:27+0000\n"
+"PO-Revision-Date: 2024-01-25 13:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -50,6 +50,11 @@ msgstr "<b>Fiche technique</b> - produit intermédiaire 🧩"
 msgid "<span> (for 1x</span>"
 msgstr "<span> (pour 1x</span>"
 
+#. module: grap_change_views_mrp
+#: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap
+msgid "<span> hours</span>"
+msgstr "<span> heures</span>"
+
 #. module: grap_change_views_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap
 msgid "<span> kg</span>"
@@ -111,16 +116,6 @@ msgstr "Fiche technique"
 msgid "Bill of Material Line"
 msgstr "Ligne de fiche technique"
 
-#. module: grap_change_views_mrp
-#: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_tree_grap_handle_price
-msgid "Bills of Materials - Handling Prices"
-msgstr "Fiches techniques - Gérer les prix"
-
-#. module: grap_change_views_mrp
-#: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_tree_grap_handle_price_sale_nok
-msgid "Bills of Materials Intermediate - Handling Prices"
-msgstr "Fiches techniques de produits intermédiaires - Gérer les prix"
-
 #. module: grap_change_views_mrp
 #: model:ir.actions.act_window,name:grap_change_views_mrp.action_grap_mrp_bom_all
 #: model:ir.actions.act_window,name:grap_change_views_mrp.action_grap_mrp_bom_finished_products
@@ -323,8 +318,8 @@ msgstr "Nom"
 
 #. module: grap_change_views_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap
-msgid "Net cost ℹ️"
-msgstr "Coût net ℹ️"
+msgid "Net cost"
+msgstr "Coût net"
 
 #. module: grap_change_views_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap
@@ -408,8 +403,8 @@ msgstr "Saisonnalités"
 
 #. module: grap_change_views_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap
-msgid "Seasonality ℹ️"
-msgstr "Saisonnalité ℹ️"
+msgid "Seasonality"
+msgstr "Saisonnalité"
 
 #. module: grap_change_views_mrp
 #: model_terms:ir.ui.view,arch_db:grap_change_views_mrp.view_mrp_bom_form_grap

grap_change_views_mrp/views/view_mrp_bom.xml

@@ -128,10 +128,10 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                       <field name="currency_id" invisible="1"/>
                       <!-- Standard price -->
                       <field name="diff_product_bom_standard_price" invisible="1"/>
-                      <field name="standard_price_total" string="Net cost ℹ️" class="oe_inline" widget="monetary"
+                      <field name="standard_price_total" string="Net cost" class="oe_inline" widget="monetary"
                              options="{'currency_field': 'currency_id'}"
                              attrs="{'invisible': [('diff_product_bom_standard_price', '!=', 0)]}"/>
-                      <label for="standard_price_total" string="Net cost ℹ️"
+                      <label for="standard_price_total" string="Net cost"
                              attrs="{'invisible': [('diff_product_bom_standard_price', '=', 0)]}"/>
                       <div attrs="{'invisible': [('diff_product_bom_standard_price', '=', 0)]}">
                           <field name="standard_price_total" class="oe_inline" widget="monetary" options="{'currency_field': 'currency_id'}"/>
@@ -159,13 +159,17 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                       </div>
                       <!-- / mrp_bom_sale_product_margin -->
                       <!-- mrp_business -->
-                      <field name="time_to_produce"/>
+                      <label for="time_to_produce"/>
+                      <div class="o_row" name="time_to_produce">
+                          <field name="time_to_produce" widget="float_time"/>
+                          <span> hours</span>
+                      </div>
                       <!-- / mrp_business -->
                       <field name="routing_id" groups="mrp.group_mrp_routings"/>
                   </group>
                   <group string="Food informations">
                     <!-- mrp_food -->
-                    <field name="bom_season_ids" string="Seasonality ℹ️" groups="mrp_food.seasonality_manager" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
+                    <field name="bom_season_ids" string="Seasonality" groups="mrp_food.seasonality_manager" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
                     <field name="is_bom_seasonal" groups="base.group_no_one"/>
                     <field name="are_bom_lines_seasonals" groups="base.group_no_one"/>
                     <field name="bom_label_ids" widget="many2many_tags"/>

mrp_business/i18n/fr.po

@@ -6,19 +6,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 09:49+0000\n"
-"PO-Revision-Date: 2023-10-23 09:49+0000\n"
+"POT-Creation-Date: 2024-01-25 13:25+0000\n"
+"PO-Revision-Date: 2024-01-25 13:25+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: mrp_business
+#: model_terms:ir.ui.view,arch_db:mrp_business.view_mrp_business_bom_form
+msgid "<span> hours</span>"
+msgstr "<span> heures</span>"
+
 #. module: mrp_business
 #: model:ir.model.fields,help:mrp_business.field_product_product__tla
 msgid "A three-letter acronym (TLA), or three-letter abbreviation, is an abbreviation consisting of three letters."
-msgstr ""
+msgstr "Un trigramme est une abréviation constituée de trois lettres."
 
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__code_nb
@@ -35,11 +40,6 @@ msgstr "Fiche technique"
 msgid "Bill of Material Line"
 msgstr "Ligne de fiche technique"
 
-#. module: mrp_business
-#: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__bom_components_total_weight
-msgid "Bom Components Total Weight"
-msgstr "Poids total"
-
 #. module: mrp_business
 #: sql_constraint:mrp.meal.category:0
 msgid "Category name already exists"
@@ -58,7 +58,7 @@ msgstr "Code de la fiche technique, composé du trigramme de votre activité, du
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_meal_category__company_id
 msgid "Company"
-msgstr "Société"
+msgstr ""
 
 #. module: mrp_business
 #: model_terms:ir.ui.view,arch_db:mrp_business.view_mrp_business_product_form
@@ -80,6 +80,11 @@ msgstr "Créé le"
 msgid "Currency"
 msgstr "Devise"
 
+#. module: mrp_business
+#: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__diff_bom_qty_and_net_quantities
+msgid "Diff Bom Qty And Net Quantities"
+msgstr ""
+
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_meal_category__display_name
 msgid "Display Name"
@@ -148,7 +153,7 @@ msgid "Meal category"
 msgstr "Catégorie de repas"
 
 #. module: mrp_business
-#: code:addons/mrp_business/models/mrp_bom.py:86
+#: code:addons/mrp_business/models/mrp_bom.py:88
 #, python-format
 msgid "No Trigram on product %s "
 msgstr "Aucun trigramme sur l'Article %s "
@@ -180,19 +185,14 @@ msgstr "Article"
 
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__code
-msgid "Reference ℹ️"
-msgstr "Référence ℹ️"
+msgid "Reference"
+msgstr "Référence"
 
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_meal_category__sequence
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: mrp_business
-#: model:ir.model.fields,help:mrp_business.field_mrp_bom__time_to_produce
-msgid "Set this time with the unity of measure you want"
-msgstr "Temps à écrire avec l'unité de mesure que vous voulez."
-
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__description_short
 msgid "Short description"
@@ -201,7 +201,12 @@ msgstr "Description"
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__time_to_produce
 msgid "Time To Produce"
-msgstr "Temps"
+msgstr "Temps de production"
+
+#. module: mrp_business
+#: model:ir.model.fields,help:mrp_business.field_mrp_bom__time_to_produce
+msgid "Time in hour to produce this BoM."
+msgstr "Temps en heures de production de la Fiche Technique."
 
 #. module: mrp_business
 #: model:ir.model.fields,field_description:mrp_business.field_mrp_bom__tla_to_change
@@ -225,23 +230,13 @@ msgstr "Trigramme déjà utilisé par un autre produit : %s."
 msgid "Very High"
 msgstr "Très haute"
 
-#. module: mrp_business
-#: model:ir.model.fields,field_description:mrp_business.field_mrp_bom_line__line_weight
-msgid "Weight"
-msgstr "Poids (kg)"
-
-#. module: mrp_business
-#: model:ir.model.fields,field_description:mrp_business.field_mrp_bom_line__line_weight_percentage
-msgid "Weight %"
-msgstr "Poids %"
-
 #. module: mrp_business
 #: model:ir.model.fields,help:mrp_business.field_mrp_bom__code_nb
 msgid "You can change it manually here and it will change reference."
 msgstr "Vous pouvez le changer directement ici et ça changera le code de la fiche technique."
 
 #. module: mrp_business
-#: code:addons/mrp_business/models/mrp_bom.py:83
+#: code:addons/mrp_business/models/mrp_bom.py:85
 #, python-format
 msgid "You need to change default trigram on product set to %s."
 msgstr "Vous devez changer le trigramme du produit qui a été défini à %s."

mrp_business/models/mrp_bom.py

@@ -39,17 +39,15 @@ class MrpBom(models.Model):
         store=True,
     )
     code = fields.Char(
-        string="Reference ℹ️",
+        string="Reference",
         compute="_compute_proposal_code",
         help="Code of the BoM, composed of the trigram of your activity, the "
         "trigram of the product (which can be modified on its form) and a unique number",
         store=True,
     )
 
     # ========== Fields for Time
-    time_to_produce = fields.Float(
-        help="Set this time with the unity of measure you want", store=True
-    )
+    time_to_produce = fields.Float(help="Time in hour to produce this BoM.", store=True)
     # ========== Fields for mrp_bom_line_net_qty
     diff_bom_qty_and_net_quantities = fields.Float(
         digits=dp.get_precision("Product Price"),

mrp_business/views/view_mrp_bom.xml

@@ -25,7 +25,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
             <xpath expr="//field[@name='routing_id']" position="after">
                 <br/>
                 <br/>
-                <field name="time_to_produce"/>
+                <label for="time_to_produce"/>
+                <div class="o_row" name="time_to_produce">
+                    <field name="time_to_produce" widget="float_time"/>
+                    <span> hours</span>
+                </div>
             </xpath>
             <xpath expr="//field[@name='code']" position="after">
                 <field name="tla_to_change" invisible="1"/>

mrp_food/i18n/fr.po

@@ -344,6 +344,7 @@ msgstr "Saisonnalité du produit"
 
 #. module: mrp_food
 #: model:ir.model,name:mrp_food.model_seasonality
+#: model_terms:ir.ui.view,arch_db:mrp_food.view_mrp_bom_form
 #: model:ir.model.fields,field_description:mrp_food.field_mrp_bom__bom_season_ids
 #: model:ir.model.fields,field_description:mrp_food.field_seasonality_line__seasonality_id
 msgid "Seasonality"
@@ -369,11 +370,6 @@ msgstr "Période de la saisonnalité"
 msgid "Seasonality name"
 msgstr "Nom de la Saisonnalité"
 
-#. module: mrp_food
-#: model_terms:ir.ui.view,arch_db:mrp_food.view_mrp_bom_form
-msgid "Seasonality ℹ️"
-msgstr "Saisonnalité ℹ️"
-
 #. module: mrp_food
 #: model:ir.model.fields,help:mrp_food.field_mrp_bom__bom_season_ids
 msgid "Select the seasonality(s) of this Bill of material. Helps visually to know which recipe is in season or not."

mrp_food/views/view_mrp_bom.xml

@@ -34,7 +34,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
             </xpath>
             <xpath expr="//field[@name='company_id']" position="after">
                 <br/>
-                <field name="bom_season_ids" string="Seasonality ℹ️" groups="mrp_food.seasonality_manager" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
+                <field name="bom_season_ids" string="Seasonality" groups="mrp_food.seasonality_manager" widget="many2many_tags" options="{'color_field': 'color', 'no_quick_create': True}"/>
                 <field name="is_bom_seasonal" groups="base.group_no_one"/>
                 <field name="are_bom_lines_seasonals" groups="base.group_no_one"/>
                 <field name="bom_allergen_ids" widget="many2many_tags"/>