!1940 !1939 添加功能

Merge pull request !1940 from 李鹏宇/dev

yuthon_hr_employee/security/hr_company_security_group.xml

@@ -36,4 +36,13 @@
         <field name="perm_create" eval="True"/>
         <field name="perm_unlink" eval="True"/>
     </record>
+    <record id="inherit_hr_contract_views_rule" model="ir.rule">
+        <field name="name">合同公司过滤</field>
+        <field name="model_id" ref="model_hr_contract"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="True"/>
+        <field name="perm_create" eval="True"/>
+        <field name="perm_unlink" eval="True"/>
+    </record>
 </odoo>

yuthon_salary/models/inherit_hr_payslip.py

@@ -54,9 +54,9 @@ class InheritHrPayslip(models.Model):
                     if line.name == '高温补贴':
                         rec.high_temperature_allowance = line.total
                     if line.name == '通讯补贴':
-                        rec.communication_allowance = line.total
+                        rec.commuting_allowance = line.total
                     if line.name == '全勤奖':
-                        rec.full_attendance_bonus = line.total
+                        rec.full_attendance_award = line.total
                     if line.name == '加班费':
                         rec.overtime_pay = line.total
                     if line.name == '误餐费':