From 60ee1a6239c3da00b53414dcee65d538d169ff92 Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Mon, 6 May 2024 18:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=BA=A7=E8=B0=83=E6=95=B4,=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=A2=84=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_employee/__manifest__.py            |  2 +-
 .../data/hr_department_data.xml               | 33 --------
 yuthon_hr_employee/data/job_lv_data.xml       | 29 -------
 yuthon_hr_employee/data/yuthon.job.lv.csv     | 81 +++++++++++++++++++
 yuthon_hr_employee/models/yuthon_job_lv.py    |  6 +-
 .../views/yuthon_job_lv_views.xml             |  4 +-
 6 files changed, 87 insertions(+), 68 deletions(-)
 delete mode 100644 yuthon_hr_employee/data/job_lv_data.xml
 create mode 100644 yuthon_hr_employee/data/yuthon.job.lv.csv

diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index 8db92ac3d..400697772 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -13,9 +13,9 @@
     'website': 'https://www.pengyuthon.com',
     'depends': ['hr'],
     'data': [
-        'data/job_lv_data.xml',
         'data/hr_department_data.xml',
         'data/user_role_data.xml',
+        'data/yuthon.job.lv.csv',
         'security/ir.model.access.csv',
         'views/yuthon_hr_employee_views.xml',
         'views/yuthon_hr_department_views.xml',
diff --git a/yuthon_hr_employee/data/hr_department_data.xml b/yuthon_hr_employee/data/hr_department_data.xml
index a828cd02b..1935d5e05 100644
--- a/yuthon_hr_employee/data/hr_department_data.xml
+++ b/yuthon_hr_employee/data/hr_department_data.xml
@@ -53,10 +53,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦9楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_cwb" model="hr.department">
@@ -64,10 +61,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦10楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_bgs" model="hr.department">
@@ -75,10 +69,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦11楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_qyglb" model="hr.department">
@@ -86,10 +77,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦12楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_zweb" model="hr.department">
@@ -97,10 +85,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦13楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_zbyyb" model="hr.department">
@@ -108,10 +93,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦14楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_tzfzb" model="hr.department">
@@ -119,10 +101,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦15楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_tzfzb" model="hr.department">
@@ -130,10 +109,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦16楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_tzfzb" model="hr.department">
@@ -141,10 +117,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦17楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_thtz"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_tzfzb" model="hr.department">
@@ -152,10 +125,7 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦18楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_bgs"/>
->>>>>>> origin/master
     </record>
 
     <record id="hr_department_tzfzb" model="hr.department">
@@ -163,9 +133,6 @@
         <field name="department_location">广州市天河区龙口西路90号天成大厦19楼东侧</field>
         <field name="is_institution">False</field>
         <field name="is_global_department">False</field>
-<<<<<<< HEAD
-=======
         <field name="parent_id" ref="hr_department_bgs"/>
->>>>>>> origin/master
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_employee/data/job_lv_data.xml b/yuthon_hr_employee/data/job_lv_data.xml
deleted file mode 100644
index 2253ca02b..000000000
--- a/yuthon_hr_employee/data/job_lv_data.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-<!--    正式员工-->
-    <record id="hr_department_pmjlyd" model="yuthon.job.lv">
-        <field name="name">部门经理一档</field>
-        <field name="base_wage">5300</field>
-        <field name="job_wage">5087</field>
-        <field name="post_wage">0</field>
-        <field name="performance_bonus">2800</field>
-        <field name="Phone_subsidy">300</field>
-        <field name="attendance_bonus">200</field>
-        <field name="all_wage">13687</field>
-        <field name="job_lv_type">regular_employee</field>
-    </record>
-
-<!--    试用员工-->
-    <record id="hr_department_syqbmjlyd" model="yuthon.job.lv">
-        <field name="name">试用期部门经理一档</field>
-        <field name="base_wage">4400</field>
-        <field name="job_wage">4070</field>
-        <field name="post_wage">0</field>
-        <field name="performance_bonus">0</field>
-        <field name="Phone_subsidy">300</field>
-        <field name="attendance_bonus">200</field>
-        <field name="all_wage">8970</field>
-        <field name="job_lv_type">Probationary_employee</field>
-    </record>
-
-</odoo>
\ No newline at end of file
diff --git a/yuthon_hr_employee/data/yuthon.job.lv.csv b/yuthon_hr_employee/data/yuthon.job.lv.csv
new file mode 100644
index 000000000..d2f48d246
--- /dev/null
+++ b/yuthon_hr_employee/data/yuthon.job.lv.csv
@@ -0,0 +1,81 @@
+"name","base_wage","job_wage","post_wage","performance_bonus","phone_subsidy","attendance_bonus","all_wage","create_time","end_time","job_lv_type"
+"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","","正式员工"
+"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","","正式员工"
+"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","","正式员工"
+"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","","正式员工"
+"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","","正式员工"
+"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","","正式员工"
+"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","","正式员工"
+"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","","正式员工"
+"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","","正式员工"
+"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","","正式员工"
+"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","","正式员工"
+"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","","正式员工"
+"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","","正式员工"
+"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","","正式员工"
+"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","","正式员工"
+"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","","正式员工"
+"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","","正式员工"
+"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","","正式员工"
+"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","","正式员工"
+"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","","正式员工"
+"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","","正式员工"
+"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","","正式员工"
+"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","","正式员工"
+"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","","正式员工"
+"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","","正式员工"
+"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","","正式员工"
+"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","","正式员工"
+"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","","正式员工"
+"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","","正式员工"
+"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","","正式员工"
+"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","","正式员工"
+"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","","正式员工"
+"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","","正式员工"
+"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","","正式员工"
+"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","","正式员工"
+"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","","正式员工"
+"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","","正式员工"
+"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","","正式员工"
+"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","","正式员工"
+"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","","正式员工"
+"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","","正式员工"
+"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","","正式员工"
+"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","","正式员工"
+"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","","正式员工"
+"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","","正式员工"
+"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","","正式员工"
+"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","","正式员工"
+"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","","正式员工"
+"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","","正式员工"
+"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","","正式员工"
+"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","","正式员工"
+"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","","正式员工"
+"试用期部门经理一档","4400.0","4070.0","0.0","0.0","300.0","200.0","8970.0","","","试用员工"
+"试用期部门经理二档","4400.0","3774.0","0.0","0.0","300.0","200.0","8674.0","","","试用员工"
+"试用期部门经理三档","4400.0","3491.0","0.0","0.0","300.0","200.0","8391.0","","","试用员工"
+"试用期部门经理四档","4400.0","3218.0","0.0","0.0","300.0","200.0","8118.0","","","试用员工"
+"试用期部门经理五档","4400.0","2956.0","0.0","0.0","300.0","200.0","7856.0","","","试用员工"
+"试用期部门经理六档","4400.0","2704.0","0.0","0.0","300.0","200.0","7604.0","","","试用员工"
+"试用期部门经理七档","4400.0","2461.0","0.0","0.0","300.0","200.0","7361.0","","","试用员工"
+"试用期部门经理八档","4400.0","2228.0","0.0","0.0","300.0","200.0","7128.0","","","试用员工"
+"试用期部门副经理一档","4000.0","2919.0","0.0","0.0","300.0","200.0","7419.0","","","试用员工"
+"试用期部门副经理二档","4000.0","2684.0","0.0","0.0","300.0","200.0","7184.0","","","试用员工"
+"试用期部门副经理三档","4000.0","2458.0","0.0","0.0","300.0","200.0","6958.0","","","试用员工"
+"试用期部门副经理四档","4000.0","2240.0","0.0","0.0","300.0","200.0","6740.0","","","试用员工"
+"试用期部门副经理五档","4000.0","2030.0","0.0","0.0","300.0","200.0","6530.0","","","试用员工"
+"试用期部门副经理六档","4000.0","1829.0","0.0","0.0","300.0","200.0","6329.0","","","试用员工"
+"试用期部门副经理七档","4000.0","1636.0","0.0","0.0","300.0","200.0","6136.0","","","试用员工"
+"试用期部门副经理八档","4000.0","1450.0","0.0","0.0","300.0","200.0","5950.0","","","试用员工"
+"试用期业务主管一档","3300.0","2083.0","0.0","0.0","300.0","200.0","5883.0","","","试用员工"
+"试用期业务主管二档","3300.0","1894.0","0.0","0.0","300.0","200.0","5694.0","","","试用员工"
+"试用期业务主管三档","3300.0","1715.0","0.0","0.0","300.0","200.0","5515.0","","","试用员工"
+"试用期业务主管四档","3300.0","1541.0","0.0","0.0","300.0","200.0","5341.0","","","试用员工"
+"试用期业务主管五档","3300.0","1373.0","0.0","0.0","300.0","200.0","5173.0","","","试用员工"
+"试用期业务主管六档","3300.0","1213.0","0.0","0.0","300.0","200.0","5013.0","","","试用员工"
+"试用期业务主管七档","3300.0","1060.0","0.0","0.0","300.0","200.0","4860.0","","","试用员工"
+"试用期业务主管八档","3300.0","911.0","0.0","0.0","300.0","200.0","4711.0","","","试用员工"
+"试用期高级职员一档","2900.0","1496.0","0.0","0.0","300.0","200.0","4896.0","","","试用员工"
+"试用期高级职员二档","2900.0","1346.0","0.0","0.0","300.0","200.0","4746.0","","","试用员工"
+"试用期高级职员三档","2900.0","1202.0","0.0","0.0","300.0","200.0","4602.0","","","试用员工"
+"试用期高级职员四档","2900.0","1064.0","0.0","0.0","300.0","200.0","4464.0","","","试用员工"
diff --git a/yuthon_hr_employee/models/yuthon_job_lv.py b/yuthon_hr_employee/models/yuthon_job_lv.py
index d7bcbd137..6a9528675 100644
--- a/yuthon_hr_employee/models/yuthon_job_lv.py
+++ b/yuthon_hr_employee/models/yuthon_job_lv.py
@@ -6,13 +6,13 @@ class YuthonJobLv(models.Model):
     _name = 'yuthon.job.lv'
 
     name = fields.Char(string="职级名称")
-    job_lv_type = fields.Selection([("regular_employee", "正式员工"),
-                                    ("Probationary_employee", "试用员工")], string="职级类型")
+    job_lv_type = fields.Selection([("regular", "正式员工"),
+                                    ("probationary", "试用员工")], string="职级类型")
     base_wage = fields.Float(string="基本工资")
     job_wage = fields.Float(string="职级工资")
     post_wage = fields.Float(string="岗位工资")
     performance_bonus = fields.Float(string="绩效奖金")
-    Phone_subsidy = fields.Float(string="通信补贴")
+    phone_subsidy = fields.Float(string="通信补贴")
     attendance_bonus = fields.Float(string="全勤奖")
     all_wage = fields.Float(string="应发工资")
     create_time = fields.Datetime(string="生效日期", default=fields.Datetime.now)
diff --git a/yuthon_hr_employee/views/yuthon_job_lv_views.xml b/yuthon_hr_employee/views/yuthon_job_lv_views.xml
index d5f30229f..2bc1dad40 100644
--- a/yuthon_hr_employee/views/yuthon_job_lv_views.xml
+++ b/yuthon_hr_employee/views/yuthon_job_lv_views.xml
@@ -11,7 +11,7 @@
                 <field name="job_wage"/>
                 <field name="post_wage"/>
                 <field name="performance_bonus"/>
-                <field name="Phone_subsidy"/>
+                <field name="phone_subsidy"/>
                 <field name="attendance_bonus"/>
                 <field name="all_wage"/>
                 <field name="create_time"/>
@@ -36,7 +36,7 @@
                             <field name="performance_bonus"/>
                         </group>
                         <group>
-                            <field name="Phone_subsidy"/>
+                            <field name="phone_subsidy"/>
                             <field name="attendance_bonus"/>
                             <field name="all_wage"/>
                             <field name="create_time"/>