Update incoming_transaction.py
This commit is contained in:
parent
341d80349d
commit
69c1d46467
|
|
@ -55,8 +55,7 @@ class IncomingTransaction(models.Model):
|
|||
attachment_rule_ids = fields.One2many('cm.attachment.rule', 'incoming_transaction_id', string='Attaches')
|
||||
attachment_ids = fields.One2many('cm.attachment', 'incoming_transaction_id', string='Attachments')
|
||||
trace_ids = fields.One2many('cm.transaction.trace', 'incoming_transaction_id', string='Trace Log')
|
||||
to_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_rel', column1='incoming_id'
|
||||
, column2='entity_id', string='Send To')
|
||||
to_ids = fields.Many2one(comodel_name='cm.entity',string='Send To')
|
||||
|
||||
cc_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_cc_rel',
|
||||
column1='incoming_id', column2='entity_id', string='CC To',)
|
||||
|
|
@ -131,22 +130,15 @@ class IncomingTransaction(models.Model):
|
|||
'''generate transaction sequence'''
|
||||
return self.env['ir.sequence'].next_by_code('cm.transaction.in') or _('New')
|
||||
|
||||
####################################################
|
||||
# Business methods
|
||||
####################################################
|
||||
|
||||
def action_draft(self):
|
||||
for record in self:
|
||||
res = super(IncomingTransaction, self).action_send()
|
||||
|
||||
# Check if to_ids is not empty before accessing its first element
|
||||
if record.to_ids:
|
||||
# Check if to_id is set before accessing it
|
||||
if record.to_id:
|
||||
employee = self.current_employee()
|
||||
to_id = record.to_ids[0].id
|
||||
|
||||
if record.to_ids[0].type != 'employee':
|
||||
to_id = record.to_ids[0].secretary_id.id
|
||||
|
||||
to_id = record.to_id.id
|
||||
if record.to_id.type != 'employee':
|
||||
to_id = record.to_id.secretary_id.id
|
||||
record.trace_ids.create({
|
||||
'action': 'sent',
|
||||
'to_id': to_id,
|
||||
|
|
@ -154,18 +146,15 @@ class IncomingTransaction(models.Model):
|
|||
'procedure_id': record.procedure_id.id or False,
|
||||
'incoming_transaction_id': record.id
|
||||
})
|
||||
|
||||
partner_ids = []
|
||||
for partner in record.to_ids:
|
||||
if partner.type == 'unit':
|
||||
partner_ids.append(partner.secretary_id.user_id.partner_id.id)
|
||||
record.forward_user_id = partner.secretary_id.user_id.id
|
||||
elif partner.type == 'employee':
|
||||
partner_ids.append(partner.user_id.partner_id.id)
|
||||
record.forward_user_id = partner.user_id.id
|
||||
|
||||
if record.to_id.type == 'unit':
|
||||
partner_ids.append(record.to_id.secretary_id.user_id.partner_id.id)
|
||||
record.forward_user_id = record.to_id.secretary_id.user_id.id
|
||||
elif record.to_id.type == 'employee':
|
||||
partner_ids.append(record.to_id.user_id.partner_id.id)
|
||||
record.forward_user_id = record.to_id.user_id.id
|
||||
subj = _('Message Has been send !')
|
||||
msg = _(u'{} ← {}').format(record.employee_id.name, u' / '.join([k.name for k in record.to_ids]))
|
||||
msg = _(u'{} ← {}').format(record.employee_id.name, record.to_id.name)
|
||||
msg = u'{}<br /><b>{}</b> {}.<br />{}'.format(msg,
|
||||
_(u'Action Taken'), record.procedure_id.name,
|
||||
u'<a href="%s" >رابط المعاملة</a> ' % (
|
||||
|
|
@ -177,6 +166,7 @@ class IncomingTransaction(models.Model):
|
|||
|
||||
return res
|
||||
|
||||
|
||||
def action_send_forward(self):
|
||||
template = 'exp_transaction_documents.incoming_notify_send_send_email'
|
||||
self.send_message(template=template)
|
||||
|
|
|
|||
Loading…
Reference in New Issue