From ce22ada8d14179ac5840e6bc8e6ba1b9cc1df8e5 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:52:53 +0300
Subject: [PATCH 01/14] Update transaction.py

---
 .../exp_transaction_documents/models/transaction.py              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_transactions/exp_transaction_documents/models/transaction.py b/odex25_transactions/exp_transaction_documents/models/transaction.py
index f397addb6..c43cbeea5 100644
--- a/odex25_transactions/exp_transaction_documents/models/transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/transaction.py
@@ -53,6 +53,7 @@ class Transaction(models.Model):
         string='')
     current_is_manager = fields.Boolean(string='Is Manager', compute="set_is_manager")
     current_is_forward_user = fields.Boolean(string='Is Manager', compute="set_is_forward_user")
+    is_branch = fields.Boolean(string='Is Branch?')
     current_user = fields.Boolean("current user", compute='_default_current_user')
     reason = fields.Text(string="Reject Reason")
     forward_user_id = fields.Many2one(comodel_name='res.users', string='Forward User')

From edccb8eaad697cfccd809c93d5d62f729568ccfd Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:54:45 +0300
Subject: [PATCH 02/14] Update incoming_transaction.py

---
 .../exp_transaction_documents/models/incoming_transaction.py     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
index f67479918..a57e87800 100644
--- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
@@ -50,6 +50,7 @@ class IncomingTransaction(models.Model):
     attachment_rule_ids = fields.One2many('cm.attachment.rule', 'incoming_transaction_id', string='Attaches')
     attachment_ids = fields.One2many('cm.attachment', 'incoming_transaction_id', string='Attachments')
     trace_ids = fields.One2many('cm.transaction.trace', 'incoming_transaction_id', string='Trace Log')
+    is_branch = fields.Boolean(string='Is Branch?')
     to_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_rel', column1='incoming_id'
                               , column2='entity_id', string='Send To')
     cc_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_cc_rel',

From f3f131e3710d077c5136c769b60325e5132d85b7 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 19:57:30 +0300
Subject: [PATCH 03/14] Update transcation_common_view.xml

---
 .../views/transcation_common_view.xml                         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
index fb3ae55bc..5e71dfcc2 100644
--- a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
+++ b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
@@ -76,6 +76,7 @@
                            domain="[('type', 'in', ['unit','employee'])]" options="{'no_create':True,'no_open':True}"/>
                     <field name="tran_tag" widget="many2many_tags"
                            options="{'no_create':True}"/>
+                    <field name="is_branch"/>
                 </xpath>
                 <xpath expr="//field[@name='important_id']" position="after">
                     <field name="project_domain" widget="many2many_tags"
@@ -185,6 +186,7 @@
                 <xpath expr="//field[@name='subject']" position="after">
                     <field name="to_ids" widget="many2many_tags" domain="[('type', 'in', ['employee','unit'])]"
                            options="{'no_create':True,'no_open':True}"/>
+                    <field name="is_branch"/>
                 </xpath>
                 <xpath expr="//field[@name='transaction_date_hijri']" position="after">
                     <!--                    <field name="outgoing_transaction_id" domain="[('partner_id', '=', partner_id)]"/>-->
@@ -296,6 +298,8 @@
                            attrs="{'required':True,'readonly':[('state','not in', ['draft'])]}"
                            domain="[('type', '=', 'external')]"/>
                     <field name="to_name"/>
+                  <field name="is_branch"/>
+
                 </xpath>
                 <xpath expr="//field[@name='transaction_date_hijri']" position="after">
                     <field name="cc_ids" widget="many2many_tags" domain="[('type', 'in', ['employee', 'unit'])]"

From 5fd337c118d515c10313eebb204579543a743223 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:00:56 +0300
Subject: [PATCH 04/14] Update incoming_transaction.py

---
 .../exp_transaction_documents/models/incoming_transaction.py    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
index a57e87800..15bbba4e2 100644
--- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
@@ -45,6 +45,7 @@ class IncomingTransaction(models.Model):
     partner_id = fields.Many2one('res.partner')
     outgoing_transaction_id = fields.Many2one('outgoing.transaction', string='Related Outgoing')
     incoming_number = fields.Char(string='Incoming Number')
+    is_branch = fields.Boolean(string='Is Branch?')
     incoming_date = fields.Date(string='Incoming Date', default=fields.Date.today)
     incoming_date_hijri = fields.Char(string='Incoming Date (Hijri)', compute='_compute_incoming_date_hijri')
     attachment_rule_ids = fields.One2many('cm.attachment.rule', 'incoming_transaction_id', string='Attaches')
