Merge pull request #2000 from expsa/samir-aladawi-transactions-improvements

Samir aladawi transactions improvements

odex25_transactions/exp_transaction_documents/i18n/ar_001.po

@@ -3006,7 +3006,6 @@ msgstr "سجل التتبع"
 #. module: exp_transaction_documents
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.common_transactions_form
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_incoming_transaction_filter
-#: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_internal_transaction_filter
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_outgoing_transaction_filter
 msgid "Transaction"
 msgstr "المعاملة"
@@ -3041,6 +3040,11 @@ msgstr "تاريخ المعاملة (هجري)"
 msgid "Transaction Details"
 msgstr "تفاصيل المعاملة"
 
+#. module: exp_transaction_documents
+#: model:ir.model.fields,field_description:exp_transaction_documents.field_cm_transaction_important__rank
+msgid "Transaction Duration"
+msgstr "مدة المعاملة"
+
 #. module: exp_transaction_documents
 #: model:res.groups,name:exp_transaction_documents.group_transaction_manager
 msgid "Transaction Manager"
@@ -3052,11 +3056,12 @@ msgstr "مدير المعاملة"
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_outgoing_transaction__name
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_transaction_transaction__name
 #: model_terms:ir.ui.view,arch_db:exp_transaction_documents.common_transactions_form
+#: model_terms:ir.ui.view,arch_db:exp_transaction_documents.transaction_details_report_temp
+#: model_terms:ir.ui.view,arch_db:exp_transaction_documents.view_internal_transaction_filter
 msgid "Transaction Number"
 msgstr "رقم المعاملة"
 
 #. module: exp_transaction_documents
-#: model:ir.model.fields,field_description:exp_transaction_documents.field_cm_transaction_important__rank
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_incoming_transaction__add_rank
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_internal_transaction__add_rank
 #: model:ir.model.fields,field_description:exp_transaction_documents.field_outgoing_transaction__add_rank

odex25_transactions/exp_transaction_documents/models/configuration.py

@@ -34,7 +34,7 @@ class ImportantDegree(models.Model):
     _name = 'cm.transaction.important'
 
     name = fields.Char(string='Important Degree')
-    rank = fields.Integer(string='Transaction Rank')
+    rank = fields.Integer(string='Transaction Duration')
 
 
 class Procedure(models.Model):

odex25_transactions/exp_transaction_documents/models/transaction.py

@@ -148,7 +148,7 @@ class Transaction(models.Model):
             record.due_date = False
             if not len(record.important_id) or not record.transaction_date:
                 continue
-            rank = record.important_id.rank or 1
+            rank = record.important_id.rank
             final_rank = rank + record.add_rank
             date = datetime.strptime(str(record.transaction_date), DEFAULT_SERVER_DATE_FORMAT)
             due = date

odex25_transactions/exp_transaction_documents/reports/transaction_details_report_template.xml

@@ -82,7 +82,7 @@
                     <br/>
                     <table>
                         <tr>
-                            <td style="background-color:#d3d3d3;font-weight:bold;width:18%">Name</td>
+                            <td style="background-color:#d3d3d3;font-weight:bold;width:18%">Transaction Number</td>
                             <td style="width:32%"><t t-esc="o.name"/></td>
                             <td style="background-color:#d3d3d3;font-weight:bold;width:18%">state</td>
                             <td style="width:32%"> <t t-esc="dict(o.fields_get(allfields=['state'])['state']['selection'])[o.state]"/></td></tr>

odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml

@@ -163,9 +163,17 @@
             <field name="name">Incoming Internal Transaction</field>
             <field name="res_model">internal.transaction</field>
             <field name="view_mode">tree,form</field>
-            <field name='domain'>['&amp;',('state','=','send'),'|','|',('to_ids.secretary_id.user_id', '=', uid),
-                ('to_ids.user_id', '=',
-                uid),'|',('trace_ids.to_id.user_id','=',uid),'|',('trace_ids.to_id.secretary_id.user_id','=',uid),('receive_user_id','=',uid)]
+            <field name='domain'>
+                    [
+                        '&amp;', 
+                        ('state', '=', 'send'),
+                        '|', '|', '|', '|',
+                        ('to_ids.secretary_id.user_id', '=', uid),
+                        ('to_ids.user_id', '=', uid),
+                        ('trace_ids.to_id.user_id', '=', uid),
+                        ('trace_ids.to_id.secretary_id.user_id', '=', uid),
+                        ('receive_user_id', '=', uid)
+                    ]
             </field>
             <field name="view_id" ref="exp_transaction_documents.common_transaction_internal_tree"/>
             <field name="view_ids" eval="[(5, 0, 0),
