!2156 !2155 添加功能

Merge pull request !2156 from 李鹏宇/dev

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -107,9 +107,9 @@ class YuthonHrEmployee(models.Model):
     archiving_agency = fields.Char(string="存档机构")
     over_data_time = fields.Datetime(string="最后更新数据时间")
     # 工作信息 -- page
-    normal_overtime_hours = fields.Float(string="正常加班时间(小时)")
-    weekend_overtime_hours = fields.Float(string="周末加班时间(小时)")
-    holiday_overtime_hours = fields.Float(string="节假日加班时间(小时)")
+    normal_overtime_hours = fields.Float(string="正常加班时间(h)")
+    weekend_overtime_hours = fields.Float(string="周末加班时间(h)")
+    holiday_overtime_hours = fields.Float(string="节假日加班时间(h)")
     overtime_this_month = fields.Float(string="本月加班时")
     overtime_last_month = fields.Float(string="上月加班时")
     result_overtime = fields.Float(string="结算时")
@@ -169,6 +169,7 @@ class YuthonHrEmployee(models.Model):
     last_month_attendance_deduction = fields.Float(string="上月考勤扣款")
     last_month_base_salary_deduction = fields.Float(string="上月基本薪资扣款")
     last_month_performance_deduction = fields.Float(string="上月绩效扣款")
+    last_month_commuting_deduction = fields.Float(string='上月通信扣款')
     medical_insurance_base = fields.Float(string='基本医疗费基数', compute='_compute_insurance_bases')
     pension_insurance_base = fields.Float(string='基本养老费基数', compute='_compute_insurance_bases')
     work_injury_insurance_base = fields.Float(string='工伤保险费基数', compute='_compute_insurance_bases')
@@ -449,10 +450,10 @@ class YuthonHrEmployee(models.Model):
             else:
                 record.retire_years = 0
 
-    @api.depends('normal_overtime_hours', 'weekend_overtime_hours', 'holiday_overtime_hours')
+    @api.depends('normal_overtime_hours', 'weekend_overtime_hours')
     def _compute_all_overtime_hours(self):
         for record in self:
-            record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours + record.holiday_overtime_hours
+            record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours
 
     def hr_employee_time(self):
         for record in self:

yuthon_hr_employee/views/yuthon_hr_employee_views.xml

@@ -146,13 +146,14 @@
                         <field name="last_month_attendance_deduction"/>
                         <field name="last_month_base_salary_deduction"/>
                         <field name="last_month_performance_deduction"/>
+                        <field name="last_month_commuting_deduction"/>
                         <field name="is_salary"/>
                 </group>
                 <group name="overtime" string="加班" col="2">
                     <group>
-                        <field name="normal_overtime_hours" readonly="1"/>
-                        <field name="weekend_overtime_hours" readonly="1"/>
-                        <field name="holiday_overtime_hours" readonly="1"/>
+                        <field name="normal_overtime_hours" readonly="0"/>
+                        <field name="weekend_overtime_hours" readonly="0"/>
+                        <field name="holiday_overtime_hours" readonly="0"/>
                     </group>
                     <group>
                         <button name="put_overtime_return" string="详情" type="object" class="oe_highlight"/>
@@ -171,7 +172,7 @@
                 </group>
                 <group>
                     <field name="holiday_hours"/>
-                    <field name="all_overtime_hours"/>
+                    <field name="all_overtime_hours" readonly="0"/>
                     <field name="replacement_card_count"/>
                     <field name="duty_replacement_card"/>
                     <field name="meal_number"/>

yuthon_property/models/yuthon_resource_mgmt_config.py

@@ -158,15 +158,9 @@ class YuthonPropertyProduce(models.Model):
 class YuthonPremisesSetting(models.Model):
     _name = 'yuthon.premises.setting'
     _description = '楼盘配置'
-    _order = 'first_letter, name'
+    _order = 'name'
 
     name = fields.Char(string="名称")
-    first_letter = fields.Char(string='首字母', compute='_compute_first_letter', store=True)
-
-    @api.depends('name')
-    def _compute_first_letter(self):
-        for record in self:
-            record.first_letter = record.name[0].upper() if record.name else ''
 
 
 class RentFreeSetting(models.Model):

yuthon_property/views/yuthon_resource_mgmt_config_views.xml

@@ -278,7 +278,6 @@
         <field name="arch" type="xml">
             <tree editable="bottom">
                 <field name="name"/>
-                <field name="first_letter" column_invisible="1"/>
             </tree>
         </field>
     </record>

yuthon_salary/models/inherit_hr_payslip.py

@@ -73,7 +73,7 @@ class InheritHrPayslip(models.Model):
 
     performance_deduction = fields.Float(string='扣发绩效奖金', store=True)
     attendance_deduction = fields.Float(string='扣发全勤奖', store=True)
-    commuting_deduction = fields.Float(string='扣发通勤补贴', store=True)
+    commuting_deduction = fields.Float(string='扣发通信补贴', store=True)
     base_salary_deduction = fields.Float(string='扣发基本工资', store=True)