!2853 !2852 添加功能

Merge pull request !2853 from 李鹏宇/dev

yuthon_holiday/data/yuthon_holiday_data.xml

@@ -12,5 +12,6 @@
         <field name="code">yuthon_holiday_fixes_code</field>
         <field name="prefix">XZ</field>
         <field name="padding">4</field>
+        <field name="company_id" eval="False"/>
     </record>
 </odoo>

yuthon_holiday/models/yuthon_fixes_approval.py

@@ -51,5 +51,8 @@ class YuthonFixesApproval(models.Model):
                 'number_of_days': number_of_days,
                 'type_request_unit':type_request_unit,})
 
-
+    @api.onchange('users_id', 'original_hours', 'now_hours')
+    def _onchange_name(self):
+        if self.users_id and self.original_hours and self.now_hours:
+            self.name = self.users_id.name + '原时长'+ str(self.original_hours) + '小时' + '现时长' + str(self.now_hours) + '小时'
 

yuthon_holiday/views/yuthon_fixes_approval_views.xml

@@ -45,6 +45,7 @@
                      <group string="审批事项">
                         <group>
                             <field name="name"/>
+                            <field name="users_id"/>
                             <field name="work_end" invisible="1"/>
                             <field name="holiday_status_id"/>
                             <field name="original_days" invisible="now_type != 'days'"/>