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 #3627 from expsa/fix_transactions 

Fix transactions
This commit is contained in:
ahmed-nouri051 2025-06-25 10:02:39 +02:00 committed by GitHub
parent 00f7126451 26c633f277
commit eb588c0eb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ class InternalTransaction(models.Model):
self.partner_id = False self.partner_id = False
partner_id = fields.Many2one('res.partner', string='Partner', readonly=True, partner_id = fields.Many2one('res.partner', string='Partner', readonly=True,
related='to_ids.secretary_id.partner_id') related='to_ids.manager_id.partner_id')
cc_ids = fields.Many2many(comodel_name='cm.entity', relation='internal_entity_cc_rel', cc_ids = fields.Many2many(comodel_name='cm.entity', relation='internal_entity_cc_rel',
column1='internal_id', column2='entity_id', string='CC To') column1='internal_id', column2='entity_id', string='CC To')

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

@ -122,8 +122,8 @@ class Transaction(models.Model):
def default_employee_id(self): def default_employee_id(self):
user = self.env.user user = self.env.user
em = self.env['cm.entity'].search([('user_id', '=', user.id)], limit=1) em = self.env['cm.entity'].search([('user_id', '=', user.id)], limit=1)
#return len(em) and em or self.env['cm.entity'] return len(em) and em or self.env['cm.entity']
return em #return em
def compute_receive_id(self): def compute_receive_id(self):
for rec in self: for rec in self:
@ -323,8 +323,8 @@ class Transaction(models.Model):
to_id = transaction.to_ids[0].id to_id = transaction.to_ids[0].id
if transaction.to_ids[0].type != 'employee': if transaction.to_ids[0].type != 'employee':
to_id = transaction.to_ids.manager_id.id 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':
to_id = transaction.preparation_id.manager_id.id # to_id = transaction.preparation_id.manager_id.id
transaction.trace_ids.create({ transaction.trace_ids.create({
'action': action, 'action': action,
'to_id': to_id, 'to_id': to_id,