diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py index 9dba465ec..62ef5876f 100644 --- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py @@ -150,19 +150,20 @@ class InternalTransaction(models.Model): if record.subject_type_id.transaction_need_approve or record.preparation_id.need_approve: template = 'exp_transaction_documents.internal_approval1_request_email' sent = 'waite' + record.state='to_approve' record.trace_create_ids('internal_transaction_id', record, sent) partner_ids = [] if record.to_ids.type == 'unit': partner_ids.append(record.to_ids.secretary_id.user_id.partner_id.id) - record.forward_user_id = record.to_ids.manager_id.user_id.id + #record.forward_user_id = record.to_ids.preparation_id.manager_id.id elif record.to_ids.type == 'employee': partner_ids.append(record.to_ids.user_id.partner_id.id) record.forward_user_id = record.to_ids.user_id.id if record.to_user_have_leave: record.forward_user_id = record.receive_id.user_id.id - record.state='to_approve' + record.send_message(template=template) subj = _('Message Has been sent!') msg = _(u'{} ← {}').format(record.employee_id.name, record.to_ids.name) @@ -223,7 +224,7 @@ class InternalTransaction(models.Model): to_id = self.to_ids.id if self.to_ids.type != 'employee': to_id = self.to_ids.secretary_id.id - + self.forward_user_id = self.to_ids.manager_id.user_id self.trace_ids.create({ 'action': 'sent', 'to_id': to_id, diff --git a/odex25_transactions/exp_transaction_documents/models/transaction.py b/odex25_transactions/exp_transaction_documents/models/transaction.py index 3716f25c7..271344ad9 100644 --- a/odex25_transactions/exp_transaction_documents/models/transaction.py +++ b/odex25_transactions/exp_transaction_documents/models/transaction.py @@ -323,7 +323,8 @@ class Transaction(models.Model): to_id = transaction.to_ids[0].id if transaction.to_ids[0].type != 'employee': to_id = transaction.to_ids.manager_id.id - if transaction.subject_type_id.transaction_need_approve or transaction.preparation_id.need_approve and transaction.state == 'to_approve': + #if transaction.subject_type_id.transaction_need_approve or transaction.preparation_id.need_approve and transaction.state == 'to_approve': + if transaction.state == 'to_approve': to_id = transaction.preparation_id.manager_id.id transaction.trace_ids.create({ 'action': action, 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 b6aa0a470..f9d09b536 100644 --- a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml +++ b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml @@ -176,7 +176,7 @@ tree,form [ '&', - ('state', 'in', ['send', 'reply']), + ('state', 'in', ['send', 'reply','to_approve']), '|', '|', '|',