@@ -182,7 +190,13 @@
             <field name="res_model">internal.transaction</field>
 
             <field name="view_mode">tree,form</field>
-            <field name='domain'>[('state', '=', 'reply'), '|', '|', ('employee_id.user_id', '=', uid), ('forward_user_id', '=', uid), ('to_ids.user_id', '=', uid)]</field>
+            <field name='domain'>[
+                                    ('state', '=', 'reply'), 
+                                    '|', '|', 
+                                    ('employee_id.user_id', '=', uid), 
+                                    ('forward_user_id', '=', uid), 
+                                    ('to_ids.user_id', '=', uid)]
+            </field>
             <field name="view_id" ref="exp_transaction_documents.common_transaction_internal_tree"/>
             <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_internal_tree')}),

odex25_transactions/exp_transaction_documents/views/internal.xml

@@ -9,7 +9,7 @@
                 <search string="internal transaction">
                     <field name="subject"/>
                     <field name="to_ids"/>
-                    <field name="name" string="Transaction" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Transaction Number" filter_domain="[('name','ilike',self)]"/>
                     <field name="tran_tag" string="tag" filter_domain="[('tran_tag','ilike',self)]"/>
                     <field name="is_reade"/>
                     <field name="is_favorite"/>

odex25_transactions/exp_transaction_documents/wizard/forward_transaction.xml

@@ -9,8 +9,13 @@
                     <group>
                         <group>
                             <field name="forward_type" required="True"/>
-                            <field name="internal_unit" attrs="{'required': True}" domain="[('type','in',['unit'])]" options="{'no_open': True, 'no_create': True}"/>
-                            <field name="employee" attrs="{'required': [('forward_type','=','employee')], 'invisible': [('forward_type','!=','employee')]}" domain="[('type','in',['employee']), ('parent_id','=',internal_unit)]" options="{'no_open': True, 'no_create': True}"/>
+                            <field name="internal_unit" 
+                                attrs="{'required': True}" 
+                                domain="[('type','in',['unit'])]" 
+                                options="{'no_open': True, 'no_create': True}"/>
+                            <field name="employee" 
+                                attrs="{'required': [('forward_type','=','employee')], 'invisible': [('forward_type','!=','employee')]}" 
+                                options="{'no_open': True, 'no_create': True}"/>
                             <field name="cc_ids" widget="many2many_tags"/>
                             <field name="note"/>
                             <field name="is_secret"/>

odex25_transactions/exp_transaction_documents/wizard/forward_trasaction.py

@@ -23,6 +23,20 @@ class ForwardTransactionWizard(models.TransientModel):
     filename = fields.Char()
     att_description = fields.Char(string='Attach Description')
 
+
+    @api.onchange('internal_unit', 'forward_type')
+    def _get_valid_employee_ids(self):
+        for rec in self:
+            domain = []
+            if rec.forward_type == 'employee' and rec.internal_unit:
+                domain = [('id', 'in', rec.env['cm.entity'].search([('type', '=', 'employee'), ('parent_id', '=', rec.internal_unit.id)]).ids)]
+            rec.employee = False
+            return {
+                "domain": {
+                    "employee": domain
+                }
+            }
+
     def action_forward(self):
         transaction = ''
         name = ''

odex25_transactions/exp_transaction_leave/wizard/forward_trasaction.py

@@ -112,6 +112,10 @@ class ForwardTransactionWizard(models.TransientModel):
 
         transaction.action_send_notification(subj, msg, partner_ids)
 
+        user_id = transaction.env.user.id
+        if user_id not in transaction.seen_user_ids.ids:
+            transaction.seen_user_ids = [(6, 0, [user_id])]
+
         if self.incoming_transaction_id:
             if transaction.state == 'draft':
                 transaction.state = 'send'