[
'&',
- ('state', '=', 'send'),
+ ('state', 'in', ['send', 'reply']),
'|', '|',
'&',
('is_forward', '=', False),
diff --git a/odex25_transactions/exp_transation_letters/models/letter.py b/odex25_transactions/exp_transation_letters/models/letter.py
index c293adddf..868cf3fd3 100644
--- a/odex25_transactions/exp_transation_letters/models/letter.py
+++ b/odex25_transactions/exp_transation_letters/models/letter.py
@@ -52,7 +52,7 @@ class Letters(models.Model):
readonly=True,
tracking=True
)
-
+ job_name = fields.Char(store=False)
@api.depends('transaction_type', 'name')
def compute_img(self):
employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
@@ -118,17 +118,18 @@ class Letters(models.Model):
def action_generate_attachment(self):
""" this method called from button action in view xml """
# generate pdf from report, use report's id as reference
- REPORT_ID = 'exp_transation_letters.report_letter_action_report'
- pdf = self.env.ref(REPORT_ID)._render_qweb_pdf(self.ids)
+ for record in self:
+ REPORT_ID = 'exp_transation_letters.report_letter_action_report'
+ pdf = self.env.ref(REPORT_ID)._render_qweb_pdf(self.ids)
# pdf result is a list
- b64_pdf = base64.b64encode(pdf[0])
- res_id = ''
- field_name, res_id = self._get_transaction_values()
+ b64_pdf = base64.b64encode(pdf[0])
+ res_id = ''
+ field_name, res_id = self._get_transaction_values()
# file_exists = self.env['cm.attachment.rule'].search([(field_name, '=', res_id),('created_from_system','=',True)])
# if file_exists:
# file_exists.unlink()
- ATTACHMENT_NAME = "Letter"
- attach_id = self.env['ir.attachment'].create({
+ ATTACHMENT_NAME = "Letter"
+ attach_id = self.env['ir.attachment'].create({
'name': ATTACHMENT_NAME + '.pdf',
'type': 'binary',
'datas': b64_pdf,
@@ -137,8 +138,11 @@ class Letters(models.Model):
'mimetype': 'application/pdf'
})
# self.attachment_generated = True
- self.state = 'attached'
- return self.env['cm.attachment.rule'].sudo().create({
+ employee = self.env['hr.employee'].search([('user_id', '=', attach_id.create_uid.id)], limit=1)
+ record.job_name = employee.job_title if employee and employee.job_title else ' '
+ record.signed_user_id = attach_id.create_uid
+ self.state = 'attached'
+ return self.env['cm.attachment.rule'].sudo().create({
'employee_id': self.unite.id,
'entity_id': self.unite.id,
'file_save': [(6, 0, attach_id.ids)],
diff --git a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
index 2f84ef783..650b056e1 100644
--- a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
+++ b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/odex25_transactions/exp_transation_letters/reports/letter_template.xml b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
index 399b84edb..83927dfa6 100644
--- a/odex25_transactions/exp_transation_letters/reports/letter_template.xml
+++ b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
@@ -92,7 +92,7 @@
-
+