Merge lp:~mukunde/unifield-server/US-9941 into lp:unifield-server

[jftempo]

[lp:~mukunde/unifield-server/US-9941]

6240. By Gaël Mukunde on 2022-08-25

US-9941 [IMP] Add french translation

=== modified file 'bin/addons/account_mcdb/account_period_state_view.xml'
--- bin/addons/account_mcdb/account_period_state_view.xml	2018-05-25 07:46:45 +0000
+++ bin/addons/account_mcdb/account_period_state_view.xml	2022-08-25 09:55:52 +0000
@@ -40,6 +40,7 @@
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <search string="Periods">
+                    <filter name="active" string="Active Instances" icon="terp-check" domain="[('instance_id.state', '=', 'active')]" />
                     <field name="instance_id" domain="[('instance_child_ids','=',True)]"/>
                     <field name="period_id" />
                     <field name="state" />

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-08-23 13:15:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-08-25 09:55:52 +0000
@@ -115376,6 +115376,7 @@
 #, python-format
 msgid "Cannot update these products, ED/BN attributes have not changed since the KCL creation"
 msgstr "Impossible de mettre à jour ces produits. Les attributs NL/DE n'ont pas changé depuis la création du Kit"
+<<<<<<< TREE
 
 #. module: board
 #: report:addons/board/report/integrity.mako:83
@@ -115817,3 +115818,11 @@
 msgid "Force Date and time of next execution"
 msgstr "Date et heure forcée de la prochiane exécution plannifiée"
 
+=======
+
+#. module: account_mcdb
+#: view:account.period.state:0
+msgid "Active Instances"
+msgstr "Instances actives"
+
+>>>>>>> MERGE-SOURCE