Merge pull request #5694 from expsa/khazraji_transaction

Khazraji transaction

odex25_transactions/exp_transaction_documents/models/__init__.py

@@ -7,5 +7,4 @@ from . import internal_transaction
 from . import outgoing_transaction
 from . import incoming_transaction
 from . import tools
-from . import letter
 #

odex25_transactions/exp_transaction_documents/models/configuration.py

@@ -143,28 +143,7 @@ class AttachmentRule(models.Model):
 
     def action_sign_transaction(self):
         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):
     #     for rec in self:
     #         if rec.internal_transaction_id:

odex25_transactions/exp_transaction_documents/models/letter.py

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-import base64
-from odoo import api, fields, models, _
-from odoo.exceptions import UserError
-from hijri_converter import convert
-import datetime
-
-
-class Letters(models.Model):
-    _name = "letters.letters"
-    name = fields.Char(string="Name", tracking=True)

odex25_transactions/exp_transation_letters/models/letter.py

@@ -7,8 +7,8 @@ import datetime
 
 
 class Letters(models.Model):
-    _inherit = ["letters.letters",'mail.thread']
+    _name = "letters.letters"
-
+    _inherit = 'mail.thread'
 
     name = fields.Char(string="Name", tracking=True)
     unite = fields.Many2one('cm.entity', string="Unite", tracking=True)
@@ -195,3 +195,35 @@ class LettersTemp(models.Model):
         ('0', 'not'),
         ('1', '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,
+            },
+        }
+