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 3e0c42395..657bf7d34 100644
--- a/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
+++ b/odex25_transactions/exp_transaction_documents/views/actions_and_menus.xml
@@ -5,12 +5,14 @@
/>
-
+
+ groups="exp_transaction_documents.group_transaction_manager" />
-
+
Entities
cm.entity
@@ -27,12 +29,13 @@
transaction.tag
-
+
-
+
Transaction Tag
transaction.tag
@@ -44,11 +47,12 @@
+ parent="cm_settings_menu" sequence="5" action="cm_entity_list_action" />
+ parent="cm_settings_menu" sequence="5" action="transaction_tag_action" />
-
+
Job Titles
cm.job.title
@@ -60,7 +64,8 @@
-
+
Transaction Types
cm.subject.type
@@ -73,9 +78,10 @@
+ parent="cm_settings_menu" sequence="6" action="cm_subject_type_list_action" />
-
+
Important degrees
cm.transaction.important
@@ -88,9 +94,10 @@
+ parent="cm_settings_menu" sequence="7" action="cm_transaction_important_list_action" />
-
+
Procedures
cm.procedure
@@ -103,9 +110,10 @@
+ parent="cm_settings_menu" sequence="8" action="cm_procedure_list_action" />
-
+
Archive Types
cm.archive.type
@@ -118,9 +126,10 @@
+ parent="cm_settings_menu" sequence="10" action="cm_archive_type_list_action" />
-
+
Attachment Types
cm.attachment.type
@@ -133,7 +142,7 @@
+ parent="cm_settings_menu" sequence="11" action="cm_attachment_type_list_action" />
@@ -150,70 +159,79 @@
-
+
+ parent="cm_root_menu" sequence="0" />
+ parent="parent_internal_tran_menu" sequence="0" />
+ parent="parent_internal_tran_menu" sequence="1" />
-
+
Incoming Internal Transaction
internal.transaction
tree,form
[
'&',
- ('state', 'in', ['send', 'reply']),
- '|', '|',
- '&',
- ('is_forward', '=', False),
- '|',
- ('to_ids.secretary_id.user_id', '=', uid),
- ('to_ids.user_id', '=', uid),
- '&',
- ('is_forward', '=', True),
- ('forward_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)
- ]
-
-
+
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
+
{'show_response_fields': True}
-
+ parent="income_internal_tran_menu" sequence="0" action="incoming_internal_tran_action" />
+
Replying Transaction
internal.transaction
tree,form
[
- ('state', '=', 'reply'),
- '|', '|',
- ('employee_id.user_id', '=', uid),
- ('forward_user_id', '=', uid),
+ ('state', '=', 'reply'),
+ '|', '|',
+ ('employee_id.user_id', '=', uid),
+ ('forward_user_id', '=', uid),
('to_ids.user_id', '=', uid)
- ]
-
-
+
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
+
{}
-
+
Outgoing Internal Transaction
internal.transaction
@@ -224,13 +242,14 @@
-
+ eval="[(5, 0, 0),(0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.transaction_internal_tree')}),(0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.internal_transaction_form')})]" />
+
{}
-
+ parent="out_internal_tran_menu" sequence="1" action="outgoing_internal_tran_action" />
+
To view Transaction
internal.transaction
@@ -239,16 +258,18 @@
[('state','!=','draft'),'|',('trace_ids.cc_ids.user_id','=',uid),('cc_ids.user_id','=',uid)]
-
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.to_view_transaction_form')})]" />
+
{}
+ parent="income_internal_tran_menu" sequence="3" action="to_view_internal_tran_action" />
-
+
To Approve Transaction
@@ -258,74 +279,89 @@
[('state','=','to_approve'),('preparation_id.manager_id.user_id','=',uid)]
-
-
+
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
+
{}
-
+ parent="income_internal_tran_menu" sequence="4" action="to_approve_internal_tran_action"
+ groups="exp_transaction_documents.group_cm_approval" />
+
Forward Transaction
internal.transaction
tree,form
- [('is_forward', '=', True), '|', ('last_forwarded_user', '=', uid), ('employee_id.user_id', '=', uid)]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.forward_transaction_view')})]" />
-
+ parent="income_internal_tran_menu" sequence="6" action="forward_internal_tran_action" />
+
Cancelled Transaction
internal.transaction
tree,form
- [('state', '=', 'closed'), '|', ('employee_id.user_id', '=', uid), ('to_ids.user_id', '=', uid)]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
+ parent="income_internal_tran_menu" sequence="5" action="cancel_internal_tran_action" />
-
+
-
-
+ parent="cm_root_menu" sequence="1" />
+
+
-
+ parent="parent_external_tran_menu" sequence="1" />
+
Outgoing External Transaction
outgoing.transaction
tree,form
[('employee_id.user_id', '=', uid)]
-
+
Create the first External outgoing Transaction
-
+
{}
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.outgoing_external_transaction_form')})]" />
-
+ parent="parent_external_outgoing_tran_menu" sequence="0"
+ action="outgoing_external_tran_action" />
+
To view Transaction
outgoing.transaction
@@ -334,15 +370,19 @@
[('state','!=','draft'),'|',('trace_ids.cc_ids.user_id','=',uid),('cc_ids.user_id','=',uid)]
-
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
+
{}
-
+ parent="parent_external_outgoing_tran_menu" sequence="2"
+ action="outgoing_external_tran_view_action" />
+
To Approve External Transaction
outgoing.transaction
@@ -352,34 +392,43 @@
[('state','=','to_approve'),('preparation_id.manager_id.user_id','=',uid)]
-
+
{}
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
-
+ parent="parent_external_outgoing_tran_menu" sequence="1"
+ action="outgoing_external_tran_approve_action"
+ groups="exp_transaction_documents.group_cm_approval" />
+
Canceled Transaction
outgoing.transaction
tree,form
- [('state', 'in', ['canceled', 'closed']), '|', ('employee_id.user_id', '=', uid), ('to_ids.user_id', '=', uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
-
-
+ parent="parent_external_outgoing_tran_menu" sequence="3"
+ action="outgoing_external_tran_cancelled_action" />
+
+
-
+ parent="parent_external_tran_menu" sequence="1" />
+
Incoming Transaction
incoming.transaction
@@ -390,15 +439,19 @@
Create the first External Incoming Transaction
-
+
{}
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.incoming_external_transaction_form')})]" />
-
+ parent="parent_external_incoming_tran_menu" sequence="1"
+ action="incoming_external_tran_action" />
+
Forward External Transaction
incoming.transaction
@@ -408,51 +461,57 @@
('state', '=', 'send'),
'|', '|',
'&',
- ('is_forward', '=', False),
- '|',
- ('to_ids.secretary_id.user_id', '=', uid),
- ('to_ids.user_id', '=', uid),
+ ('is_forward', '=', False),
+ '|',
+ ('to_ids.secretary_id.user_id', '=', uid),
+ ('to_ids.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),
- ('employee_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),
+ ('employee_id.user_id', '=', uid),
('last_forwarded_user', '=', uid)
- ]
-
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
+
{}
-
+ parent="parent_external_incoming_tran_menu" sequence="1"
+ action="forward_incoming_external_tran_action" />
+
Replying Transaction
incoming.transaction
tree,form
[
- ('state', '=', 'reply'),
- '|', '|',
- ('employee_id.user_id', '=', uid),
- ('forward_user_id', '=', uid),
+ ('state', '=', 'reply'),
+ '|', '|',
+ ('employee_id.user_id', '=', uid),
+ ('forward_user_id', '=', uid),
('to_ids.user_id', '=', uid)
- ]
-
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
+
{}
-
+ parent="parent_external_incoming_tran_menu" sequence="1"
+ action="reply_incoming_external_tran_action" />
+
To View Transaction
incoming.transaction
@@ -461,54 +520,68 @@
[('state','!=','draft'),'|',('trace_ids.cc_ids.user_id','=',uid),('cc_ids.user_id','=',uid)]
-
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
+
{}
-
+ parent="parent_external_incoming_tran_menu" sequence="1"
+ action="to_view_incoming_external_tran_action" />
+
+ parent="cm_root_menu" sequence="2" />
Internal Transaction
internal.transaction
tree,form
- ['&', ('state','=','closed'), '|', ('archive_user_id.user_id','=',uid), ('employee_id.user_id', '=', uid)]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="parent_archive_tran_menu" sequence="0" action="internal_archive_tran_action" />
+
External Incoming Transaction
incoming.transaction
tree,form
- ['&', ('state','=','closed'), '|', ('archive_user_id.user_id','=',uid), ('employee_id.user_id', '=', uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
-
-
+ parent="parent_archive_tran_menu" sequence="1" action="external_archive_tran_action" />
+
+
-
-
+ parent="cm_root_menu" groups="exp_transaction_documents.group_cm_department_manager"
+ sequence="2" />
+
+
-
+ parent="parent_department_tran_menu" sequence="1" />
+
Incoming Transaction
internal.transaction
@@ -517,31 +590,37 @@
[
('state','=','send'),
'|','|',
- ('to_ids.manager_id','=',uid),
- ('to_ids.parent_id.manager_id.user_id','=',uid),
- ('trace_ids.to_id.user_id','=',uid)
- ]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="internal_department_tran_menu" sequence="0"
+ action="dep_incoming_internal_tran_action" />
+
Outgoing Transaction
internal.transaction
tree,form
[('employee_id.parent_id.manager_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="internal_department_tran_menu" sequence="1"
+ action="dep_outgoing_internal_tran_action" />
+
To Approve Internal Transaction
@@ -552,14 +631,17 @@
[('state','=','to_approve'),('preparation_id.manager_id.user_id','=',uid)]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="internal_department_tran_menu" sequence="4"
+ action="dep_to_approve_internal_tran_action" />
+
Forward Transaction
@@ -567,76 +649,94 @@
tree,form
[('is_forward','=',True)]
-
-
+
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="internal_department_tran_menu" sequence="6"
+ action="dep_forward_internal_tran_action" />
+
Cancelled Transaction
internal.transaction
tree,form
- [('state','=','canceled'),('employee_id.parent_id.manager_id.user_id','=',uid)]
+
+ [('state','=','canceled'),('employee_id.parent_id.manager_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_form')})]" />
-
+ parent="internal_department_tran_menu" sequence="5"
+ action="dep_cancel_internal_tran_action" />
+
-
+ parent="parent_department_tran_menu" sequence="1" />
+
Outgoing Transaction
outgoing.transaction
tree,form
[('employee_id.parent_id.manager_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
-
+ parent="external_out_department_tran_menu" sequence="0"
+ action="dep_outgoing_external_tran_action" />
+
To Approve Transaction
outgoing.transaction
tree,form
- [('state','=','to_approve'),('employee_id.parent_id.manager_id.user_id','=',uid)]
+
+ [('state','=','to_approve'),('employee_id.parent_id.manager_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
-
+ parent="external_out_department_tran_menu" sequence="1"
+ action="dep_outgoing_external_tran_approve_action" />
+
Canceled Transaction
outgoing.transaction
tree,form
- [('state','=','canceled'),('employee_id.parent_id.manager_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_outgoing_external_transaction_form')})]" />
-
+ parent="external_out_department_tran_menu" sequence="3"
+ action="dep_outgoing_external_tran_cancelled_action" />
+
-
+ parent="parent_department_tran_menu" sequence="1" />
+
Incoming External Transaction
incoming.transaction
@@ -644,28 +744,34 @@
[('state','=','send'),'|','|',('to_ids.manager_id','=',uid),('to_ids.parent_id.manager_id.user_id','=',uid),('trace_ids.to_id.user_id','=',uid)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
-
+ parent="external_in_department_tran_menu" sequence="1"
+ action="dep_incoming_external_tran_action" />
+
Forward Transaction
incoming.transaction
tree,form
[('is_forward','=',True)]
-
+ (0, 0, {'view_mode': 'form', 'view_id': ref('exp_transaction_documents.common_transaction_external_form')})]" />
-
-
+ parent="external_in_department_tran_menu" sequence="1"
+ action="dep_forward_incoming_external_tran_action" />
+
+
@@ -698,29 +804,29 @@
+ parent="exp_transaction_documents.parent_internal_tran_menu"
+ groups="exp_transaction_documents.group_transaction_manager" sequence="2" />
+ name="All Internal Transactions"
+ parent="exp_transaction_documents.all_income_internal_tran_menu"
+ action="action_all_internal_transactions"
+ groups="exp_transaction_documents.group_transaction_manager"
+ sequence="1" />
+ name="All Outgoing External Transactions"
+ parent="exp_transaction_documents.parent_external_outgoing_tran_menu"
+ action="action_all_external_transactions"
+ groups="exp_transaction_documents.group_transaction_manager"
+ sequence="5" />
+ name="All Incoming External Transactions"
+ parent="exp_transaction_documents.parent_external_incoming_tran_menu"
+ action="action_all_incoming_external_transactions"
+ sequence="5" groups="exp_transaction_documents.group_transaction_manager" />