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 #2109 from expsa/samir-aladawi-fix-transactions-forwarding 

[FIX] exp_transaction_documents: send the transaction to the manager …
This commit is contained in:
SamirLADOUI-sa 2025-01-13 10:05:24 +01:00 committed by GitHub
parent b54a4cbdf1 e6383c7cc3
commit d4f2ad63e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
odex25_transactions/exp_transaction_documents/views/entity.xml
View File

@ -39,8 +39,9 @@
attrs="{'invisible': [('type','in',['employee','external'])]}"/>
<field name="need_approve"
attrs="{'invisible': [('type','in',['employee','external'])]}"/>
<field name="manager_id" attrs="{'invisible': [('type','not in',['unit'])]}"
domain="[('type','in',['employee'])]"/>
<field name="manager_id"
attrs="{'invisible': [('type','!=','unit')], 'required': [('type','=','unit')]}"
domain="[('type','in',['employee'])]"/>
<field name="secretary_id" attrs="{'invisible': [('type','not in',['unit'])]}"
domain="[('type','in',['employee'])]"/>
<field name="child_ids" attrs="{'invisible': [('type', '!=', 'employee')]}"

10
odex25_transactions/exp_transaction_documents/wizard/forward_trasaction.py
View File

@ -55,8 +55,8 @@ class ForwardTransactionWizard(models.TransientModel):
name = 'outgoing_transaction_id'
forward_user_id = self.employee.user_id
if self.forward_type != 'employee':
forward_user_id = self.internal_unit.secretary_id.user_id.id
to_id = self.internal_unit.secretary_id.id
forward_user_id = self.internal_unit.secretary_id.user_id.id or self.internal_unit.manager_id.user_id.id
to_id = self.internal_unit.secretary_id.id or self.internal_unit.manager_id.id
transaction.forward_user_id = forward_user_id
transaction.last_forwarded_user = self.env.uid
if self.is_secret:
@ -96,12 +96,14 @@ class ForwardTransactionWizard(models.TransientModel):
# add mail notification
partner_ids = []
if self.forward_type == 'unit':
partner_ids.append(self.internal_unit.secretary_id.user_id.partner_id.id)
forward_partner_id = self.internal_unit.secretary_id.user_id.partner_id.id or self.internal_unit.manager_id.user_id.partner_id.id
partner_ids.append(forward_partner_id)
elif self.forward_type == 'employee':
partner_ids.append(self.employee.user_id.partner_id.id)
for partner in self.cc_ids:
if partner.type == 'unit':
partner_ids.append(partner.secretary_id.user_id.partner_id.id)
partner_id = partner.secretary_id.user_id.partner_id.id or partner.manager_id.user_id.partner_id.id
partner_ids.append(partner_id)
elif partner.type == 'employee':
partner_ids.append(partner.user_id.partner_id.id)
transaction.state = 'send'