@@ -70,6 +71,7 @@ class IncomingTransaction(models.Model):
                                        column1='transaction_id', column2='outgoing_id',
                                        string='Process Transactions Outgoing')
     attachment_count = fields.Integer(compute='count_attachments')
+    
     # attachment_file = fields.Many2many(
     #     comodel_name='ir.attachment',
     #     string='')

From 5438f14a0bb85b0c08dbe626e0c61d1c132162aa Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:02:10 +0300
Subject: [PATCH 05/14] Update internal_transaction.py

---
 .../exp_transaction_documents/models/internal_transaction.py     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
index c8a121419..54dabe919 100644
--- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
@@ -28,6 +28,7 @@ class InternalTransaction(models.Model):
     project_domain = fields.Many2many('project.project', string='Project Domain')
     processing_ids = fields.Many2many(comodel_name='internal.transaction', relation='transaction_internal_rel',
                                       column1='transaction_id', column2='internal_id', string='Process Transactions')
+    is_branch = fields.Boolean(string='Is Branch?')
     def _normalize_arabic_text(self, text):
         translation_map = str.maketrans({
             # Define a dictionary to replace different forms of characters

From c17ab27be9f366b6c96237d7967a7cef3ff88e24 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:02:47 +0300
Subject: [PATCH 06/14] Update outgoing_transaction.py

---
 .../exp_transaction_documents/models/outgoing_transaction.py     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
index fdd7aa829..e28000a80 100644
--- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
@@ -15,6 +15,7 @@ class OutgoingTransaction(models.Model):
     is_partner = fields.Boolean()
     partner_id = fields.Many2one('res.partner')
     incoming_transaction_id = fields.Many2one('incoming.transaction', string='Related Incoming')
+    is_branch = fields.Boolean(string='Is Branch?')
     to_ids = fields.Many2many(comodel_name='cm.entity', relation='outgoing_entity_rel', column1='outgoing_id'
                               , column2='entity_id', string='Send To')
     company_name = fields.Many2one('res.partner',string='Delivery Company')

From 08b6fad147e0c1477b10ffc6eb286743b8703224 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:03:17 +0300
Subject: [PATCH 07/14] Update incoming_transaction.py

---
 .../exp_transaction_documents/models/incoming_transaction.py     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
index 15bbba4e2..da342c443 100644
--- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
@@ -45,7 +45,6 @@ class IncomingTransaction(models.Model):
     partner_id = fields.Many2one('res.partner')
     outgoing_transaction_id = fields.Many2one('outgoing.transaction', string='Related Outgoing')
     incoming_number = fields.Char(string='Incoming Number')
-    is_branch = fields.Boolean(string='Is Branch?')
     incoming_date = fields.Date(string='Incoming Date', default=fields.Date.today)
     incoming_date_hijri = fields.Char(string='Incoming Date (Hijri)', compute='_compute_incoming_date_hijri')
     attachment_rule_ids = fields.One2many('cm.attachment.rule', 'incoming_transaction_id', string='Attaches')

From b070d5267146344e4198dd0a25913d36e4773c5a Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:25:25 +0300
Subject: [PATCH 08/14] Update internal.xml

---
 .../exp_transaction_documents/views/internal.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_transactions/exp_transaction_documents/views/internal.xml b/odex25_transactions/exp_transaction_documents/views/internal.xml
index f2ec64cd3..4a056db86 100644
--- a/odex25_transactions/exp_transaction_documents/views/internal.xml
+++ b/odex25_transactions/exp_transaction_documents/views/internal.xml
@@ -174,7 +174,7 @@
                     </header>
                 </xpath>
                 <xpath expr="//field[@name='to_ids']" position="attributes">
-                    <attribute name="domain">[('type', '=', type_sender)]</attribute>
+                    <attribute name="domain">[('is_branch', '=', is_branch),('type', '=', type_sender)]</attribute>
                 </xpath>
                 <xpath expr="//field[@name='to_ids']" position="after">
                     <field name="partner_id"/>

From 7d06a68b8ae724ad835a5720ae8b18740c375742 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:28:25 +0300
Subject: [PATCH 09/14] Update incoming_transaction.py

---
 .../exp_transaction_documents/models/incoming_transaction.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
index da342c443..601ac39e2 100644
--- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
@@ -52,7 +52,7 @@ class IncomingTransaction(models.Model):
     trace_ids = fields.One2many('cm.transaction.trace', 'incoming_transaction_id', string='Trace Log')
     is_branch = fields.Boolean(string='Is Branch?')
     to_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_rel', column1='incoming_id'
-                              , column2='entity_id', string='Send To')
+                              , column2='entity_id', string='Send To',domain=[('is_branch','=',is_branch)])
     cc_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_cc_rel',
                               column1='incoming_id', column2='entity_id', string='CC To')
     tran_tag = fields.Many2many(comodel_name='transaction.tag', string='Tags')

