transaction(delegation)
This commit is contained in:
parent
45123b0045
commit
8a892a7ba6
|
|
@ -64,8 +64,7 @@ class Transaction(models.Model):
|
|||
secret_reason = fields.Text(string="Secret reason")
|
||||
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")
|
||||
receive_user_id = fields.Many2one(related='receive_id.user_id',
|
||||
comodel_name='res.users', string='Receiver', store=True)
|
||||
receive_user_id = fields.Many2one(comodel_name='res.users', string='Receiver')
|
||||
receive_manger_id = fields.Many2one(comodel_name='cm.entity', string='Receiver',
|
||||
compute='compute_receive_manger_id')
|
||||
current_is_receive_manger = fields.Boolean(string='Is Manager', compute="set_to_is_manager")
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
<field name="current_is_forward_user" invisible="1"/>
|
||||
</xpath>
|
||||
<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="from_date"/>-->
|
||||
<!-- <field name="to_date"/>-->
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
</xpath>
|
||||
<xpath expr="//field[@name='to_ids']" position="after">
|
||||
<field name="partner_id"/>
|
||||
<field name="to_delegate"/>
|
||||
<field name="to_delegate" readonly="1" force_save="1"/>
|
||||
<!-- <field name="delegate_employee_id"/>-->
|
||||
<!-- <field name="from_date"/>-->
|
||||
<!-- <field name="to_date"/>-->
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
attrs="{'required': True}"
|
||||
domain="[('type','in',['unit'])]"
|
||||
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="cc_ids" widget="many2many_tags"/>
|
||||
<field name="note"/>
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@ class Transaction(models.Model):
|
|||
for rec in self:
|
||||
employee_id, unit_id = self.get_employee_id(rec)
|
||||
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)
|
||||
if employee_records:
|
||||
rec.receive_id = employee_records
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ class ForwardTransactionWizard(models.TransientModel):
|
|||
def action_forward(self):
|
||||
transaction = ''
|
||||
name = ''
|
||||
if self.to_delegate:
|
||||
self.employee = self.employee.delegate_employee_id.id
|
||||
to_id = self.employee.id
|
||||
unit_id = self.employee.parent_id.id
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue