fix depends
This commit is contained in:
parent
e4f89cc531
commit
a03d430e5d
|
|
@ -7,5 +7,4 @@ from . import internal_transaction
|
||||||
from . import outgoing_transaction
|
from . import outgoing_transaction
|
||||||
from . import incoming_transaction
|
from . import incoming_transaction
|
||||||
from . import tools
|
from . import tools
|
||||||
from . import letter
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -143,28 +143,7 @@ class AttachmentRule(models.Model):
|
||||||
|
|
||||||
def action_sign_transaction(self):
|
def action_sign_transaction(self):
|
||||||
self.ensure_one()
|
self.ensure_one()
|
||||||
if self.internal_transaction_id:
|
return
|
||||||
x = self.env['letters.letters'].search([('internal_transaction_id','=',self.internal_transaction_id.id)],limit=1)
|
|
||||||
elif self.incoming_transaction_id:
|
|
||||||
x = self.env['letters.letters'].search([('incoming_transaction_id','=',self.incoming_transaction_id.id)],limit=1)
|
|
||||||
elif self.outgoing_transaction_id:
|
|
||||||
x = self.env['letters.letters'].search([('outgoing_transaction_id','=',self.outgoing_transaction_id.id)],limit=1)
|
|
||||||
|
|
||||||
# self.signed_user_id = self.env.user.id
|
|
||||||
# x.signed_user_id = self.env.user.id
|
|
||||||
return {
|
|
||||||
'type': 'ir.actions.act_window',
|
|
||||||
'name': 'Sign',
|
|
||||||
'res_model': 'sign.letter.transaction',
|
|
||||||
'view_mode': 'form',
|
|
||||||
'view_id': self.env.ref('exp_transaction_documents.view_sign_letter_transaction_form').id,
|
|
||||||
'target': 'new',
|
|
||||||
'context': {
|
|
||||||
'default_letter_id': x.id ,
|
|
||||||
'default_attachment_rule_id': self.id,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
# def action_signature(self):
|
# def action_signature(self):
|
||||||
# for rec in self:
|
# for rec in self:
|
||||||
# if rec.internal_transaction_id:
|
# if rec.internal_transaction_id:
|
||||||
|
|
|
||||||
|
|
@ -195,3 +195,35 @@ class LettersTemp(models.Model):
|
||||||
('0', 'not'),
|
('0', 'not'),
|
||||||
('1', 'Favorite'),
|
('1', 'Favorite'),
|
||||||
], size=1, string="Favorite")
|
], size=1, string="Favorite")
|
||||||
|
|
||||||
|
|
||||||
|
class AttachmentRule(models.Model):
|
||||||
|
_inherit = 'cm.attachment.rule'
|
||||||
|
|
||||||
|
def action_sign_transaction(self):
|
||||||
|
self.ensure_one()
|
||||||
|
if self.internal_transaction_id:
|
||||||
|
x = self.env['letters.letters'].search([('internal_transaction_id', '=', self.internal_transaction_id.id)],
|
||||||
|
limit=1)
|
||||||
|
elif self.incoming_transaction_id:
|
||||||
|
x = self.env['letters.letters'].search([('incoming_transaction_id', '=', self.incoming_transaction_id.id)],
|
||||||
|
limit=1)
|
||||||
|
elif self.outgoing_transaction_id:
|
||||||
|
x = self.env['letters.letters'].search([('outgoing_transaction_id', '=', self.outgoing_transaction_id.id)],
|
||||||
|
limit=1)
|
||||||
|
|
||||||
|
# self.signed_user_id = self.env.user.id
|
||||||
|
# x.signed_user_id = self.env.user.id
|
||||||
|
return {
|
||||||
|
'type': 'ir.actions.act_window',
|
||||||
|
'name': 'Sign',
|
||||||
|
'res_model': 'sign.letter.transaction',
|
||||||
|
'view_mode': 'form',
|
||||||
|
'view_id': self.env.ref('exp_transaction_documents.view_sign_letter_transaction_form').id,
|
||||||
|
'target': 'new',
|
||||||
|
'context': {
|
||||||
|
'default_letter_id': x.id,
|
||||||
|
'default_attachment_rule_id': self.id,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue