devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3630 from expsa/fix_transactions 

Fix transactions
This commit is contained in:
ahmed-nouri051 2025-06-25 14:58:36 +02:00 committed by GitHub
parent eb588c0eb7 e4b4bb7ead
commit 46a69d7881
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
odex25_transactions/exp_transaction_documents/models/internal_transaction.py
View File

@ -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='send'
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,

5
odex25_transactions/exp_transaction_documents/models/transaction.py
View File

@ -323,8 +323,9 @@ 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':
# to_id = transaction.preparation_id.manager_id.id
#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,
'to_id': to_id,

2
odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
View File

@ -176,7 +176,7 @@
<field name="view_mode">tree,form</field>
<field name='domain'>[
'&amp;',
('state', 'in', ['send', 'reply']),
('state', 'in', ['send', 'reply','to_approve']),
'|', '|', '|',