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 #2909 from expsa/samir-aladawi-fix-letters-sign 

[FIX] exp_transaction_documents
This commit is contained in:
SamirLADOUI-sa 2025-04-28 00:20:43 +01:00 committed by GitHub
parent 3a2b4c2c93 2567ad4ee7
commit bb20dfc739
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
odex25_transactions/exp_transaction_documents/models/configuration.py
View File

@ -165,31 +165,31 @@ class AttachmentRule(models.Model):
},
}
def action_signature(self):
for rec in self:
if rec.internal_transaction_id:
x = self.env['letters.letters'].search([('internal_transaction_id','=',rec.internal_transaction_id.id)],limit=1)
elif rec.incoming_transaction_id:
x = self.env['letters.letters'].search([('incoming_transaction_id','=',rec.incoming_transaction_id.id)],limit=1)
elif rec.outgoing_transaction_id:
x = self.env['letters.letters'].search([('outgoing_transaction_id','=',rec.outgoing_transaction_id.id)],limit=1)
# def action_signature(self):
# for rec in self:
# if rec.internal_transaction_id:
# x = self.env['letters.letters'].search([('internal_transaction_id','=',rec.internal_transaction_id.id)],limit=1)
# elif rec.incoming_transaction_id:
# x = self.env['letters.letters'].search([('incoming_transaction_id','=',rec.incoming_transaction_id.id)],limit=1)
# elif rec.outgoing_transaction_id:
# x = self.env['letters.letters'].search([('outgoing_transaction_id','=',rec.outgoing_transaction_id.id)],limit=1)
rec.signed_user_id = self.env.user.id
x.signed_user_id = self.env.user.id
return {
'type': 'ir.actions.act_window',
'name': 'Preferences',
'res_model': 'res.users',
'view_mode': 'form',
'view_id': self.env.ref('base.view_users_form_simple_modif').id,
'target': 'new',
'context': {
'default_id': self.env.user.id,
'default_letter_id': x.id ,
'default_attachment_id': rec.id,
},
'res_id': self.env.user.id,
}
# rec.signed_user_id = self.env.user.id
# x.signed_user_id = self.env.user.id
# return {
# 'type': 'ir.actions.act_window',
# 'name': 'Preferences',
# 'res_model': 'res.users',
# 'view_mode': 'form',
# 'view_id': self.env.ref('base.view_users_form_simple_modif').id,
# 'target': 'new',
# 'context': {
# 'default_id': self.env.user.id,
# 'default_letter_id': x.id ,
# 'default_attachment_id': rec.id,
# },
# 'res_id': self.env.user.id,
# }
# @api.constrains('file_save')

1
odex25_transactions/exp_transaction_documents/wizard/sign_letter_transaction.py
View File

@ -8,6 +8,7 @@ class SignLetterTransaction(models.TransientModel):
letter_id = fields.Many2one('letters.letters', string="Letter", readonly=True)
attachment_rule_id = fields.Many2one('cm.attachment.rule', string="Attachment Rule", readonly=True) # Update model name
signature = fields.Binary(string='Signature', default=lambda self: self.env.user.sign_signature)
name = fields.Char(default=lambda self: self.env.user.name, readonly=True)
def action_sign(self):

8
odex25_transactions/exp_transaction_documents/wizard/sign_letter_transaction_view.xml
View File

@ -6,8 +6,14 @@
<field name="model">sign.letter.transaction</field>
<field name="arch" type="xml">
<form string="Sign Letter">
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" placeholder="e.g. Delete Logs after 30 Days"/>
</h1>
</div>
<group>
<field name="signature" widget="signature" required="1"/>
<field name="signature" widget="signature" required="1" options="{'full_name': 'name'}"/>
</group>
<footer>
<button name="action_sign" string="Sign" type="object" class="btn-primary"/>