!8914 !8913 添加功能

Merge pull request !8914 from 李鹏宇/dev

yuthon_hr_employee/models/yuthon_medical_manage.py

@@ -12,6 +12,7 @@ class YuthonMedicalManage(models.Model):
     start_date = fields.Date(string='开始日期')
     year = fields.Char(string="年份")
     current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining")
+    entry_date = fields.Date(related='employee_id.entry_date', string="入职日期")
     remainder_the_year = fields.Float(string="本年剩余")
     last_year_quota = fields.Float(string="去年额度")
     last_year_used = fields.Float(string="去年使用", compute="_compute_last_year_used")

yuthon_hr_employee/views/yuthon_medical_manage_views.xml

@@ -4,7 +4,7 @@
         <field name="name">yuthon.medical.manage.tree</field>
         <field name="model">yuthon.medical.manage</field>
         <field name="arch" type="xml">
-            <tree string="体检费管理" editable="bottom" default_order="year desc">
+            <tree string="体检费管理" editable="bottom" default_order="year,entry_date desec">
                 <header>
                     <button name="property_reimbursement_form" string="提交体检费报销审批" type="object"
                             class="oe_highlight"/>