diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py index f67479918..601ac39e2 100644 --- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py @@ -50,8 +50,9 @@ 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') + , 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') @@ -69,6 +70,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='') 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 diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py index fdd7aa829..d1bd8ac14 100644 --- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py @@ -15,8 +15,9 @@ 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') + , 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') 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') 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 @@ + + + + diff --git a/odex25_transactions/exp_transaction_documents/views/internal.xml b/odex25_transactions/exp_transaction_documents/views/internal.xml index f2ec64cd3..5e17cd5fa 100644 --- a/odex25_transactions/exp_transaction_documents/views/internal.xml +++ b/odex25_transactions/exp_transaction_documents/views/internal.xml @@ -17,9 +17,13 @@ + + + + @@ -174,7 +178,7 @@ - [('type', '=', type_sender)] + [('is_branch', '=', is_branch),('type', '=', type_sender)] diff --git a/odex25_transactions/exp_transaction_documents/views/outgoing.xml b/odex25_transactions/exp_transaction_documents/views/outgoing.xml index 4f445da9d..1948eeaea 100644 --- a/odex25_transactions/exp_transaction_documents/views/outgoing.xml +++ b/odex25_transactions/exp_transaction_documents/views/outgoing.xml @@ -13,12 +13,16 @@ + + + + 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..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,11 +71,13 @@ + + domain="[('type', 'in', ['unit','employee']),('is_branch','=',is_branch)]" options="{'no_create':True,'no_open':True}"/> + - + @@ -292,10 +295,12 @@ 1 + + domain="[('is_branch','=',is_branch),('type', '=', 'external')]"/> +