From 6b792b233db575706686592a70238f06e9f0987f Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sat, 5 Oct 2024 07:20:54 +0300
Subject: [PATCH] Update outgoing_transaction.py

---
 .../models/outgoing_transaction.py            | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
index 49fe75455..408b6ac22 100644
--- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
@@ -19,8 +19,7 @@ class OutgoingTransaction(models.Model):
     is_partner = fields.Boolean()
     partner_id = fields.Many2one('res.partner')
     incoming_transaction_id = fields.Many2one('incoming.transaction', string='Related Incoming')
-    to_ids = fields.Many2many(comodel_name='cm.entity', relation='outgoing_entity_rel', column1='outgoing_id'
-                              , column2='entity_id', string='Send To')
+    to_ids = fields.Many2many(comodel_name='cm.entity',string='Send To')
     company_name = fields.Many2one('res.partner',string='Delivery Company')
 
     to_users = fields.Many2many(comodel_name='res.users', string="To Users",relation='your_out_to_users_rel',column1='your_out_id',column2='user_id2',)
@@ -110,24 +109,44 @@ class OutgoingTransaction(models.Model):
                 raise ValidationError(_('Cannot delete a sent transaction!'))
         return super(InternalTransaction, self).unlink()
 
+    # def action_draft(self):
+    #     for record in self:
+    #         """her i need to review code for to_ids"""
+    #         # res = super(OutgoingTransaction, self).action_draft()
+    #         if record.subject_type_id.transaction_need_approve or record.preparation_id.need_approve:
+    #                 record.state = 'to_approve'
+    #         else:
+    #             record.state = 'complete'
+    #         # record.trace_create_ids('outgoing_transaction_id', record, 'sent')
+    #         partner_ids = [record.preparation_id.manager_id.user_id.partner_id.id]
+    #         subj = _('Message Has been send !')
+    #         msg = _(u'{} &larr; {}').format(record.employee_id.name, u' / '.join([k.name for k in record.to_ids]))
+    #         msg = u'{}<br /><b>{}</b> {}.<br />{}'.format(msg,
+    #                                                       _(u'Action Taken'), record.procedure_id.name,
+    #                                                       u'<a href="%s" >رابط المعاملة</a> ' % (
+    #                                                           record.get_url()))
+    #         self.action_send_notification(subj, msg, partner_ids)
+            # return res
+
+    
     def action_draft(self):
         for record in self:
-            """her i need to review code for to_ids"""
-            # res = super(OutgoingTransaction, self).action_draft()
+            """Here we need to review the code for to_ids"""
             if record.subject_type_id.transaction_need_approve or record.preparation_id.need_approve:
-                    record.state = 'to_approve'
+                record.state = 'to_approve'
             else:
                 record.state = 'complete'
-            # record.trace_create_ids('outgoing_transaction_id', record, 'sent')
+    
             partner_ids = [record.preparation_id.manager_id.user_id.partner_id.id]
-            subj = _('Message Has been send !')
-            msg = _(u'{} &larr; {}').format(record.employee_id.name, u' / '.join([k.name for k in record.to_ids]))
+            
+            subj = _('Message Has been sent!')
+            msg = _(u'{} &larr; {}').format(record.employee_id.name, record.to_ids.name)
+            
             msg = u'{}<br /><b>{}</b> {}.<br />{}'.format(msg,
                                                           _(u'Action Taken'), record.procedure_id.name,
-                                                          u'<a href="%s" >رابط المعاملة</a> ' % (
+                                                          u'<a href="%s" >رابط المعاملة</a>' % (
                                                               record.get_url()))
             self.action_send_notification(subj, msg, partner_ids)
-            # return res
 
     def action_email(self):
         # todo#add email function here
@@ -169,8 +188,4 @@ class OutgoingTransaction(models.Model):
         # vals['ean13'] = self.env['odex.barcode'].code128('OT', vals['name'], 'TR')
         return super(OutgoingTransaction, self).create(vals)
 
-    # 
-    # def unlink(self):
-    #     if self.env.uid != 1:
-    #         raise ValidationError(_("You can not delete transaction....."))
-    #     return super(OutgoingTransaction, self).unlink()
+