diff --git a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
index 74c9d4053..725fb479b 100644
--- a/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/incoming_transaction.py
@@ -61,21 +61,11 @@ class IncomingTransaction(models.Model):
cc_ids = fields.Many2many(comodel_name='cm.entity', relation='incoming_entity_cc_rel',
column1='incoming_id', column2='entity_id', string='CC To',)
- to_users = fields.Many2many(comodel_name='res.users', string="To Users",compute="_compute_to_users",store=True,relation='your_coming_to_users_rel',column1='your_comasdfg_id',column2='user_id5',)
+ to_users = fields.Many2many(comodel_name='res.users', string="To Users",relation='your_coming_to_users_rel',column1='your_comasdfg_id',column2='user_id5',)
- cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",compute="_compute_cc_users",store=True,relation='your_ing_to_users_rel',column1='your_use0_id',column2='user_id87',)
+ cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",relation='your_ing_to_users_rel',column1='your_use0_id',column2='user_id87',)
- @api.depends('to_ids')
- def _compute_to_users(self):
- for record in self:
- users = record.to_ids.mapped('user_id')
- record.to_users = users
- @api.depends('cc_ids')
- def _compute_cc_users(self):
- for record in self:
- users = record.cc_ids.mapped('user_id')
- record.cc_users = users
tran_tag = fields.Many2many(comodel_name='transaction.tag', string='Tags')
tran_tag_unit = fields.Many2many(comodel_name='transaction.tag', string='Business unit',
diff --git a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
index ee7195e27..cb5e42a15 100644
--- a/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/internal_transaction.py
@@ -30,20 +30,10 @@ class InternalTransaction(models.Model):
cc_ids = fields.Many2many(comodel_name='cm.entity', relation='internal_entity_cc_rel',
column1='internal_id', column2='entity_id', string='CC To')
- to_users = fields.Many2many(comodel_name='res.users', string="To Users",compute="_compute_to_users",store=True,relation='your_int_to_users_rel',column1='your_int_id',column2='user_id3',)
+ to_users = fields.Many2many(comodel_name='res.users', string="To Users",relation='your_int_to_users_rel',column1='your_int_id',column2='user_id3',)
- cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",compute="_compute_cc_users",store=True,relation='your_intr_to_users_rel',column1='your_inte_id',column2='user_id4',)
- @api.depends('to_ids')
- def _compute_to_users(self):
- for record in self:
- users = record.to_ids.mapped('user_id')
- record.to_users = users
+ cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",relation='your_intr_to_users_rel',column1='your_inte_id',column2='user_id4',)
- @api.depends('cc_ids')
- def _compute_cc_users(self):
- for record in self:
- users = record.cc_ids.mapped('user_id')
- record.cc_users = users
project_domain = fields.Many2many('project.project', string='Project Domain')
processing_ids = fields.Many2many(comodel_name='internal.transaction', relation='transaction_internal_rel',
diff --git a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
index fb854b30c..49fe75455 100644
--- a/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
+++ b/odex25_transactions/exp_transaction_documents/models/outgoing_transaction.py
@@ -23,7 +23,7 @@ class OutgoingTransaction(models.Model):
, column2='entity_id', string='Send To')
company_name = fields.Many2one('res.partner',string='Delivery Company')
- to_users = fields.Many2many(comodel_name='res.users', string="To Users",compute="_compute_to_users",store=True,relation='your_out_to_users_rel',column1='your_out_id',column2='user_id2',)
+ to_users = fields.Many2many(comodel_name='res.users', string="To Users",relation='your_out_to_users_rel',column1='your_out_id',column2='user_id2',)
@@ -37,18 +37,8 @@ class OutgoingTransaction(models.Model):
to_name = fields.Char(string="Recipient")
cc_ids = fields.Many2many(comodel_name='cm.entity', relation='outgoing_entity_cc_rel',
column1='outgoing_id', column2='entity_id', string='CC To')
- cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",compute="_compute_cc_users",relation='your_com_to_users_rel',column1='your_use_id',column2='user_id',store=True)
- @api.depends('to_ids')
- def _compute_to_users(self):
- for record in self:
- users = record.to_ids.mapped('user_id')
- record.to_users = users
+ cc_users = fields.Many2many(comodel_name='res.users', string="CC Users",relation='your_com_to_users_rel',column1='your_use_id',column2='user_id',store=True)
- @api.depends('cc_ids')
- def _compute_cc_users(self):
- for record in self:
- users = record.cc_ids.mapped('user_id')
- record.cc_users = users
processing_ids = fields.Many2many(comodel_name='outgoing.transaction', relation='transaction_outgoing_outgoing_rel',
column1='transaction_id', column2='outgoing_id',
string='Process Transactions outgoing')
diff --git a/odex25_transactions/exp_transaction_documents/security/groups.xml b/odex25_transactions/exp_transaction_documents/security/groups.xml
index dc2f8d443..1f7de21ed 100644
--- a/odex25_transactions/exp_transaction_documents/security/groups.xml
+++ b/odex25_transactions/exp_transaction_documents/security/groups.xml
@@ -55,77 +55,40 @@
-
- Employee can view own outgoing transactions
-
- ['|','|','|','|',('create_uid', '=', user.id), ('trace_ids.to_id.secretary_id.user_id','=',user.id),('receive_user_id','=',user.id),('trace_ids.cc_ids.user_id','=',user.id),('cc_ids.user_id','=',user.id)]
-
-
-
- Employee can view own internal transactions
-
- ['|','|','|','|',('create_uid', '=', user.id),('trace_ids.to_id.secretary_id.user_id','=',user.id),('receive_user_id','=',user.id),('trace_ids.cc_ids.user_id','=',user.id),('cc_ids.user_id','=',user.id)]
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
- Managers can view all outgoing transactions
-
- [(1, '=', 1)]
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
- Managers can view all internal transactions
-
- [(1, '=', 1)]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
index cace1e113..a974fdc9c 100644
--- a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
+++ b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
@@ -161,10 +161,10 @@
Incoming Internal Transaction
internal.transaction
tree,form
- [('create_uid','!=',uid),('state','=','send')]
-
+ uid),'|',('trace_ids.to_id.user_id','=',uid),'|',('trace_ids.to_id.secretary_id.user_id','=',uid),('receive_user_id','=',uid)]
+
Outgoing Internal Transaction
internal.transaction
tree,form
- [('create_uid', '=', uid)]
+ [('state', '!=', 'closed'),('employee_id.user_id','=',uid)]
Create the first Outgoing Internal Transaction
-
@@ -288,14 +288,14 @@
outgoing.transaction
tree,form
- [('create_uid', '=', uid),('state', '!=', 'closed')]
+ [('state', '!=', 'closed'),('employee_id.user_id','=',uid)]
Create the first External outgoing Transaction
- {}
+ {}
@@ -362,7 +362,7 @@
incoming.transaction
tree,form
- [('state', '!=', 'closed')]
+ [('state', '!=', 'closed'),('employee_id.user_id','=',uid)]
Create the first External Incoming Transaction
@@ -617,6 +617,6 @@
action="dep_forward_incoming_external_tran_action"/>
+ parent="cm_root_menu" sequence="8"/>
-
+
\ No newline at end of file
diff --git a/odex25_transactions/exp_transaction_documents/views/incoming.xml b/odex25_transactions/exp_transaction_documents/views/incoming.xml
index b381db64f..adecd4ca8 100644
--- a/odex25_transactions/exp_transaction_documents/views/incoming.xml
+++ b/odex25_transactions/exp_transaction_documents/views/incoming.xml
@@ -124,7 +124,7 @@
options="{'no_create':True}"/>
-
+
-
-
-
diff --git a/odex25_transactions/exp_transaction_documents/views/outgoing.xml b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
index c387bad71..4f445da9d 100644
--- a/odex25_transactions/exp_transaction_documents/views/outgoing.xml
+++ b/odex25_transactions/exp_transaction_documents/views/outgoing.xml
@@ -140,9 +140,7 @@
-
-