From bd961fbc846d552e1fd1d4204af52bf1333a79ba Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:20:42 +0300
Subject: [PATCH 1/4] Update entity.py
---
odex25_transactions/exp_transaction_documents/models/entity.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/odex25_transactions/exp_transaction_documents/models/entity.py b/odex25_transactions/exp_transaction_documents/models/entity.py
index 7ba9193bd..4947309a3 100644
--- a/odex25_transactions/exp_transaction_documents/models/entity.py
+++ b/odex25_transactions/exp_transaction_documents/models/entity.py
@@ -85,6 +85,7 @@ class Entity(models.Model):
email = fields.Char()
child_ids = fields.Many2many(comodel_name='cm.entity', relation='employee_entity_rel', column1='employee_id',
column2='entity_id', string='Related Units')
+ image = fields.Binary(string='Image')
establish_date = fields.Date(string='Establish Date')
unit_location = fields.Char(string='Unit Location')
sketch_attachment_id = fields.Many2one(comodel_name='ir.attachment', string='Sketch Attachment')
From 0abf8901d0256797259e005f9a4c77cbeda29bfc Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:24:02 +0300
Subject: [PATCH 2/4] Update entity.xml
---
odex25_transactions/exp_transaction_documents/views/entity.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/odex25_transactions/exp_transaction_documents/views/entity.xml b/odex25_transactions/exp_transaction_documents/views/entity.xml
index 919a31d94..0d41a44f1 100644
--- a/odex25_transactions/exp_transaction_documents/views/entity.xml
+++ b/odex25_transactions/exp_transaction_documents/views/entity.xml
@@ -41,6 +41,7 @@
domain="[('type','in',['employee'])]"/>
+
From 7ae1a1038a09ff118620b7cec70cf59b1a3ecfc6 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:39:24 +0300
Subject: [PATCH 3/4] Update transaction.py
---
.../exp_transaction_documents/models/transaction.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/odex25_transactions/exp_transaction_documents/models/transaction.py b/odex25_transactions/exp_transaction_documents/models/transaction.py
index d503602bd..6a85478aa 100644
--- a/odex25_transactions/exp_transaction_documents/models/transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/transaction.py
@@ -75,9 +75,17 @@ class Transaction(models.Model):
('0', 'not'),
('1', 'Favorite'),
], size=1, string="Favorite")
- signature = fields.Binary("Signature image")
+ signature = fields.Binary("Signature image",compute='compute_img',store=True)
tran_tag = fields.Many2many(comodel_name='transaction.tag', string='Tags')
add_rank = fields.Integer(string='Transaction Rank')
+
+ @api.depends('type','subject')
+ def compute_img(self):
+ employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
+ if employee_id:
+ entity = self.env['cm.entity'].search([('type','=','employee'),('employee_id', '=',employee_id)], limit=1)
+ for rec in self:
+ rec.signature = entity.image
# @api.onchange('tran_tag')
# def get_subject_type(self):
From 483fb67e3c8964c466b22f62f24b1c63c814aa27 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:41:49 +0300
Subject: [PATCH 4/4] Update letter.py
---
.../exp_transation_letters/models/letter.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/odex25_transactions/exp_transation_letters/models/letter.py b/odex25_transactions/exp_transation_letters/models/letter.py
index 7fdf560cd..a4743e883 100644
--- a/odex25_transactions/exp_transation_letters/models/letter.py
+++ b/odex25_transactions/exp_transation_letters/models/letter.py
@@ -14,13 +14,21 @@ class Letters(models.Model):
date = fields.Date(string="Date")
hijir_date = fields.Char(string="Hijir Date", compute='compute_hijri')
content = fields.Html(string="Content")
- signature = fields.Binary("Signature image")
+ signature = fields.Binary("Signature image",compute='compute_img',store=True)
transaction_type = fields.Selection([('internal', 'Internal'), ('outgoing', 'Outgoing'),
('incoming', 'Incoming')], default='internal', string='Transaction Type')
incoming_transaction_id = fields.Many2one(comodel_name='incoming.transaction', string='Incoming Transaction')
internal_transaction_id = fields.Many2one(comodel_name='internal.transaction', string='Internal Transaction')
outgoing_transaction_id = fields.Many2one(comodel_name='outgoing.transaction', string='Outgoing Transaction')
+ @api.depends('transaction_type','name')
+ def compute_img(self):
+ employee_id = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
+ if employee_id:
+ entity = self.env['cm.entity'].search([('type','=','employee'),('employee_id', '=',employee_id)], limit=1)
+ for rec in self:
+ rec.signature = entity.image
+
@api.onchange('transaction_type')
def set_value_false(self):
if self.transaction_type == 'internal':