From 152088656595ea48d02f522d2a20d0261fa4957d Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:30:01 +0300
Subject: [PATCH 10/14] Update outgoing_transaction.py

---
 .../exp_transaction_documents/models/outgoing_transaction.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
index e28000a80..d1bd8ac14 100644
--- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
@@ -17,7 +17,7 @@ class OutgoingTransaction(models.Model):
     incoming_transaction_id = fields.Many2one('incoming.transaction', string='Related Incoming')
     is_branch = fields.Boolean(string='Is Branch?')
     to_ids = fields.Many2many(comodel_name='cm.entity', relation='outgoing_entity_rel', column1='outgoing_id'
-                              , column2='entity_id', string='Send To')
+                              , column2='entity_id', string='Send To',domain=[('is_branch','=',is_branch)])
     company_name = fields.Many2one('res.partner',string='Delivery Company')
 
     tran_tag = fields.Many2many(comodel_name='transaction.tag', string='Tags')

From e3c05fe63a4aaf9eae4b9efb866558cebc108dcc Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:32:46 +0300
Subject: [PATCH 11/14] Update incoming.xml

---
 .../exp_transaction_documents/views/incoming.xml              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odex25_transactions/exp_transaction_documents/views/incoming.xml b/odex25_transactions/exp_transaction_documents/views/incoming.xml
index ed8d1e84a..858e4d8c4 100644
--- a/odex25_transactions/exp_transaction_documents/views/incoming.xml
+++ b/odex25_transactions/exp_transaction_documents/views/incoming.xml
@@ -22,9 +22,13 @@
                      <filter string="State" name="state"   domain="[('state', 'in', ('complete','draft'))]"/>
                     <filter string="Unread Transaction" name="unread" domain="[('is_reade','=',False)]"/>
                     <filter string="Favorite" name="favorite" domain="[('is_favorite','=','1')]"/>
+                    <filter name="Is Branch" string="Is Branch" domain="[('is_branch','=',True)]"/>
+                     <filter name="NOT Branch" string="NOT Branch" domain="[('is_branch','=',False)]"/>
                     <group expand="1" string="Group By">
                         <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>
                         <filter string="Subject Type" name="group_by_subject_type" context="{'group_by':'subject_type_id'}"/>
+                        <filter string="Is Branch" name="group_by_is_branch" domain="[('is_branch', '=', True)]" context="{'group_by':'is_branch'}"/>
+                     <filter string="Not Branch" name="group_by_noy_is_branch" domain="[('is_branch', '=', False)]" context="{'group_by':'is_branch'}"/>
                     </group>
                     <!--                    <group expand="0" string="Group By">-->
                     <!--                        <filter name="group_manager" string="Manager" domain="[]" context="{'group_by':'parent_id'}"/>-->

From eac1a7c2cbf323767ff27b908c5ade31c4b4be88 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:33:29 +0300
Subject: [PATCH 12/14] Update internal.xml

---
 .../exp_transaction_documents/views/internal.xml              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odex25_transactions/exp_transaction_documents/views/internal.xml b/odex25_transactions/exp_transaction_documents/views/internal.xml
index 4a056db86..5e17cd5fa 100644
--- a/odex25_transactions/exp_transaction_documents/views/internal.xml
+++ b/odex25_transactions/exp_transaction_documents/views/internal.xml
@@ -17,9 +17,13 @@
                     <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'))]"/>
+                     <filter name="Is Branch" string="Is Branch" domain="[('is_branch','=',True)]"/>
+                     <filter name="NOT Branch" string="NOT Branch" domain="[('is_branch','=',False)]"/>
                     <group expand="1" string="Group By">
                         <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>
                         <filter string="Subject Type" name="group_by_subject_type" context="{'group_by':'subject_type_id'}"/>
