From 9051670a854c4749d00a427f682593db38c57136 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Tue, 31 Dec 2024 13:38:49 +0100
Subject: [PATCH] [FIX] exp_transaction_documents: domains and translation

---
 .../exp_transaction_documents/i18n/ar_001.po  |  1 +
 .../views/actions_and_menus.xml               | 27 +++++--------------
 .../views/incoming.xml                        |  5 ++--
 .../views/internal.xml                        |  3 ++-
 .../views/outgoing.xml                        |  3 ++-
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/odex25_transactions/exp_transaction_documents/i18n/ar_001.po b/odex25_transactions/exp_transaction_documents/i18n/ar_001.po
index e84ce0cb3..f3b88dadb 100644
--- a/odex25_transactions/exp_transaction_documents/i18n/ar_001.po
+++ b/odex25_transactions/exp_transaction_documents/i18n/ar_001.po
@@ -3057,6 +3057,7 @@ msgstr "مدير المعاملة"
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_transaction_transaction__name
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.common_transactions_form
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.transaction_details_report_temp
+#: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_incoming_transaction_filter
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_internal_transaction_filter
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_outgoing_transaction_filter
 msgid "Transaction Number"
diff --git a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
index 9070a033b..8c1226fb9 100644
--- a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
+++ b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
@@ -286,7 +286,7 @@
             <field name="res_model">internal.transaction</field>
 
             <field name="view_mode">tree,form</field>
-            <field name='domain'>[('state', 'in', ['canceled', 'closed']), '|', ('employee_id.user_id', '=', uid), ('to_ids.user_id', '=', uid)]</field>
+            <field name='domain'>[('state', '=', 'closed'), '|', ('employee_id.user_id', '=', uid), ('to_ids.user_id', '=', uid)]</field>
             <field name="view_id" ref="exp_transaction_documents.common_transaction_internal_tree"/>
             <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_internal_tree')}),
@@ -382,22 +382,7 @@
             <field name="res_model">incoming.transaction</field>
 
             <field name="view_mode">tree,form</field>
-            <field name='domain'>[
-                '&amp;',
-                ('state', '=', 'send'),
-                '|',
-                '&amp;',
-                    ('is_forward', '=', False),
-                    '|',
-                        ('to_ids.secretary_id.user_id', '=', uid),
-                        ('to_ids.user_id', '=', uid),
-                '&amp;',
-                    ('to_ids.user_id', '!=', uid),
-                    '|', '|',
-                        ('trace_ids.to_id.user_id', '=', uid),
-                        ('trace_ids.to_id.secretary_id.user_id', '=', uid),
-                        ('receive_user_id', '=', uid)
-            ]</field>
+            <field name="domain">[('employee_id.user_id', '=', uid)]</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">Create the first External Incoming Transaction
                 </p>
@@ -418,7 +403,7 @@
             <field name='domain'>[
                 '&amp;',
                 ('state', '=', 'send'),
-                '|',
+                '|', '|',
                 '&amp;',
                     ('is_forward', '=', False),
                     '|',
@@ -426,10 +411,12 @@
                         ('to_ids.user_id', '=', uid),
                 '&amp;',
                     ('to_ids.user_id', '!=', uid),
-                    '|', '|',
+                    '|', '|', '|',
                         ('trace_ids.to_id.user_id', '=', uid),
                         ('trace_ids.to_id.secretary_id.user_id', '=', uid),
-                        ('receive_user_id', '=', uid)
+                        ('receive_user_id', '=', uid),
+                        ('employee_id.user_id', '=', uid),
+                ('last_forwarded_user', '=', uid)
             ]</field>
             <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_external_tree')}),
diff --git a/odex25_transactions/exp_transaction_documents/views/incoming.xml b/odex25_transactions/exp_transaction_documents/views/incoming.xml
index c30c9b1f4..0d3bc7b97 100644
--- a/odex25_transactions/exp_transaction_documents/views/incoming.xml
+++ b/odex25_transactions/exp_transaction_documents/views/incoming.xml
@@ -10,7 +10,7 @@
                 <search string="incoming transaction">
                     <field name="subject"/>
                     <field name="to_ids"/>
-                    <field name="name" string="Transaction" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Transaction Number" filter_domain="[('name','ilike',self)]"/>
                     <field name="project_id" string="Project" filter_domain="[('project_id','ilike',self)]"/>
                     <field name="sale_order_id" string="Proposal" filter_domain="[('sale_order_id','ilike',self)]"/>
                     <field name="incoming_number" string="Incoming Number"
@@ -20,7 +20,8 @@
                     <field name="is_favorite"/>
                      <filter string="Subject Type" name="subject_type" domain="[('subject_type_id','=',False)]"/>
                      <filter string="State" name="state"   domain="[('state', 'in', ('complete','draft'))]"/>
-                    <filter string="Unread Transaction" name="unread" domain="[('is_reade','=',False)]"/>
+                    <field name="seen_user_ids" invisible="1"/>
+                    <filter string="Unread Transaction" name="unread" domain="[('seen_user_ids','!=',uid)]"/>
                     <filter string="Favorite" name="favorite" domain="[('is_favorite','=','1')]"/>
                     <group expand="1" string="Group By">
                         <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>
diff --git a/odex25_transactions/exp_transaction_documents/views/internal.xml b/odex25_transactions/exp_transaction_documents/views/internal.xml
index 1b88b557b..a0a515512 100644
--- a/odex25_transactions/exp_transaction_documents/views/internal.xml
+++ b/odex25_transactions/exp_transaction_documents/views/internal.xml
@@ -13,7 +13,8 @@
                     <field name="tran_tag" string="tag" filter_domain="[('tran_tag','ilike',self)]"/>
                     <field name="is_reade"/>
                     <field name="is_favorite"/>
-                    <filter string="Unread Transaction" name="unread" domain="[('is_reade','=',False)]"/>
+                    <field name="seen_user_ids" invisible="1"/>
+                    <filter string="Unread Transaction" name="unread" domain="[('seen_user_ids','!=',uid)]"/>
                     <filter string="Favorite" name="favorite" domain="[('is_favorite','=','1')]"/>
                      <filter string="Subject Type" name="subject_type" domain="[('subject_type_id','=',False)]"/>
                      <filter string="State" name="state"   domain="[('state', 'in', ('complete','draft'))]"/>
diff --git a/odex25_transactions/exp_transaction_documents/views/outgoing.xml b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
index 9ee617ae4..ae98c280d 100644
--- a/odex25_transactions/exp_transaction_documents/views/outgoing.xml
+++ b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
@@ -16,7 +16,8 @@
                     <field name="is_favorite"/>
                     <filter string="Subject Type" name="subject_type" domain="[('subject_type_id','=',False)]"/>
                     <filter string="State" name="state" domain="[('state', 'in',('complete','draft'))]"/>
-                    <filter string="Unread Transaction" name="unread" domain="[('is_reade','=',False)]"/>
+                    <field name="seen_user_ids" invisible="1"/>
+                    <filter string="Unread Transaction" name="unread" domain="[('seen_user_ids','!=',uid)]"/>
                     <filter string="Favorite" name="favorite" domain="[('is_favorite','=','1')]"/>
                     <group expand="1" string="Group By">
                         <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>