diff --git a/odex25_transactions/exp_transaction_documents/models/configuration.py b/odex25_transactions/exp_transaction_documents/models/configuration.py index 2cf13b112..3c3b60782 100644 --- a/odex25_transactions/exp_transaction_documents/models/configuration.py +++ b/odex25_transactions/exp_transaction_documents/models/configuration.py @@ -229,6 +229,20 @@ class TransactionTrace(models.Model): cc_ids = fields.Many2many('cm.entity', string='CC To') body = fields.Html(string='Transaction Details') + @api.model + def create(self, vals): + record = super(TransactionTrace, self).create(vals) + + now = fields.Datetime.now() + + if record.incoming_transaction_id: + record.incoming_transaction_id.last_action_date = now + elif record.internal_transaction_id: + record.internal_transaction_id.last_action_date = now + elif record.outgoing_transaction_id: + record.outgoing_transaction_id.last_action_date = now + + return record class ProjectType(models.Model): _name = "project.type" diff --git a/odex25_transactions/exp_transaction_documents/models/entity.py b/odex25_transactions/exp_transaction_documents/models/entity.py index afc5ccf01..5b51f9057 100644 --- a/odex25_transactions/exp_transaction_documents/models/entity.py +++ b/odex25_transactions/exp_transaction_documents/models/entity.py @@ -15,7 +15,7 @@ class Entity(models.Model): _name = 'cm.entity' _description = 'Transactions Contacts' _order = 'name' - + active = fields.Boolean(string='Active', default=True) def _normalize_arabic_text(self, text): translation_map = str.maketrans({ diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py index 1009abfe9..6aab6116e 100644 --- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py @@ -8,6 +8,7 @@ class InternalTransaction(models.Model): _name = 'internal.transaction' _inherit = ['transaction.transaction', 'mail.thread'] _description = 'internal Transaction' + _order = 'last_action_date desc' # due_date = fields.Date(string='Deadline', compute='_compute_due_date') reason = fields.Text('Reason') diff --git a/odex25_transactions/exp_transaction_documents/models/transaction.py b/odex25_transactions/exp_transaction_documents/models/transaction.py index b7435ab7b..228fc0e40 100644 --- a/odex25_transactions/exp_transaction_documents/models/transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/transaction.py @@ -23,6 +23,7 @@ class Transaction(models.Model): _name = 'transaction.transaction' _inherit = ['mail.thread'] _description = 'for common attribute between transaction' + _order = 'last_action_date desc' name = fields.Char(string='Transaction Number') type = fields.Selection(string='Transaction Type', selection=[ @@ -81,8 +82,8 @@ class Transaction(models.Model): 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?') + last_action_date = fields.Datetime(string='Last Action', ) - @api.depends('type','subject') def compute_img(self): employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) diff --git a/odex25_transactions/exp_transaction_documents/views/incoming.xml b/odex25_transactions/exp_transaction_documents/views/incoming.xml index 0a4110922..0f80f93c1 100644 --- a/odex25_transactions/exp_transaction_documents/views/incoming.xml +++ b/odex25_transactions/exp_transaction_documents/views/incoming.xml @@ -46,7 +46,7 @@ common.incoming.transaction.tree incoming.transaction - diff --git a/odex25_transactions/exp_transaction_documents/views/internal.xml b/odex25_transactions/exp_transaction_documents/views/internal.xml index 26cc7fb5e..c666ba46a 100644 --- a/odex25_transactions/exp_transaction_documents/views/internal.xml +++ b/odex25_transactions/exp_transaction_documents/views/internal.xml @@ -45,7 +45,7 @@ internal.transaction - diff --git a/odex25_transactions/exp_transaction_documents/views/outgoing.xml b/odex25_transactions/exp_transaction_documents/views/outgoing.xml index 1e562a87b..60c51d17c 100644 --- a/odex25_transactions/exp_transaction_documents/views/outgoing.xml +++ b/odex25_transactions/exp_transaction_documents/views/outgoing.xml @@ -44,7 +44,7 @@ outgoing.transaction -