+                         <filter string="Is Branch" name="group_by_is_branch" domain="[('is_branch', '=', True)]" context="{'group_by':'is_branch'}"/>
+                     <filter string="Not Branch" name="group_by_noy_is_branch" domain="[('is_branch', '=', False)]" context="{'group_by':'is_branch'}"/>
                     </group>
 
 

From e84eee057f6dc4bef1ffac927cbbf4e06bb79b21 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:34:21 +0300
Subject: [PATCH 13/14] Update outgoing.xml

---
 .../exp_transaction_documents/views/outgoing.xml              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odex25_transactions/exp_transaction_documents/views/outgoing.xml b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
index 4d0db3e4f..6dfe3f5aa 100644
--- a/odex25_transactions/exp_transaction_documents/views/outgoing.xml
+++ b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
@@ -13,12 +13,16 @@
                     <field name="name" string="Transaction" filter_domain="[('name','ilike',self)]"/>
                     <field name="tran_tag" string="tag" filter_domain="[('tran_tag','ilike',self)]"/>
                     <field name="is_reade"/>
+                     <filter name="Is Branch" string="Is Branch" domain="[('is_branch','=',True)]"/>
+                     <filter name="NOT Branch" string="NOT Branch" domain="[('is_branch','=',False)]"/>
                     <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)]"/>
                     <filter string="Favorite" name="favorite" domain="[('is_favorite','=','1')]"/>
                     <group expand="1" string="Group By">
+                         <filter string="Is Branch" name="group_by_is_branch" domain="[('is_branch', '=', True)]" context="{'group_by':'is_branch'}"/>
+                         <filter string="Not Branch" name="group_by_noy_is_branch" domain="[('is_branch', '=', False)]" context="{'group_by':'is_branch'}"/>
                         <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>
                         <filter string="Subject Type" name="group_by_subject_type" context="{'group_by':'subject_type_id'}"/>
                     </group>

From 9c37b4731b199878c98bf0c4d39b869248102542 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:52:39 +0300
Subject: [PATCH 14/14] Update transcation_common_view.xml

---
 .../views/transcation_common_view.xml               | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
index 5e71dfcc2..36e37d633 100644
--- a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
+++ b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
@@ -71,12 +71,13 @@
             <field name="inherit_id" ref="exp_transaction_documents.common_transactions_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='subject']" position="after">
+                     <field name="is_branch"/>
                     <field name="to_ids" widget="many2many_tags"
                            attrs="{'required':True,'readonly':[('state','not in', ['draft'])]}"
-                           domain="[('type', 'in', ['unit','employee'])]" options="{'no_create':True,'no_open':True}"/>
+                           domain="[('type', 'in', ['unit','employee']),('is_branch','=',is_branch)]" options="{'no_create':True,'no_open':True}"/>
                     <field name="tran_tag" widget="many2many_tags"
                            options="{'no_create':True}"/>
-                    <field name="is_branch"/>
+                   
                 </xpath>
                 <xpath expr="//field[@name='important_id']" position="after">
                     <field name="project_domain" widget="many2many_tags"
@@ -184,9 +185,9 @@
                     <field name="partner_id"/>
                 </xpath>
                 <xpath expr="//field[@name='subject']" position="after">
-                    <field name="to_ids" widget="many2many_tags" domain="[('type', 'in', ['employee','unit'])]"
+                     <field name="is_branch"/>
+                    <field name="to_ids" widget="many2many_tags" domain="[('is_branch','=',is_branch),('type', 'in', ['employee','unit'])]"
                            options="{'no_create':True,'no_open':True}"/>
-                    <field name="is_branch"/>
                 </xpath>
                 <xpath expr="//field[@name='transaction_date_hijri']" position="after">
                     <!--                    <field name="outgoing_transaction_id" domain="[('partner_id', '=', partner_id)]"/>-->
@@ -294,11 +295,11 @@
                     <attribute name="invisible">1</attribute>
                 </xpath>
                 <xpath expr="//field[@name='subject']" position="after">
+                     <field name="is_branch"/>
                     <field name="to_ids" widget="many2many_tags" options="{'no_create':True,'no_open':True}"
                            attrs="{'required':True,'readonly':[('state','not in', ['draft'])]}"
-                           domain="[('type', '=', 'external')]"/>
+                           domain="[('is_branch','=',is_branch),('type', '=', 'external')]"/>
                     <field name="to_name"/>
-                  <field name="is_branch"/>
 
                 </xpath>
                 <xpath expr="//field[@name='transaction_date_hijri']" position="after">