devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Samir aladawi transactions improvements
This commit is contained in:
SamirLADOUI-sa 2024-12-30 23:09:17 +01:00 committed by GitHub
parent b94be26470 0fc77e2bea
commit e44e43929e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_transactions/exp_transaction_documents/models/entity.py
View File

@ -71,7 +71,7 @@ class Entity(models.Model):
department_id = fields.Many2one('hr.department')
manager_id = fields.Many2one(comodel_name='cm.entity', string='Unit Manager')
secretary_id = fields.Many2one(comodel_name='cm.entity', string='Employee in charge of transactions')
user_id = fields.Many2one(comodel_name='res.users', string='Related User', related='employee_id.user_id')
user_id = fields.Many2one(comodel_name='res.users', string='Related User', related='employee_id.user_id', store=True)
# job_title_id = fields.Many2one(comodel_name='cm.job.title', string='Job Title')
job_title_id = fields.Many2one(comodel_name='hr.job', string='Job Title')
need_approve = fields.Boolean(string='Need Aprove')

75
odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
View File

@ -163,18 +163,22 @@
<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'),
'|', '|', '|', '|',
<field name='domain'>[
'&amp;',
('state', '=', 'send'),
'|',
'&amp;',
('is_forward', '=', False),
'|',
('to_ids.secretary_id.user_id', '=', uid),
('to_ids.user_id', '=', uid),
'&amp;',
('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>
<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')}),
@ -191,12 +195,12 @@
<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>
('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')}),
@ -378,7 +382,22 @@
<field name="res_model">incoming.transaction</field>
<field name="view_mode">tree,form</field>
<field name='domain'>[('state', '!=', 'closed'),('employee_id.user_id', '=', uid)]</field>
<field name='domain'>[
'&amp;',
('state', '=', 'send'),
'|',
'&amp;',
('is_forward', '=', False),
'|',
('to_ids.secretary_id.user_id', '=', uid),
('to_ids.user_id', '=', uid),
'&amp;',
('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="help" type="html">
<p class="oe_view_nocontent_create">Create the first External Incoming Transaction
</p>
@ -396,10 +415,22 @@
<field name="name">Forward External Transaction</field>
<field name="res_model">incoming.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>
<field name='domain'>[
'&amp;',
('state', '=', 'send'),
'|',
'&amp;',
('is_forward', '=', False),
'|',
('to_ids.secretary_id.user_id', '=', uid),
('to_ids.user_id', '=', uid),
'&amp;',
('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_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_external_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]"/>
@ -415,7 +446,13 @@
<field name="res_model">incoming.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_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_external_tree')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]"/>