[UPDATE]UPDATEaction and menu
This commit is contained in:
parent
1b7a222ef5
commit
7e4de2624d
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -55,77 +55,40 @@
|
|||
<field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_user'))]"/>
|
||||
</record>
|
||||
<!-- todo start -->
|
||||
<record id="outgoing_transaction_rule_employee" model="ir.rule">
|
||||
<field name="name">Employee can view own outgoing transactions </field>
|
||||
<field name="model_id" ref="model_outgoing_transaction"/>
|
||||
<field name="domain_force">['|','|','|','|',('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)]</field>
|
||||
<field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_employee_group'))]"/>
|
||||
</record>
|
||||
<record id="internal_transaction_rule_employee" model="ir.rule">
|
||||
<field name="name">Employee can view own internal transactions </field>
|
||||
<field name="model_id" ref="model_internal_transaction"/>
|
||||
<field name="domain_force">['|','|','|','|',('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)]</field>
|
||||
<field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_employee_group'))]"/>
|
||||
</record>
|
||||
<!-- <record id="outgoing_transaction_rule_employee" model="ir.rule">-->
|
||||
<!-- <field name="name">Employee can view own outgoing transactions </field>-->
|
||||
<!-- <field name="model_id" ref="model_outgoing_transaction"/>-->
|
||||
<!-- <field name="domain_force">['|','|','|','|',('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)]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_employee_group'))]"/>-->
|
||||
<!-- </record>-->
|
||||
<!-- <record id="internal_transaction_rule_employee" model="ir.rule">-->
|
||||
<!-- <field name="name">Employee can view own internal transactions </field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/>-->
|
||||
<!-- <field name="domain_force">['|','|','|','|',('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)]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_employee_group'))]"/>-->
|
||||
<!-- </record>-->
|
||||
<!-- todo end -->
|
||||
|
||||
<record id="outgoing_transaction_rule_manager_read_only" model="ir.rule">
|
||||
<field name="name">Managers can view all outgoing transactions </field>
|
||||
<field name="model_id" ref="model_outgoing_transaction"/>
|
||||
<field name="domain_force">[(1, '=', 1)]</field> <!-- Allows access to all records -->
|
||||
<field name="groups" eval="[(4, ref('exp_transaction_documents.group_transaction_manager'))]"/>
|
||||
<field name="perm_read" eval="True"/> <!-- Read permission -->
|
||||
<field name="perm_write" eval="False"/> <!-- Write permission -->
|
||||
<field name="perm_create" eval="False"/> <!-- Create permission -->
|
||||
<field name="perm_unlink" eval="False"/> <!-- Delete permission -->
|
||||
</record>
|
||||
<!-- <record id="outgoing_transaction_rule_manager_read_only" model="ir.rule">-->
|
||||
<!-- <field name="name">Managers can view all outgoing transactions </field>-->
|
||||
<!-- <field name="model_id" ref="model_outgoing_transaction"/>-->
|
||||
<!-- <field name="domain_force">[(1, '=', 1)]</field> <!– Allows access to all records –>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_transaction_manager'))]"/>-->
|
||||
<!-- <field name="perm_read" eval="True"/> <!– Read permission –>-->
|
||||
<!-- <field name="perm_write" eval="False"/> <!– Write permission –>-->
|
||||
<!-- <field name="perm_create" eval="False"/> <!– Create permission –>-->
|
||||
<!-- <field name="perm_unlink" eval="False"/> <!– Delete permission –>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<record id="internal_transaction_rule_manager_read_only" model="ir.rule">
|
||||
<field name="name">Managers can view all internal transactions</field>
|
||||
<field name="model_id" ref="model_internal_transaction"/> <!-- or the relevant model -->
|
||||
<field name="domain_force">[(1, '=', 1)]</field> <!-- Allows access to all records -->
|
||||
<field name="groups" eval="[(4, ref('exp_transaction_documents.group_transaction_manager'))]"/>
|
||||
<field name="perm_read" eval="True"/> <!-- Read permission -->
|
||||
<field name="perm_write" eval="False"/> <!-- Write permission -->
|
||||
<field name="perm_create" eval="False"/> <!-- Create permission -->
|
||||
<field name="perm_unlink" eval="False"/> <!-- Delete permission -->
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<!-- <record id="internal_transaction_rule_unit_manager" model="ir.rule">-->
|
||||
<!-- <field name="name">Manager are allowed to access their own internal transaction</field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/>-->
|
||||
<!-- <field name="domain_force">[('preparation_id.manager_id.user_id', '=', user.id)]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_unit_manager'))]"/>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<!-- <record id="internal_transaction_rule_reviewer" model="ir.rule">-->
|
||||
<!-- <field name="name">Reviewer are allowed to access their own internal transaction</field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/>-->
|
||||
<!-- <field name="domain_force">[('cc_ids.user_id', '=', user.id)]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_reviewer'))]"/>-->
|
||||
<!-- </record>-->
|
||||
<!--Access for outgoing transaction-->
|
||||
<!-- <record id="outgoing_transaction_rule_user" model="ir.rule">-->
|
||||
<!-- <field name="name">Users are allowed to access their own outgoing transaction</field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/>-->
|
||||
<!-- <field name="domain_force">['|', ('to_ids.secretary_id.user_id', '=', user.id), ('to_ids.user_id', '=', user.id)]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_user'))]"/>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<!-- <record id="outgoing_transaction_rule_unit_manager" model="ir.rule">-->
|
||||
<!-- <field name="name">Manager are allowed to access their own outgoing transaction</field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/>-->
|
||||
<!-- <field name="domain_force">[('preparation_id.manager_id.user_id', '=', user.id])]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_unit_manager'))]"/>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<!-- <record id="outgoing_transaction_rule_reviewer" model="ir.rule">-->
|
||||
<!-- <field name="name">Reviewer are allowed to access their own outgoing transaction</field>-->
|
||||
<!-- <field name="model_id" ref="model_outgoing_transaction"/>-->
|
||||
<!-- <field name="domain_force">[('cc_ids.user_id', '=', user.id])]</field>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_cm_reviewer'))]"/>-->
|
||||
<!-- </record>-->
|
||||
<!-- <record id="internal_transaction_rule_manager_read_only" model="ir.rule">-->
|
||||
<!-- <field name="name">Managers can view all internal transactions</field>-->
|
||||
<!-- <field name="model_id" ref="model_internal_transaction"/> <!– or the relevant model –>-->
|
||||
<!-- <field name="domain_force">[(1, '=', 1)]</field> <!– Allows access to all records –>-->
|
||||
<!-- <field name="groups" eval="[(4, ref('exp_transaction_documents.group_transaction_manager'))]"/>-->
|
||||
<!-- <field name="perm_read" eval="True"/> <!– Read permission –>-->
|
||||
<!-- <field name="perm_write" eval="False"/> <!– Write permission –>-->
|
||||
<!-- <field name="perm_create" eval="False"/> <!– Create permission –>-->
|
||||
<!-- <field name="perm_unlink" eval="False"/> <!– Delete permission –>-->
|
||||
<!-- </record>-->
|
||||
</data>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -161,10 +161,10 @@
|
|||
<field name="name">Incoming Internal Transaction</field>
|
||||
<field name="res_model">internal.transaction</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name='domain'>[('create_uid','!=',uid),('state','=','send')] </field>
|
||||
<!-- ,'|','|',('to_ids.secretary_id.user_id', '=', uid),
|
||||
<field name='domain'>['&',('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) -->
|
||||
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),
|
||||
(0, 0, {'view_mode': 'tree','view_id':ref('exp_transaction_documents.common_transaction_internal_tree')}),
|
||||
|
|
@ -195,12 +195,12 @@
|
|||
<field name="name">Outgoing Internal Transaction</field>
|
||||
<field name="res_model">internal.transaction</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name='domain'>[('create_uid', '=', uid)]</field>
|
||||
<field name='domain'>[('state', '!=', 'closed'),('employee_id.user_id','=',uid)]</field>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">Create the first Outgoing Internal Transaction
|
||||
</p>
|
||||
</field>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
<field name="view_ids" eval="[(5, 0, 0),e
|
||||
(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')})]"/>
|
||||
<field name="search_view_id" ref="view_internal_transaction_filter"/>
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
<field name="res_model">outgoing.transaction</field>
|
||||
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name='domain'>[('create_uid', '=', uid),('state', '!=', 'closed')]</field>
|
||||
<field name='domain'>[('state', '!=', 'closed'),('employee_id.user_id','=',uid)]</field>
|
||||
<field name="view_id" ref="exp_transaction_documents.outgoing_transaction_external_tree"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">Create the first External outgoing Transaction
|
||||
|
|
@ -362,7 +362,7 @@
|
|||
<field name="res_model">incoming.transaction</field>
|
||||
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name='domain'>[('state', '!=', 'closed')]</field>
|
||||
<field name='domain'>[('state', '!=', 'closed'),('employee_id.user_id','=',uid)]</field>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">Create the first External Incoming Transaction
|
||||
</p>
|
||||
|
|
@ -617,6 +617,6 @@
|
|||
action="dep_forward_incoming_external_tran_action"/>
|
||||
<!--Report Menu-->
|
||||
<menuitem id="parent_report_menu" name="Reports"
|
||||
parent="cm_root_menu"/>
|
||||
parent="cm_root_menu" sequence="8"/>
|
||||
</data>
|
||||
</odoo>
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
options="{'no_create':True}"/>
|
||||
<field name="project_id" widget="many2many_tags"
|
||||
options="{'no_create':True}"/>
|
||||
<field name="transaction_type" invisible="0"/>
|
||||
|
||||
<field invisible="0" name="to_users" widget="many2many_tags"
|
||||
options="{'no_create':True}"/>
|
||||
<field name="cc_users" invisible="0" widget="many2many_tags"
|
||||
|
|
|
|||
|
|
@ -178,9 +178,6 @@
|
|||
</xpath>
|
||||
<xpath expr="//field[@name='to_ids']" position="after">
|
||||
<field name="partner_id"/>
|
||||
<field widget="many2many_tags" invisible="0" name="to_users"/>
|
||||
<field name="transaction_type" invisible="0"/>
|
||||
<field widget="many2many_tags" invisible="0" name="cc_users"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='to_ids']" position="before">
|
||||
<field name="type_sender"/>
|
||||
|
|
|
|||
|
|
@ -140,9 +140,7 @@
|
|||
</header>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='to_ids']" position="before">
|
||||
<field widget="many2many_tags" invisible="0" name='to_users'/>
|
||||
<field name='company_name'/>
|
||||
<field invisible="0" widget="many2many_tags" name='cc_users'/>
|
||||
<field name="is_partner" widget="boolean_toggle"/>
|
||||
<field name="partner_id"
|
||||
attrs="{'invisible':[('is_partner','!=',True)],'required':[('is_partner','=',True)]}"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue