Merge lp:~dorian-kemps/unifield-server/US-11908 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-05-07 10:17:46 +0000
@@ -9002,8 +9002,9 @@
 msgid "Web Icon File (hover)"
 msgstr "Fichier de l'icone web (survol)"
 
-#. module: msf_doc_import
+#. module: msf_doc_import, purchase
 #: field:wizard.import.po.simulation.screen.line,esc_conf:0
+#: view:purchase.order:0
 msgid "ESC Confirmed"
 msgstr "ESC Confirmé"
 
@@ -121806,6 +121807,7 @@
 #, python-format
 msgid "This action can only be done on a Picking"
 msgstr "Cette action peut uniquement être faite sur un Picking"
+<<<<<<< TREE
 
 #. modules: purchase, sale
 #: code:addons/purchase/purchase_workflow.py:107
@@ -122096,3 +122098,10 @@
 msgid "No valid catalogue"
 msgstr "Aucun catalogue valide"
 
+=======
+
+#. modules: purchase
+#: view:purchase.order:0
+msgid "ESC Unconfirmed"
+msgstr "ESC Non Confirmé"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2024-04-23 10:38:10 +0000
+++ bin/addons/purchase/purchase_view.xml	2024-05-07 10:17:46 +0000
@@ -247,10 +247,21 @@
                                         $('#nr_ad_lines').append(has_ad_nr);
                                         $('#nr_ad_lines').show();
                                     }
+<<<<<<< TREE
                                     var catalogue_text = $('#catalogue_exists_text').val() ||  $('#catalogue_exists_text').text();
                                     if (catalogue_text) {
                                          $('#order_line_extra_text').html(catalogue_text);
                                     }
+=======
+                                    // Hide the ESC Confirmed filter if the PO does not have an ESC Partner
+                                    var partner_type = $('#partner_type').val() || $('#partner_type').text().trim();
+                                    if (partner_type == 'esc' || partner_type == 'ESC') {
+                                        $('#order_line_filter_0').show();
+                                    }
+                                    else {
+                                        $('#order_line_filter_0').hide();
+                                    }
+>>>>>>> MERGE-SOURCE
                                 </script>
                             </html>
                         </group>
@@ -332,9 +343,15 @@
                             </group>
                             <field name="order_line" colspan="4" nolabel="1" mode="tree,form"
                                 context="{'purchase_id': active_id, 'partner_type': partner_type, 'categ': categ, 'pricelist_id': pricelist_id, 'rfq_ok': False, 'from_fo': po_from_fo or po_from_ir or False}"
+<<<<<<< TREE
                                 on_change="order_line_change(order_line, show_default_msg, partner_id)"
                                 filter_selector="[('Show all', []), ('Hide closed', [('state', 'not in', ['done', 'cancel', 'cancel_r'])]), ('Show closed only', [('state', '=', 'done')]), ('Hide cancelled', [('state', 'not in', ['cancel', 'cancel_r'])]), ('Show cancelled only', [('state', 'in', ['cancel', 'cancel_r'])])]"
                                 default_selector="'3'" o2m_selectable="2"
+=======
+                                on_change="order_line_change(order_line, show_default_msg)"
+                                filter_selector="[('Show all', []), ('ESC Confirmed', [('esc_confirmed', '=', True)]), ('ESC Unconfirmed', [('esc_confirmed', '=', False)])], [('Show all', []), ('Hide closed', [('state', 'not in', ['done', 'cancel', 'cancel_r'])]), ('Show closed only', [('state', '=', 'done')]), ('Hide cancelled', [('state', 'not in', ['cancel', 'cancel_r'])]), ('Show cancelled only', [('state', 'in', ['cancel', 'cancel_r'])])]"
+                                default_selector="['0', '3']" o2m_selectable="2"
+>>>>>>> MERGE-SOURCE
                                 >
                                 <tree string="Lines" hide_delete_button="True" colors="red: mml_status == 'F' or msl_status == 'F' or to_correct_ok == True or inactive_product == True or red_color == True or (not origin and from_fo) or (not default_code and not nomenclature_description); #C8C8C8: fake_state == 'cancel'; orange:product_qty == 0.00;blue: soq_updated == True" noteditable="fake_state not in ['draft', 'draft_p', 'validated_n', 'validated']" button_attrs="{'invisible': ['|', ('state', 'not in', ['draft', 'draft_p', 'validated_p', 'validated']), '&amp;', ('partner_type', 'in', ['internal', 'intermission', 'section']), ('state', 'in', ['validated', 'validated_p'])]}" editable="both">
                                     <button name="get_error" type="object" icon="gtk-dialog-warning" string="Show error" attrs="{'invisible': [('to_correct_ok', '=', False), ('inactive_product', '=', False)]}" />

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2024-02-27 09:10:05 +0000
+++ bin/osv/orm.py	2024-05-07 10:17:46 +0000
@@ -1640,12 +1640,23 @@
             if node.get('filter_selector'):
                 try:
                     filter_eval = eval(node.get('filter_selector'))
-                    if filter_eval and isinstance(filter_eval, list):
-                        trans_filter_eval = []
-                        for x in filter_eval:
-                            trans_x = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], x[0])
-                            trans_filter_eval.append((trans_x, x[1]))
-                        node.set('filter_selector', '%s'%trans_filter_eval)
+                    if filter_eval:
+                        if isinstance(filter_eval, list):
+                            trans_filter_eval = []
+                            for x in filter_eval:
+                                trans_x = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], x[0])
+                                trans_filter_eval.append((trans_x, x[1]))
+                            node.set('filter_selector', '%s' % trans_filter_eval)
+                        elif isinstance(filter_eval, tuple):
+                            trans_filter_eval = []
+                            for t_filter in filter_eval:
+                                if filter_eval and isinstance(t_filter, list):
+                                    sub_trans_filter_eval = []
+                                    for x in t_filter:
+                                        trans_x = translation_obj._get_source(cr, user, self._name, 'view', context['lang'], x[0])
+                                        sub_trans_filter_eval.append((trans_x, x[1]))
+                                    trans_filter_eval.append(sub_trans_filter_eval)
+                            node.set('filter_selector', '%s' % trans_filter_eval)
                 except:
                     logger = netsvc.Logger()
                     logger.notifyChannel("translate.view", netsvc.LOG_WARNING, "Unable to translate %s" % node.get('filter_selector'))

=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2024-03-22 12:37:45 +0000
+++ bin/tools/translate.py	2024-05-07 10:17:46 +0000
@@ -487,9 +487,15 @@
     if de.get("filter_selector"):
         try:
             eval_filter = safe_eval(de.get('filter_selector'))
-            if eval_filter and isinstance(eval_filter, list):
-                for x in eval_filter:
-                    res.append(x[0])
+            if eval_filter:
+                if isinstance(eval_filter, list):
+                    for x in eval_filter:
+                        res.append(x[0])
+                elif isinstance(eval_filter, tuple):
+                    for t_filter in eval_filter:
+                        if isinstance(t_filter, list):
+                            for x in t_filter:
+                                res.append(x[0])
         except Exception:
             logger.warning('Unable to translate filter_selector: %s' % de.get('filter_selector'))
     if de.tag == 'translate':