diff --git a/odex25_transactions/exp_transaction_documents/models/configuration.py b/odex25_transactions/exp_transaction_documents/models/configuration.py
index b07c9823a..cd7bb1096 100644
--- a/odex25_transactions/exp_transaction_documents/models/configuration.py
+++ b/odex25_transactions/exp_transaction_documents/models/configuration.py
@@ -89,6 +89,7 @@ class AttachmentRule(models.Model):
date = fields.Datetime(string='Date', default=fields.Datetime.now)
description = fields.Char(string='Description')
signed = fields.Boolean(string='Signed',readonly=True)
+ created_from_system = fields.Boolean(readonly=True)
def action_signature(self):
for rec in self:
diff --git a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
index 88031613a..9de1eb86b 100644
--- a/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
+++ b/odex25_transactions/exp_transaction_documents/views/transcation_common_view.xml
@@ -129,10 +129,11 @@
type="object"
string="Sign"
class="btn-link"
- icon="fa-signature" attrs="{'invisible':[('signed','=',True)]}"/>
+ icon="fa-signature" attrs="{'invisible':['|',('signed','=',True), ('created_from_system', '!=', True)]}"/>
+
@@ -240,8 +241,16 @@
-
+
+
+
+
+
@@ -353,8 +362,15 @@
-
+
+
+
+
diff --git a/odex25_transactions/exp_transation_letters/models/letter.py b/odex25_transactions/exp_transation_letters/models/letter.py
index ec9515802..130572f60 100644
--- a/odex25_transactions/exp_transation_letters/models/letter.py
+++ b/odex25_transactions/exp_transation_letters/models/letter.py
@@ -22,6 +22,7 @@ class Letters(models.Model):
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')
+ attachment_generated = fields.Boolean()
@api.depends('transaction_type','name')
def compute_img(self):
@@ -102,6 +103,7 @@ class Letters(models.Model):
'store_fname': ATTACHMENT_NAME,
'mimetype': 'application/pdf'
})
+ self.attachment_generated = True
return self.env['cm.attachment.rule'].sudo().create({
'employee_id': self.unite.id,
'entity_id': self.unite.id,
@@ -110,6 +112,7 @@ class Letters(models.Model):
field_name: res_id,
'date': datetime.datetime.now(),
'description': self.name,
+ 'created_from_system': True,
# 'signed' : True if self.is_sign else False
})
diff --git a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
index 6d1934390..32f5a8179 100644
--- a/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
+++ b/odex25_transactions/exp_transation_letters/reports/formal_letter.xml
@@ -296,9 +296,25 @@
-
-
![]()
+
+
+ اﻹسم:
+
+
+
+ الوظيفة:
+
+
+
+ التوقيع:
+
+
+
+
![]()
+
+
+
diff --git a/odex25_transactions/exp_transation_letters/reports/letter_template.xml b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
index 89932196e..b976c8c4e 100644
--- a/odex25_transactions/exp_transation_letters/reports/letter_template.xml
+++ b/odex25_transactions/exp_transation_letters/reports/letter_template.xml
@@ -296,8 +296,27 @@
-
![]()
+
+ اﻹسم:
+
+
+
+ الوظيفة:
+
+
+
+ التوقيع:
+
+
+
+
![]()
+
+
+
+
+
+
diff --git a/odex25_transactions/exp_transation_letters/views/letters_view.xml b/odex25_transactions/exp_transation_letters/views/letters_view.xml
index 08c82010c..8cc12e66b 100644
--- a/odex25_transactions/exp_transation_letters/views/letters_view.xml
+++ b/odex25_transactions/exp_transation_letters/views/letters_view.xml
@@ -19,7 +19,8 @@