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 #2023 from expsa/tasks_trans_31_ 

transaction(delegation)
This commit is contained in:
enagahh 2025-01-01 02:01:50 +02:00 committed by GitHub
parent d190fcbb3f 8a892a7ba6
commit d0c4850fcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
odex25_transactions/exp_transaction_documents/models/transaction.py
View File

@ -64,8 +64,7 @@ class Transaction(models.Model):
secret_reason = fields.Text(string="Secret reason") secret_reason = fields.Text(string="Secret reason")
secret_forward_user = fields.Many2one(comodel_name='cm.entity', string='User') secret_forward_user = fields.Many2one(comodel_name='cm.entity', string='User')
current_is_secret_user = fields.Boolean(string='Is Manager', compute="set_is_secret_user") current_is_secret_user = fields.Boolean(string='Is Manager', compute="set_is_secret_user")
receive_user_id = fields.Many2one(related='receive_id.user_id', receive_user_id = fields.Many2one(comodel_name='res.users', string='Receiver')
comodel_name='res.users', string='Receiver', store=True)
receive_manger_id = fields.Many2one(comodel_name='cm.entity', string='Receiver', receive_manger_id = fields.Many2one(comodel_name='cm.entity', string='Receiver',
compute='compute_receive_manger_id') compute='compute_receive_manger_id')
current_is_receive_manger = fields.Boolean(string='Is Manager', compute="set_to_is_manager") current_is_receive_manger = fields.Boolean(string='Is Manager', compute="set_to_is_manager")

4
odex25_transactions/exp_transaction_documents/views/internal.xml
View File

@ -111,7 +111,7 @@
<field name="current_is_forward_user" invisible="1"/> <field name="current_is_forward_user" invisible="1"/>
</xpath> </xpath>
<xpath expr="//field[@name='tran_tag']" position="after"> <xpath expr="//field[@name='tran_tag']" position="after">
<field name="to_delegate"/> <field name="to_delegate" readonly="1" force_save="1"/>
<!-- <field name="delegate_employee_id"/>--> <!-- <field name="delegate_employee_id"/>-->
<!-- <field name="from_date"/>--> <!-- <field name="from_date"/>-->
<!-- <field name="to_date"/>--> <!-- <field name="to_date"/>-->
@ -188,7 +188,7 @@
</xpath> </xpath>
<xpath expr="//field[@name='to_ids']" position="after"> <xpath expr="//field[@name='to_ids']" position="after">
<field name="partner_id"/> <field name="partner_id"/>
<field name="to_delegate"/> <field name="to_delegate" readonly="1" force_save="1"/>
<!-- <field name="delegate_employee_id"/>--> <!-- <field name="delegate_employee_id"/>-->
<!-- <field name="from_date"/>--> <!-- <field name="from_date"/>-->
<!-- <field name="to_date"/>--> <!-- <field name="to_date"/>-->

2
odex25_transactions/exp_transaction_documents/wizard/forward_transaction.xml
View File

@ -13,7 +13,7 @@
attrs="{'required': True}" attrs="{'required': True}"
domain="[('type','in',['unit'])]" domain="[('type','in',['unit'])]"
options="{'no_open': True, 'no_create': True}"/> options="{'no_open': True, 'no_create': True}"/>
<field name="to_delegate" attrs="{'invisible': [('forward_type','!=','employee')]}"/> <field name="to_delegate" attrs="{'invisible': [('forward_type','!=','employee')]}" readonly="1" force_save="1"/>
<field name="employee" attrs="{'required': [('forward_type','=','employee')], 'invisible': [('forward_type','!=','employee')]}" 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="cc_ids" widget="many2many_tags"/>
<field name="note"/> <field name="note"/>

1
odex25_transactions/exp_transaction_leave/models/leave.py
View File

@ -194,6 +194,7 @@ class Transaction(models.Model):
for rec in self: for rec in self:
employee_id, unit_id = self.get_employee_id(rec) employee_id, unit_id = self.get_employee_id(rec)
rec.receive_id = employee_id rec.receive_id = employee_id
rec.receive_user_id = rec.receive_id.user_id
employee_records = self.get_employee_leave(employee_id, unit_id, rec.transaction_date) employee_records = self.get_employee_leave(employee_id, unit_id, rec.transaction_date)
if employee_records: if employee_records:
rec.receive_id = employee_records rec.receive_id = employee_records

2
odex25_transactions/exp_transaction_leave/wizard/forward_trasaction.py
View File

@ -9,6 +9,8 @@ class ForwardTransactionWizard(models.TransientModel):
def action_forward(self): def action_forward(self):
transaction = '' transaction = ''
name = '' name = ''
if self.to_delegate:
self.employee = self.employee.delegate_employee_id.id
to_id = self.employee.id to_id = self.employee.id
unit_id = self.employee.parent_id.id unit_id = self.employee.parent_id.id