From 45123b004577ea04d6b9ce40bc1986942e37963f Mon Sep 17 00:00:00 2001 From: eman Date: Tue, 31 Dec 2024 16:56:05 +0200 Subject: [PATCH] transaction(delegation) --- .../exp_transaction_documents/models/incoming_transaction.py | 4 ++-- .../exp_transaction_documents/models/internal_transaction.py | 4 ++-- .../exp_transaction_documents/models/outgoing_transaction.py | 4 ++-- .../exp_transaction_documents/models/transaction.py | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py index b054ccdea..45df1224e 100644 --- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py @@ -55,8 +55,8 @@ 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') - to_ids = fields.Many2one(comodel_name='cm.entity',string='Send To') - to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') + # to_ids = fields.Many2one(comodel_name='cm.entity',string='Send To') + # to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') cc_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_cc_rel', column1='incoming_id', column2='entity_id', string='CC To',) diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py index a368a44b3..c1a3012c3 100644 --- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py @@ -23,11 +23,11 @@ class InternalTransaction(models.Model): ], required=False, default='unit') - to_ids = fields.Many2one(comodel_name='cm.entity', string='Send To') + # to_ids = fields.Many2one(comodel_name='cm.entity', string='Send To') # delegate_employee_id = fields.Many2one('cm.entity', related='to_ids.delegate_employee_id',store=True) # from_date = fields.Datetime(string='Delegation From Date', related='to_ids.from_date') # to_date = fields.Datetime(string='Delegation To Date', related='to_ids.to_date') - to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') + # to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') @api.onchange('type_sender') def _onchange_type_sender(self): diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py index f6e8f82c6..7d749541f 100644 --- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py @@ -19,8 +19,8 @@ class OutgoingTransaction(models.Model): is_partner = fields.Boolean() partner_id = fields.Many2one('res.partner') incoming_transaction_id = fields.Many2one('incoming.transaction', string='Related Incoming') - to_ids = fields.Many2one(comodel_name='cm.entity',string='Send To') - to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') + # to_ids = fields.Many2one(comodel_name='cm.entity',string='Send To') + # to_delegate = fields.Boolean(string='To Delegate?', related='to_ids.to_delegate') company_name = fields.Many2one('res.partner',string='Delivery Company') to_users = fields.Many2many(comodel_name='res.users', string="To Users",relation='your_out_to_users_rel',column1='your_out_id',column2='user_id2',) diff --git a/odex25_transactions/exp_transaction_documents/models/transaction.py b/odex25_transactions/exp_transaction_documents/models/transaction.py index 8bf309fcd..993e836c6 100644 --- a/odex25_transactions/exp_transaction_documents/models/transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/transaction.py @@ -80,6 +80,8 @@ class Transaction(models.Model): add_rank = fields.Integer(string='Transaction Rank') seen_user_ids = fields.Many2many('res.users') seen_before = fields.Boolean(compute="_compute_seen_before") + to_ids = fields.Many2one(comodel_name='cm.entity', string='Send To') + to_delegate = fields.Boolean(string='To Delegate?') @api.depends('type','subject') @@ -258,6 +260,7 @@ class Transaction(models.Model): user_id = record.env.user.id if user_id not in record.seen_user_ids.ids: record.seen_user_ids = [(6, 0, [user_id])] + record.to_delegate = record.to_ids.to_delegate if record.to_delegate: record.to_ids = record.to_ids.delegate_employee_id.id